connection & engines are created by Driver

dg · dg · commit 4a90581be419 · 2024-08-27T19:51:30.000+02:00
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -64,13 +64,12 @@ public function connect(): void
 		}
 
 		try {
-			$this->pdo = new PDO($this->dsn, $this->user, $this->password, $this->options);
+			$this->pdo = $this->driver->connect();
+			$this->engine = $this->driver->createDatabaseEngine($this);
 		} catch (PDOException $e) {
 			throw ConnectionException::from($e);
 		}
 
-		$this->engine = $this->driver->createDatabaseEngine();
-		$this->engine->initialize($this, $this->options);
 		Arrays::invoke($this->onConnect, $this);
 	}
 
diff --git a/src/Database/Drivers/Driver.php b/src/Database/Drivers/Driver.php
@@ -15,5 +15,7 @@
  */
 interface Driver
 {
-	function createDatabaseEngine(): Engine;
+	function connect();
+
+	function createDatabaseEngine($connection): Engine;
 }
diff --git a/src/Database/Drivers/Engine.php b/src/Database/Drivers/Engine.php
@@ -25,11 +25,6 @@ interface Engine
 		SupportSubselect = 'subselect',
 		SupportSchema = 'schema';
 
-	/**
-	 * Initializes connection.
-	 */
-	function initialize(Database\Connection $connection, array $options): void;
-
 	/**
 	 * Converts PDOException to DriverException or its descendant.
 	 */
