resolveColumnConverter

nette · Aug 18, 2024 · 59cb3c7 · 59cb3c7
1 parent 7373986
commit 59cb3c7
Show file tree

Hide file tree

Showing 23 changed files with 159 additions and 120 deletions.
diff --git a/src/Bridges/DatabaseTracy/ConnectionPanel.php b/src/Bridges/DatabaseTracy/ConnectionPanel.php
@@ -156,7 +156,7 @@ public function getPanel(): ?string
 					$cmd = is_string($this->explain)
 						? $this->explain
 						: 'EXPLAIN';
-					$explain = (new ResultSet($connection->getConnectionDriver()->query("$cmd $sql", $params)))->fetchAll();
+					$explain = (new ResultSet($connection, $connection->getConnectionDriver()->query("$cmd $sql", $params)))->fetchAll();
 				} catch (\PDOException) {
 				}
 			}

diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -30,17 +30,26 @@ class Connection
 	private ?SqlPreprocessor $preprocessor;
 
 	/** @var callable(array, ResultSet): array */
-	private $rowNormalizer;
+	private TypeConverter $typeConverter;
 	private ?string $sql = null;
 	private int $transactionDepth = 0;
 
 
 	public function __construct(
 		\Closure|string $connector,
 	) {
+		$this->typeConverter = new TypeConverter;
+
 		if (is_string($connector)) { // compatibility with version 3.x
 			//trigger_error('Passing DSN as string is deprecated, use Nette\Database\Factory::createFromDsn() instead.', E_USER_DEPRECATED);
 			[$dsn, $user, $password, $options] = func_get_args() + [null, null, null, []];
+
+			foreach (['convertBoolean', 'convertDateTime', 'convertDecimal'] as $opt) {
+				if (isset($options[$opt])) {
+					$this->typeConverter->$opt = (bool) $options[$opt];
+					unset($options[$opt]);
+				}
+			}
 			$lazy = $options['lazy'] ?? false;
 			unset($options['newDateTime'], $options['lazy']);
 			$this->connector = (new Factory)->createConnectorFromDsn($dsn, $user, $password, $options);
@@ -126,10 +135,15 @@ public function getReflection(): Reflection
 	}
 
 
-	public function setRowNormalizer(?callable $normalizer): static
+	public function setRowNormalizer(): static
+	{
+		throw new Nette\DeprecatedException(__METHOD__ . '() is deprecated, use getTypeConverter() instead.');
+	}
+
+
+	public function getTypeConverter(): TypeConverter
 	{
-		$this->rowNormalizer = $normalizer;
-		return $this;
+		return $this->typeConverter;
 	}
 
 
@@ -213,7 +227,7 @@ public function query(#[Language('SQL')] string $sql, #[Language('GenericSQL')]
 			$time = microtime(true);
 			$result = $this->connection->query($this->sql, $params);
 			$time = microtime(true) - $time;
-			$resultSet = new ResultSet($result, new SqlLiteral($this->sql, $params), $this->rowNormalizer, $time);
+			$resultSet = new ResultSet($this, $result, new SqlLiteral($this->sql, $params), $time);
 		} catch (DriverException $e) {
 			Arrays::invoke($this->onQuery, $this, $e);
 			throw $e;

diff --git a/src/Database/Drivers/Engine.php b/src/Database/Drivers/Engine.php
@@ -9,6 +9,8 @@
 
 namespace Nette\Database\Drivers;
 
+use Nette\Database\TypeConverter;
+
 
 /**
  * Database driver.
@@ -67,6 +69,8 @@ function getIndexes(string $table): array;
 	/** @return list<array{name: string, local: list<string>, table: string, foreign: list<string>}> */
 	function getForeignKeys(string $table): array;
 
+	function resolveColumnConverter(array $meta, TypeConverter $converter): ?\Closure;
+
 	/**
 	 * Cheks if driver supports specific property
 	 * @param  self::Support*  $item

diff --git a/src/Database/Drivers/Engines/MSSQLEngine.php b/src/Database/Drivers/Engines/MSSQLEngine.php
@@ -213,6 +213,12 @@ public function getForeignKeys(string $table): array
 	}
 
 
+	public function resolveColumnConverter(array $meta, TypeConverter $converter): ?\Closure
+	{
+		return $converter->resolve($meta['nativeType']);
+	}
+
+
 	public function isSupported(string $item): bool
 	{
 		return $item === self::SupportSubselect;

diff --git a/src/Database/Drivers/Engines/MySQLEngine.php b/src/Database/Drivers/Engines/MySQLEngine.php
@@ -10,9 +10,9 @@
 namespace Nette\Database\Drivers\Engines;
 
 use Nette;
+use Nette\Database\DateTime;
 use Nette\Database\Drivers\Connection;
 use Nette\Database\Drivers\Engine;
-use Nette\Database\Type;
 use Nette\Database\TypeConverter;
 
 
@@ -39,16 +39,6 @@ public function determineExceptionClass(int $code, ?string $sqlState, string $me
 	}
 
 
-	public function resolveTypeConverter(string $nativeType, TypeConverter $converter): ?\Closure
-	{
-		return match ($nativeType) {
-			'TIME' => $converter->convertDateTime ? $converter->toInterval(...) : null,
-			'DATE', 'DATETIME', 'TIMESTAMP' => $converter->convertDateTime ? (fn($value) => str_starts_with($value, '0000-00') ? null : $converter->toDateTime($value)) : null,
-			default => $converter->resolve($nativeType),
-		};
-	}
-
-
 	/********************* SQL ****************d*g**/
 
 
@@ -176,6 +166,18 @@ public function getForeignKeys(string $table): array
 	}
 
 
+	public function resolveColumnConverter(array $meta, TypeConverter $converter): ?\Closure
+	{
+		return match ($meta['nativeType']) {
+			'NEWDECIMAL' => $meta['precision'] === 0 ? $converter->toInt(...) : $converter->toFloat(...),
+			'TINY' =>  $meta['length'] === 1 && $converter->convertBoolean ? $converter->toBool(...) : $converter->toInt(...),
+			'TIME' => $converter->convertDateTime ? $converter->toInterval(...) : null,
+			'DATE', 'DATETIME', 'TIMESTAMP' => $converter->convertDateTime ? (fn($value): ?DateTime => str_starts_with($value, '0000-00') ? null : $converter->toDateTime($value)) : null,
+			default => $converter->resolve($meta['nativeType']),
+		};
+	}
+
+
 	public function isSupported(string $item): bool
 	{
 		// MULTI_COLUMN_AS_OR_COND due to mysql bugs:

diff --git a/src/Database/Drivers/Engines/ODBCEngine.php b/src/Database/Drivers/Engines/ODBCEngine.php
@@ -11,6 +11,7 @@
 
 use Nette;
 use Nette\Database\Drivers\Engine;
+use Nette\Database\TypeConverter;
 
 
 /**
@@ -96,6 +97,12 @@ public function getForeignKeys(string $table): array
 	}
 
 
+	public function resolveColumnConverter(array $meta, TypeConverter $converter): ?\Closure
+	{
+		return $converter->resolve($meta['nativeType']);
+	}
+
+
 	public function isSupported(string $item): bool
 	{
 		return $item === self::SupportSubselect;

diff --git a/src/Database/Drivers/Engines/OracleEngine.php b/src/Database/Drivers/Engines/OracleEngine.php
@@ -12,6 +12,7 @@
 use Nette;
 use Nette\Database\Drivers\Connection;
 use Nette\Database\Drivers\Engine;
+use Nette\Database\TypeConverter;
 
 
 /**
@@ -123,6 +124,12 @@ public function getForeignKeys(string $table): array
 	}
 
 
+	public function resolveColumnConverter(array $meta, TypeConverter $converter): ?\Closure
+	{
+		return $converter->resolve($meta['nativeType']);
+	}
+
+
 	public function isSupported(string $item): bool
 	{
 		return $item === self::SupportSequence || $item === self::SupportSubselect;

diff --git a/src/Database/Drivers/Engines/PostgreSQLEngine.php b/src/Database/Drivers/Engines/PostgreSQLEngine.php
@@ -39,14 +39,6 @@ public function determineExceptionClass(int $code, ?string $sqlState, string $me
 	}
 
 
-	public function resolveTypeConverter(string $nativeType, TypeConverter $converter): ?\Closure
-	{
-		return $nativeType === 'bool'
-			? fn($value) => ($value && $value !== 'f' && $value !== 'F')
-			: $converter->resolve($nativeType);
-	}
-
-
 	/********************* SQL ****************d*g**/
 
 
@@ -233,6 +225,14 @@ public function getForeignKeys(string $table): array
 	}
 
 
+	public function resolveColumnConverter(array $meta, TypeConverter $converter): ?\Closure
+	{
+		return $meta['nativeType'] === 'bool'
+			? fn($value): bool => ($value && $value !== 'f' && $value !== 'F')
+			: $converter->resolve($meta['nativeType']);
+	}
+
+
 	public function isSupported(string $item): bool
 	{
 		return $item === self::SupportSequence || $item === self::SupportSubselect || $item === self::SupportSchema;

diff --git a/src/Database/Drivers/Engines/SQLServerEngine.php b/src/Database/Drivers/Engines/SQLServerEngine.php
@@ -32,16 +32,6 @@ public function determineExceptionClass(int $code, ?string $sqlState, string $me
 	}
 
 
-	public function resolveTypeConverter(string $nativeType, TypeConverter $converter): ?\Closure
-	{
-		return match ($nativeType) {
-			'timestamp' => null, // timestamp does not mean time in sqlsrv
-			'bit' => $converter->convertBoolean ? fn($value) => (bool) $value : null,
-			default => $converter->resolve($nativeType),
-		};
-	}
-
-
 	/********************* SQL ****************d*g**/
 
 
@@ -226,6 +216,16 @@ public function getForeignKeys(string $table): array
 	}
 
 
+	public function resolveColumnConverter(array $meta, TypeConverter $converter): ?\Closure
+	{
+		return match ($meta['nativeType']) {
+			'timestamp' => null, // timestamp does not mean time in sqlsrv
+			'bit' => $converter->convertBoolean ? $converter->toBool(...) : null,
+			default => $converter->resolve($meta['nativeType']),
+		};
+	}
+
+
 	public function isSupported(string $item): bool
 	{
 		return $item === self::SupportSubselect;

diff --git a/src/Database/Drivers/Engines/SQLiteEngine.php b/src/Database/Drivers/Engines/SQLiteEngine.php
@@ -60,14 +60,6 @@ public function determineExceptionClass(int $code, ?string $sqlState, string $me
 	}
 
 
-	public function resolveTypeConverter(string $nativeType, TypeConverter $converter): ?\Closure
-	{
-		return $converter->convertDateTime && in_array($nativeType, ['DATE', 'DATETIME'], true)
-			? (fn($value) => is_int($value) ? (new DateTime)->setTimestamp($value) : new DateTime($value))
-			: $converter->resolve($nativeType);
-	}
-
-
 	/********************* SQL ****************d*g**/
 
 
@@ -238,6 +230,14 @@ public function getForeignKeys(string $table): array
 	}
 
 
+	public function resolveColumnConverter(array $meta, TypeConverter $converter): ?\Closure
+	{
+		return $converter->convertDateTime && in_array($meta['nativeType'], ['DATE', 'DATETIME'], true)
+			? (fn($value): DateTime => is_int($value) ? (new DateTime)->setTimestamp($value) : new DateTime($value))
+			: $converter->resolve($meta['nativeType']);
+	}
+
+
 	public function isSupported(string $item): bool
 	{
 		return $item === self::SupportMultiInsertAsSelect || $item === self::SupportSubselect || $item === self::SupportMultiColumnAsOrCond;

diff --git a/src/Database/Drivers/PDO/Connection.php b/src/Database/Drivers/PDO/Connection.php
@@ -11,7 +11,6 @@
 
 use Nette;
 use Nette\Database\Drivers;
-use Nette\Database\TypeConverter;
 use PDO;
 use PDOException;
 
@@ -32,13 +31,6 @@ public function __construct(
 	) {
 		$this->engine = $this->getDatabaseEngine();
 
-		$this->typeConverter = new TypeConverter;
-		foreach (['convertBoolean', 'convertDateTime', 'convertDecimal'] as $opt) {
-			if (isset($options[$opt])) {
-				$this->typeConverter->$opt = (bool) $options[$opt];
-			}
-		}
-
 		try {
 			$this->pdo = new PDO($dsn, $username, $password, $options);
 			$this->initialize($options);
@@ -162,10 +154,8 @@ public function getNativeConnection(): PDO
 	}
 
 
-	public function resolveColumnConverter(array $meta): ?\Closure
+	public function getMetaTypeKey(): string
 	{
-		return isset($meta['native_type'])
-			? $this->typeConverter->resolve($meta['native_type'])
-			: null;
+		return 'native_type';
 	}
 }
diff --git a/src/Database/Drivers/PDO/MySQL/Connection.php b/src/Database/Drivers/PDO/MySQL/Connection.php
@@ -40,16 +40,4 @@ protected function initialize(array $options): void
 			$this->query('SET sql_mode=' . $this->quote($options['sqlmode']));
 		}
 	}
