Merge pull request #49 from keboola/jirka-td-generate-type-and-length

externalize method to generate type with length

Author: zajca

src/Definition/Teradata.php

@@ -348,6 +348,30 @@ public static function convertCodeToType($code)
      * @return string
      */
     public function getSQLDefinition()
+    {
+        $definition = $this->buildTypeWithLength();
+
+        if (!$this->isNullable()) {
+            $definition .= ' NOT NULL';
+        }
+        if ($this->getDefault() !== null) {
+            $definition .= ' DEFAULT ' . $this->getDefault();
+        }
+
+        if (in_array($this->getType(), self::CHARACTER_SET_TYPES, true)) {
+            $definition .= ' CHARACTER SET ' . ($this->isLatin() ? 'LATIN' : 'UNICODE');
+        }
+
+        return $definition;
+    }
+
+    /**
+     * generates type with length
+     * most of the types just append it, but some of them are complex and some have no length...
+     * used here and in i/e lib
+     * @return string
+     */
+    public function buildTypeWithLength()
     {
         $type = $this->getType();
         $definition = $type;
@@ -364,17 +388,6 @@ public function getSQLDefinition()
             }
         }
 
-        if (!$this->isNullable()) {
-            $definition .= ' NOT NULL';
-        }
-        if ($this->getDefault() !== null) {
-            $definition .= ' DEFAULT ' . $this->getDefault();
-        }
-
-        if (in_array($this->getType(), self::CHARACTER_SET_TYPES, true)) {
-            $definition .= ' CHARACTER SET ' . ($this->isLatin() ? 'LATIN' : 'UNICODE');
-        }
-
         return $definition;
     }
 

tests/TeradataDatatypeTest.php

@@ -110,6 +110,18 @@ public function testSqlDefinition($type, $options, $expectedDefinition)
         self::assertEquals($expectedDefinition . $suffix, $definition->getSQLDefinition());
     }
 
+    /**
+     * @param string     $type
+     * @param array|null $options
+     * @param string     $expectedDefinition
+     * @dataProvider expectedSqlDefinitions
+     */
+    public function testBuildTypeWithLength($type, $options, $expectedDefinition)
+    {
+        $definition = new Teradata($type, $options);
+        self::assertEquals($expectedDefinition, $definition->buildTypeWithLength());
+    }
+
 
     public function testSqlDefinitionWhenLatin()
     {