Merge pull request #54 from keboola/jirka-fix-number-type-in-td

Fix TD number type length

Author: jirkasemmler

src/Definition/Teradata.php

@@ -132,7 +132,7 @@ class Teradata extends Common
     public const DEFAULT_BLOB_LENGTH = '1G';
     public const DEFAULT_BYTE_LENGTH = 64000;
     public const DEFAULT_DATETIME_DIGIT_LENGTH = 4;
-    public const DEFAULT_DECIMAL_LENGTH = '38,38';
+    public const DEFAULT_DECIMAL_LENGTH = '38,19';
     public const DEFAULT_LATIN_CHAR_LENGTH = 64000;
     public const DEFAULT_LATIN_CLOB_LENGTH = '1999M';
     public const DEFAULT_NON_LATIN_CHAR_LENGTH = 32000;
@@ -201,7 +201,6 @@ class Teradata extends Common
         self::TYPE_INTERVAL_SECOND,
 
     ];
-
     // types where CHARAET can be defined
     public const CHARACTER_SET_TYPES = [
         self::TYPE_CHAR,
@@ -310,6 +309,11 @@ class Teradata extends Common
         self::TYPE_REAL,
     ];
 
+    // these types expect invalid default length given TD. e.g. NUMBER returns -128,-128. -> has to be redefined
+    public const TYPES_WITH_INVALID_DEFAULT_LENGTH = [
+        self::TYPE_NUMBER => '-128,-128',
+    ];
+
     private bool $isLatin = false;
 
     // depends on Char Type column in HELP TABLE column
@@ -328,6 +332,7 @@ public function __construct(string $type, array $options = [])
         }
 
         $this->validateType($type);
+        $options['length'] = $this->consolidateLength($type, $options['length'] ?? null);
         $this->validateLength($type, $options['length'] ?? null);
         $diff = array_diff(array_keys($options), ['length', 'nullable', 'default', 'isLatin']);
         if ($diff !== []) {
@@ -336,6 +341,17 @@ public function __construct(string $type, array $options = [])
         parent::__construct($type, $options);
     }
 
+    private function consolidateLength(string $type, ?string $length = null): ?string
+    {
+        if ($length !== null
+            && array_key_exists($type, self::TYPES_WITH_INVALID_DEFAULT_LENGTH)
+            && $length === self::TYPES_WITH_INVALID_DEFAULT_LENGTH[$type]
+        ) {
+            return null;
+        }
+        return $length;
+    }
+
     /**
      * @throws \Exception
      */

tests/TeradataDatatypeTest.php

@@ -141,13 +141,13 @@ public function expectedSqlDefinitions(): array
             'INTEGER' => ['INTEGER', [], 'INTEGER'],
             'INT' => ['INT', [], 'INT'],
 
-            'DECIMAL' => ['DECIMAL', [], 'DECIMAL (38,38)'],
-            'NUMERIC' => ['NUMERIC', [], 'NUMERIC (38,38)'],
-            'DEC' => ['DEC', [], 'DEC (38,38)'],
+            'DECIMAL' => ['DECIMAL', [], 'DECIMAL (38,19)'],
+            'NUMERIC' => ['NUMERIC', [], 'NUMERIC (38,19)'],
+            'DEC' => ['DEC', [], 'DEC (38,19)'],
             'FLOAT' => ['FLOAT', [], 'FLOAT'],
             'DOUBLE PRECISION' => ['DOUBLE PRECISION', [], 'DOUBLE PRECISION'],
             'REAL' => ['REAL', [], 'REAL'],
-            'NUMBER' => ['NUMBER', [], 'NUMBER (38,38)'],
+            'NUMBER' => ['NUMBER', [], 'NUMBER (38,19)'],
             'BYTE' => ['BYTE', [], 'BYTE (64000)'],
             'VARBYTE' => ['VARBYTE', [], 'VARBYTE (64000)'],
             'BLOB' => ['BLOB', [], 'BLOB (1G)'],
@@ -228,6 +228,8 @@ public function validLengths(): array
             ['REAL', null],
             ['NUMBER', null],
             ['NUMBER', '24,24'],
+            // comes from HELP TABLE
+            ['NUMBER', '-128,-128'],
             ['BYTE', null],
             ['BYTE', '5000'],
             ['VARBYTE', null],