Merge pull request #15 from robin900/add-charlen-to-columns

Add support for precision, scale, length to types as necessary.

Author: lemeryfertitta

sqla_vertica_python/vertica_python.py

@@ -192,7 +192,7 @@ def get_columns(self, connection, table_name, schema=None, **kw):
         FROM v_catalog.columns
         where table_name = '{table_name}'
         {schema_conditional}
-        UNION ALL
+        UNION 
         SELECT
           column_name,
           data_type,
@@ -202,15 +202,49 @@ def get_columns(self, connection, table_name, schema=None, **kw):
         where table_name = '{table_name}'
         {schema_conditional}
         """.format(table_name=table_name, schema_conditional=schema_conditional)
-        return [
-            {
-                'name': row.column_name,
-                'type': self.ischema_names[row.data_type.upper().split('(')[0]],
-                'nullable': row.is_nullable,
-                'default': row.column_default,
-                'primary_key': row.column_name in primary_key_columns
-            } for row in connection.execute(column_select)
-        ]
+        colobjs = []
+        for row in connection.execute(column_select):
+              colobj = self._get_column_info(
+                  row.column_name, 
+                  row.data_type, 
+                  row.is_nullable,
+                  row.column_default,
+                  (row.column_name in primary_key_columns)
+              )
+              if colobj:
+                  colobjs.append(colobj)
+        return colobjs
+
+    def _get_column_info(self, name, data_type, is_nullable, default, is_primary_key):
+        m = re.match(r'(\w+)(?:\((\d+)(?:,(\d+))?\))?', data_type)
+        if not m:
+            raise ValueError("data type string not parseable for type name and optional parameters: %s" % data_type)
+        typename = m.group(1).upper()
+        typeobj = self.ischema_names[typename]
+        typeargs = []
+        typekwargs = {}
+        for arg_group in (2, 3):
+            try:
+                param = m.group(arg_group)
+                if param:
+                    typeargs.append(int(param))
+            except (TypeError, ValueError):
+                pass
+
+        if any(tz_string in typename for tz_string in ('TIMEZONE', 'TIME ZONE', 'TIMESTAMPTZ')):
+            typekwargs['timezone'] = True
+
+        if callable(typeobj):
+            typeobj = typeobj(*typeargs, **typekwargs)
+
+        return {
+            'name': name,
+            'type': typeobj,
+            'nullable': is_nullable,
+            'default': default,
+            'primary_key': is_primary_key
+        } 
+
 
     @reflection.cache
     def get_unique_constraints(self, connection, table_name, schema=None, **kw):