support NUMBER(10, 0) type

Author: ea-rus

mindsdb_sql_parser/ast/create.py

@@ -9,13 +9,14 @@
 
 
 class TableColumn():
-    def __init__(self, name, type='integer', length=None, default=None,
+    def __init__(self, name, type='integer', length=None, length2=None, default=None,
                  is_primary_key=False, nullable=None):
         self.name = name
         self.type = type
         self.is_primary_key = is_primary_key
         self.default = default
         self.length = length
+        self.length2 = length2
         self.nullable = nullable
 
     def __eq__(self, other):
@@ -97,7 +98,10 @@ def get_string(self, *args, **kwargs):
                 else:
                     type = str(col.type)
                 if col.length is not None:
-                    type = f'{type}({col.length})'
+                    len_str = str(col.length)
+                    if col.length2 is not None:
+                        len_str += f", {col.length2}"
+                    type = f'{type}({len_str})'
                 col_str = f'{col.name} {type}'
                 if col.nullable is True:
                     col_str += ' NULL'

mindsdb_sql_parser/parser.py

@@ -713,6 +713,7 @@ def drop_table(self, p):
        'id id DEFAULT id',
        'id id PRIMARY_KEY',
        'id id LPAREN INTEGER RPAREN',
+       'id id LPAREN INTEGER COMMA INTEGER RPAREN',
        'id id LPAREN INTEGER RPAREN DEFAULT id',
        'PRIMARY_KEY LPAREN column_list RPAREN',
        )
@@ -730,10 +731,18 @@ def table_column(self, p):
         elif hasattr(p, 'PRIMARY_KEY'):
             is_primary_key = True
 
+        length, length2 = None, None
+        if hasattr(p, 'INTEGER'):
+            length = p.INTEGER
+        elif hasattr(p, 'INTEGER0'):
+            length = p.INTEGER0
+            length2 = p.INTEGER1
+
         return TableColumn(
             name=p[0],
             type=p[1],
-            length=getattr(p, 'INTEGER', None),
+            length=length,
+            length2=length2,
             default=default,
             is_primary_key=is_primary_key
         )

tests/test_base_sql/test_create.py

@@ -137,6 +137,8 @@ def test_create(self):
             location_id INT,
             num INT,
             name TEXT,
+            balance decimal(5,2),
+            links NUMBER(10, 0) NOT NULL,
             PRIMARY KEY (location_id, num)  
          )
         '''
@@ -148,6 +150,8 @@ def test_create(self):
                 TableColumn(name='location_id', type='INT', is_primary_key=True),
                 TableColumn(name='num', type='INT', is_primary_key=True),
                 TableColumn(name='name', type='TEXT'),
+                TableColumn(name='balance', type='decimal', length=5, length2=2),
+                TableColumn(name='links', type='NUMBER', nullable=False, length=10, length2=0),
             ]
         )