Numeric/decimal data type is FIELD_FIXED (BC break)

nette · Jan 20, 2022 · b99855a · b99855a
1 parent f8280d6
commit b99855a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/Database/Helpers.php b/src/Database/Helpers.php
@@ -27,7 +27,8 @@ class Helpers
 	public static array $typePatterns = [
 		'^_' => IStructure::FIELD_TEXT, // PostgreSQL arrays
 		'(TINY|SMALL|SHORT|MEDIUM|BIG|LONG)(INT)?|INT(EGER|\d+| IDENTITY)?|(SMALL|BIG|)SERIAL\d*|COUNTER|YEAR|BYTE|LONGLONG|UNSIGNED BIG INT' => IStructure::FIELD_INTEGER,
-		'(NEW)?DEC(IMAL)?(\(.*)?|NUMERIC|REAL|DOUBLE( PRECISION)?|FLOAT\d*|(SMALL)?MONEY|CURRENCY|NUMBER' => IStructure::FIELD_FLOAT,
+		'(NEW)?DEC(IMAL)?(\(.*)?|NUMERIC|(SMALL)?MONEY|CURRENCY|NUMBER' => IStructure::FIELD_FIXED,
+		'REAL|DOUBLE( PRECISION)?|FLOAT\d*' => IStructure::FIELD_FLOAT,
 		'BOOL(EAN)?' => IStructure::FIELD_BOOL,
 		'TIME' => IStructure::FIELD_TIME,
 		'DATE' => IStructure::FIELD_DATE,

diff --git a/src/Database/IStructure.php b/src/Database/IStructure.php
@@ -21,6 +21,7 @@ interface IStructure
 		FIELD_BOOL = 'bool',
 		FIELD_INTEGER = 'int',
 		FIELD_FLOAT = 'float',
+		FIELD_FIXED = 'fixed',
 		FIELD_DATE = 'date',
 		FIELD_TIME = 'time',
 		FIELD_DATETIME = 'datetime',

diff --git a/src/Database/RowNormalizer.php b/src/Database/RowNormalizer.php
@@ -40,6 +40,7 @@ public function normalizeField(mixed $value, string $type): mixed
 				return is_float($tmp = $value * 1) ? $value : $tmp;
 
 			case IStructure::FIELD_FLOAT:
+			case IStructure::FIELD_FIXED:
 				if (is_string($value) && ($pos = strpos($value, '.')) !== false) {
 					$value = rtrim(rtrim($pos === 0 ? "0$value" : $value, '0'), '.');
 				}