decimal

nette · Aug 28, 2024 · 1d6103d · 1d6103d
1 parent 18c8dbf
commit 1d6103d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/Database/Drivers/Engines/MySQLEngine.php b/src/Database/Drivers/Engines/MySQLEngine.php
@@ -167,9 +167,6 @@ public function getForeignKeys(string $table): array
 	public function resolveColumnConverter(array $meta, TypeConverter $converter): ?\Closure
 	{
 		return match ($meta['nativeType']) {
-			'NEWDECIMAL' => $converter->convertDecimal
-				? ($meta['scale'] === 0 ? $converter->toInt(...) : $converter->toFloat(...))
-				: null,
 			'TINY' =>  $meta['length'] === 1 && $converter->convertBoolean
 				? $converter->toBool(...)
 				: $converter->toInt(...),

diff --git a/src/Database/Drivers/Engines/SQLServerEngine.php b/src/Database/Drivers/Engines/SQLServerEngine.php
@@ -224,7 +224,6 @@ public function getForeignKeys(string $table): array
 
 	public function resolveColumnConverter(array $meta, TypeConverter $converter): ?\Closure
 	{
-		dump($meta);
 		return match ($meta['nativeType']) {
 			'timestamp' => null, // timestamp does not mean time in sqlsrv
 			'bit' => $converter->convertBoolean ? $converter->toBool(...) : $converter->toInt(...),

diff --git a/src/Database/TypeConverter.php b/src/Database/TypeConverter.php
@@ -66,7 +66,9 @@ public function resolve(array $meta): ?\Closure
 		return match ($this->detectType($meta['nativeType'])) {
 			self::Integer => $this->toInt(...),
 			self::Float => $this->toFloat(...),
-			self::Decimal => $this->convertDecimal ? $this->toFloat(...) : null,
+			self::Decimal => $this->convertDecimal
+				? ($meta['scale'] === 0 ? $this->toInt(...) : $this->toFloat(...))
+				: null,
 			self::Boolean => $this->convertBoolean ? $this->toBool(...) : null,
 			self::DateTime, self::Date => $this->convertDateTime ? $this->toDateTime(...) : null,
 			self::Time => $this->convertDateTime ? $this->toTime(...) : null,