-
-
-	public function resolveColumnConverter(array $meta): ?\Closure
-	{
-		$type = $meta['native_type'] ?? null;
-		return match (true) {
-			!$type => null,
-			$type === 'NEWDECIMAL' && $meta['precision'] === 0 => fn($value) => is_float($tmp = $value * 1) ? $value : $tmp,
-			$type === 'TINY' && $meta['len'] === 1 && $this->typeConverter->convertBoolean => fn($value) => (bool) $value,
-			default => $this->engine->resolveTypeConverter($type, $this->typeConverter),
-		};
-	}
 }
diff --git a/src/Database/Drivers/PDO/PgSQL/Connection.php b/src/Database/Drivers/PDO/PgSQL/Connection.php
@@ -31,12 +31,4 @@ public function query(string $sql, array $params = []): Result
 			throw new ($this->convertException($e, $args, null, $sql, $params))(...$args);
 		}
 	}
-
-
-	public function resolveColumnConverter(array $meta): ?\Closure
-	{
-		return isset($meta['native_type'])
-			? $this->engine->resolveTypeConverter($meta['native_type'], $this->typeConverter)
-			: null;
-	}
 }
diff --git a/src/Database/Drivers/PDO/PgSQL/Result.php b/src/Database/Drivers/PDO/PgSQL/Result.php
@@ -14,11 +14,11 @@
 
 class Result extends Drivers\PDO\Result
 {
-	private static array $metaCache = [];
+	private static array $columnsCache = [];
 
 
-	protected function collectMeta(): array
+	protected function collectColumnsInfo(): array
 	{
-		return self::$metaCache[$this->result->queryString] ??= parent::collectMeta();
+		return self::$columnsCache[$this->result->queryString] ??= parent::collectColumnsInfo();
 	}
 }