diff --git a/src/Database/Drivers/Engines/MSSQLEngine.php b/src/Database/Drivers/Engines/MSSQLEngine.php
@@ -18,12 +18,9 @@
  */
 class MSSQLEngine implements Engine
 {
-	private Nette\Database\Connection $connection;
-
-
-	public function initialize(Nette\Database\Connection $connection, array $options): void
-	{
-		$this->connection = $connection;
+	public function __construct(
+		private readonly Nette\Database\Connection $connection,
+	) {
 	}
 
 
diff --git a/src/Database/Drivers/Engines/MySQLEngine.php b/src/Database/Drivers/Engines/MySQLEngine.php
@@ -18,29 +18,12 @@
  */
 class MySQLEngine implements Engine
 {
-	private Nette\Database\Connection $connection;
-	private bool $convertBoolean;
+	public bool $convertBoolean = true;
 
 
-	/**
-	 * Driver options:
-	 *   - charset => character encoding to set (default is utf8mb4)
-	 *   - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
-	 *   - convertBoolean => converts INT(1) to boolean
-	 */
-	public function initialize(Nette\Database\Connection $connection, array $options): void
-	{
-		$this->connection = $connection;
-		$charset = $options['charset'] ?? 'utf8mb4';
-		if ($charset) {
-			$connection->query('SET NAMES ?', $charset);
-		}
-
-		if (isset($options['sqlmode'])) {
-			$connection->query('SET sql_mode=?', $options['sqlmode']);
-		}
-
-		$this->convertBoolean = (bool) ($options['convertBoolean'] ?? true);
+	public function __construct(
+		private readonly Nette\Database\Connection $connection,
+	) {
 	}
 
 
diff --git a/src/Database/Drivers/Engines/ODBCEngine.php b/src/Database/Drivers/Engines/ODBCEngine.php
@@ -18,11 +18,6 @@
  */
 class ODBCEngine implements Engine
 {
-	public function initialize(Nette\Database\Connection $connection, array $options): void
-	{
-	}
-
-
 	public function convertException(\PDOException $e): Nette\Database\DriverException
 	{
 		return Nette\Database\DriverException::from($e);
diff --git a/src/Database/Drivers/Engines/OracleEngine.php b/src/Database/Drivers/Engines/OracleEngine.php
@@ -18,14 +18,12 @@
  */
 class OracleEngine implements Engine
 {
-	private Nette\Database\Connection $connection;
-	private string $fmtDateTime;
+	public string $formatDateTime = 'U';
 
 
-	public function initialize(Nette\Database\Connection $connection, array $options): void
-	{
-		$this->connection = $connection;
-		$this->fmtDateTime = $options['formatDateTime'] ?? 'U';
+	public function __construct(
+		private readonly Nette\Database\Connection $connection,
+	) {
 	}
 
 
@@ -59,7 +57,7 @@ public function delimite(string $name): string
 
 	public function formatDateTime(\DateTimeInterface $value): string
 	{
-		return $value->format($this->fmtDateTime);
+		return $value->format($this->formatDateTime);
 	}
 
 
diff --git a/src/Database/Drivers/Engines/PostgreSQLEngine.php b/src/Database/Drivers/Engines/PostgreSQLEngine.php
@@ -18,12 +18,9 @@
  */
 class PostgreSQLEngine implements Engine
 {
-	private Nette\Database\Connection $connection;
-
-
-	public function initialize(Nette\Database\Connection $connection, array $options): void
-	{
-		$this->connection = $connection;
+	public function __construct(
+		private readonly Nette\Database\Connection $connection,
+	) {
 	}
 
 
diff --git a/src/Database/Drivers/Engines/SQLServerEngine.php b/src/Database/Drivers/Engines/SQLServerEngine.php
@@ -18,12 +18,9 @@
  */
 class SQLServerEngine implements Engine
 {
-	private Nette\Database\Connection $connection;
-
-
-	public function initialize(Nette\Database\Connection $connection, array $options): void
-	{
-		$this->connection = $connection;
+	public function __construct(
+		private readonly Nette\Database\Connection $connection,
+	) {
 	}
 
 
diff --git a/src/Database/Drivers/Engines/SQLiteEngine.php b/src/Database/Drivers/Engines/SQLiteEngine.php
@@ -18,14 +18,12 @@
  */
 class SQLiteEngine implements Engine
 {
-	private Nette\Database\Connection $connection;
-	private string $fmtDateTime;
+	public string $formatDateTime = 'U';
 
 
-	public function initialize(Nette\Database\Connection $connection, array $options): void
-	{
-		$this->connection = $connection;
-		$this->fmtDateTime = $options['formatDateTime'] ?? 'U';
+	public function __construct(
+		private readonly Nette\Database\Connection $connection,
+	) {
 	}
 
 
@@ -72,7 +70,7 @@ public function delimite(string $name): string
 
 	public function formatDateTime(\DateTimeInterface $value): string
 	{
-		return $value->format($this->fmtDateTime);
+		return $value->format($this->formatDateTime);
 	}
 
 
@@ -235,7 +233,7 @@ public function getColumnTypes(\PDOStatement $statement): array
 		for ($col = 0; $col < $count; $col++) {
 			$meta = $statement->getColumnMeta($col);
 			if (isset($meta['sqlite:decl_type'])) {
-				$types[$meta['name']] = $this->fmtDateTime === 'U' && in_array($meta['sqlite:decl_type'], ['DATE', 'DATETIME'], strict: true)
+				$types[$meta['name']] = $this->formatDateTime === 'U' && in_array($meta['sqlite:decl_type'], ['DATE', 'DATETIME'], strict: true)
 					? Nette\Database\IStructure::FIELD_UNIX_TIMESTAMP
 					: Nette\Database\Helpers::detectType($meta['sqlite:decl_type']);
 			} elseif (isset($meta['native_type'])) {
diff --git a/src/Database/Drivers/PDO/MSSQL/Driver.php b/src/Database/Drivers/PDO/MSSQL/Driver.php
@@ -20,8 +20,21 @@ class Driver implements Drivers\Driver
 	private const EngineClass = Drivers\Engines\MSSQLEngine::class;
 
 
-	public function createDatabaseEngine(): Drivers\Engine
+	public function __construct(
+		#[\SensitiveParameter]
+		private readonly array $params,
+	) {
+	}
+
+
+	public function connect()
+	{
+		return new \PDO(...$this->params);
+	}
+
+
+	public function createDatabaseEngine($connection): Drivers\Engine
 	{
-		return new (self::EngineClass);
+		return new (self::EngineClass)($connection);
 	}
 }
diff --git a/src/Database/Drivers/PDO/MySQL/Driver.php b/src/Database/Drivers/PDO/MySQL/Driver.php
@@ -14,14 +14,46 @@
 
 /**
  * PDO MySQL database driver.
+ * Options:
+ *    - charset => character encoding to set (default is utf8 or utf8mb4 since MySQL 5.5.3)
+ *    - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
+ *    - convertBoolean => converts INT(1) to boolean
  */
 class Driver implements Drivers\Driver
 {
 	private const EngineClass = Drivers\Engines\MySQLEngine::class;
+	private const DefaultCharset = 'utf8mb4';
 
 
-	public function createDatabaseEngine(): Drivers\Engine
+	public function __construct(
+		#[\SensitiveParameter]
+		private readonly array $params,
+	) {
+	}
+
+
+	public function connect()
+	{
+		$connection = new \PDO(...$this->params);
+		$options = $this->params['options'];
+		if ($charset = $options['charset'] ?? self::DefaultCharset) {
+			$connection->query('SET NAMES ' . $connection->quote($charset));
+		}
+
+		if (isset($options['sqlmode'])) {
+			$connection->query('SET sql_mode=' . $connection->quote($options['sqlmode']));
+		}
+		return $connection;
+	}
+
+
+	public function createDatabaseEngine($connection): Drivers\Engine
 	{
-		return new (self::EngineClass)();
+		$engine = new (self::EngineClass)($connection);
+		$options = $this->params['options'];
+		if (isset($options['convertBoolean'])) {
+			$engine->convertBoolean = (bool) $options['convertBoolean'];
+		}
+		return $engine;
 	}
 }
diff --git a/src/Database/Drivers/PDO/OCI/Driver.php b/src/Database/Drivers/PDO/OCI/Driver.php
@@ -14,14 +14,34 @@
 
 /**
  * PDO Oracle database driver.
+ * Options:
+ *    - formatDateTime => the format in which the date is stored in the database
  */
 class Driver implements Drivers\Driver
 {
 	private const EngineClass = Drivers\Engines\OracleEngine::class;
 
 
-	public function createDatabaseEngine(): Drivers\Engine
+	public function __construct(
+		#[\SensitiveParameter]
+		private readonly array $params,
+	) {
+	}
+
+
+	public function connect()
+	{
+		return new \PDO(...$this->params);
+	}
+
+
+	public function createDatabaseEngine($connection): Drivers\Engine
 	{
-		return new (self::EngineClass)();
+		$engine = new (self::EngineClass)($connection);
+		$options = $this->params['options'];
+		if (isset($options['formatDateTime'])) {
+			$engine->formatDateTime = $options['formatDateTime'];
+		}
+		return $engine;
 	}
 }
diff --git a/src/Database/Drivers/PDO/ODBC/Driver.php b/src/Database/Drivers/PDO/ODBC/Driver.php
@@ -20,8 +20,21 @@ class Driver implements Drivers\Driver
 	private const EngineClass = Drivers\Engines\ODBCEngine::class;
 
 
-	public function createDatabaseEngine(): Drivers\Engine
+	public function __construct(
+		#[\SensitiveParameter]
+		private readonly array $params,
+	) {
+	}
+
+
+	public function connect()
+	{
+		return new \PDO(...$this->params);
+	}
+
+
+	public function createDatabaseEngine($connection): Drivers\Engine
 	{
-		return new (self::EngineClass)();
+		return new (self::EngineClass)($connection);
 	}
 }
diff --git a/src/Database/Drivers/PDO/PgSQL/Driver.php b/src/Database/Drivers/PDO/PgSQL/Driver.php
@@ -20,8 +20,21 @@ class Driver implements Drivers\Driver
 	private const EngineClass = Drivers\Engines\PostgreSQLEngine::class;
 
 
-	public function createDatabaseEngine(): Drivers\Engine
+	public function __construct(
+		#[\SensitiveParameter]
+		private readonly array $params,
+	) {
+	}
+
+
+	public function connect()
+	{
+		return new \PDO(...$this->params);
+	}
+
+
+	public function createDatabaseEngine($connection): Drivers\Engine
 	{
-		return new (self::EngineClass)();
+		return new (self::EngineClass)($connection);
 	}
 }
diff --git a/src/Database/Drivers/PDO/SQLSrv/Driver.php b/src/Database/Drivers/PDO/SQLSrv/Driver.php
@@ -20,8 +20,21 @@ class Driver implements Drivers\Driver
 	private const EngineClass = Drivers\Engines\SQLServerEngine::class;
 
 
-	public function createDatabaseEngine(): Drivers\Engine
+	public function __construct(
+		#[\SensitiveParameter]
+		private readonly array $params,
+	) {
+	}
+
+
+	public function connect()
+	{
+		return new \PDO(...$this->params);
+	}
+
+
+	public function createDatabaseEngine($connection): Drivers\Engine
 	{
-		return new (self::EngineClass)();
+		return new (self::EngineClass)($connection);
 	}
 }
diff --git a/src/Database/Drivers/PDO/SQLite/Driver.php b/src/Database/Drivers/PDO/SQLite/Driver.php
diff --git a/src/Database/Factory.php b/src/Database/Factory.php

Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,12 @@ public function connect(): void`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`try {`
`67`		`- $this->pdo = new PDO($this->dsn, $this->user, $this->password, $this->options);`
	`67`	`+ $this->pdo = $this->driver->connect();`
	`68`	`+ $this->engine = $this->driver->createDatabaseEngine($this);`
`68`	`69`	`} catch (PDOException $e) {`
`69`	`70`	`throw ConnectionException::from($e);`
`70`	`71`	`}`
`71`	`72`
`72`		`- $this->engine = $this->driver->createDatabaseEngine();`
`73`		`- $this->engine->initialize($this, $this->options);`
`74`	`73`	`Arrays::invoke($this->onConnect, $this);`
`75`	`74`	`}`
`76`	`75`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`interface Driver`
`17`	`17`	`{`
`18`		`- function createDatabaseEngine(): Engine;`
	`18`	`+ function connect();`
	`19`	`+`
	`20`	`+ function createDatabaseEngine($connection): Engine;`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,9 @@`
`18`	`18`	`*/`
`19`	`19`	`class MSSQLEngine implements Engine`
`20`	`20`	`{`
`21`		`- private Nette\Database\Connection $connection;`
`22`		`-`
`23`		`-`
`24`		`- public function initialize(Nette\Database\Connection $connection, array $options): void`
`25`		`- {`
`26`		`- $this->connection = $connection;`
	`21`	`+ public function __construct(`
	`22`	`+ private readonly Nette\Database\Connection $connection,`
	`23`	`+ ) {`
`27`	`24`	`}`
`28`	`25`
`29`	`26`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,6 @@`
`18`	`18`	`*/`
`19`	`19`	`class ODBCEngine implements Engine`
`20`	`20`	`{`
`21`		`- public function initialize(Nette\Database\Connection $connection, array $options): void`
`22`		`- {`
`23`		`- }`
`24`		`-`
`25`		`-`
`26`	`21`	`public function convertException(\PDOException $e): Nette\Database\DriverException`
`27`	`22`	`{`
`28`	`23`	`return Nette\Database\DriverException::from($e);`
Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,12 @@`
`18`	`18`	`*/`
`19`	`19`	`class OracleEngine implements Engine`
`20`	`20`	`{`
`21`		`- private Nette\Database\Connection $connection;`
`22`		`- private string $fmtDateTime;`
	`21`	`+ public string $formatDateTime = 'U';`
`23`	`22`
`24`	`23`
`25`		`- public function initialize(Nette\Database\Connection $connection, array $options): void`
`26`		`- {`
`27`		`- $this->connection = $connection;`
`28`		`- $this->fmtDateTime = $options['formatDateTime'] ?? 'U';`
	`24`	`+ public function __construct(`
	`25`	`+ private readonly Nette\Database\Connection $connection,`
	`26`	`+ ) {`
`29`	`27`	`}`
`30`	`28`
`31`	`29`
`@@ -59,7 +57,7 @@ public function delimite(string $name): string`
`59`	`57`
`60`	`58`	`public function formatDateTime(\DateTimeInterface $value): string`
`61`	`59`	`{`
`62`		`- return $value->format($this->fmtDateTime);`
	`60`	`+ return $value->format($this->formatDateTime);`
`63`	`61`	`}`
`64`	`62`
`65`	`63`