Merge pull request #355 from mindsdb/fix-show

Update SHOW command
mindsdb · Feb 28, 2024 · f3ce0a1 · f3ce0a1
2 parents 9285aa7 + 3cf5cbe
commit f3ce0a1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 75 deletions.
diff --git a/mindsdb_sql/parser/dialects/mindsdb/parser.py b/mindsdb_sql/parser/dialects/mindsdb/parser.py
@@ -402,6 +402,8 @@ def set_item(self, p):
        'CHARSET',
        )
     def charset(self, p):
+        if hasattr(p, 'SET'):
+            return f'{p[0]} {p[1]}'
         return p[0]
 
     # set transaction
@@ -523,57 +525,14 @@ def show(self, p):
             modes=modes
         )
 
-    @_('SCHEMAS',
-       'DATABASES',
-       'TABLES',
-       'OPEN TABLES',
-       'TRIGGERS',
-       'COLUMNS',
-       'FIELDS',
-       'PLUGINS',
-       'VARIABLES',
-       'INDEXES',
-       'KEYS',
-       'SESSION VARIABLES',
-       'GLOBAL VARIABLES',
-       'GLOBAL STATUS',
-       'SESSION STATUS',
-       'PROCEDURE STATUS',
-       'FUNCTION STATUS',
-       'TABLE STATUS',
-       'MASTER STATUS',
-       'STATUS',
-       'STORAGE ENGINES',
-       'PROCESSLIST',
-       'INDEX',
-       'CREATE TABLE',
-       'WARNINGS',
-       'ENGINES',
-       'CHARSET',
-       'CHARACTER SET',
-       'COLLATION',
-       'BINARY LOGS',
-       'MASTER LOGS',
-       'PRIVILEGES',
-       'PROFILES',
-       'REPLICAS',
-       'SLAVE HOSTS',
-       # Mindsdb specific
-       'VIEWS',
-       'STREAMS',
-       'PREDICTORS',
-       'INTEGRATIONS',
-       'DATASOURCES',
-       'PUBLICATIONS',
-       'DATASETS',
-       'MODELS',
-       'ML_ENGINES',
-       'HANDLERS',
-       'SEARCH_PATH',
-       'KNOWLEDGE_BASES',
-       'ALL')
+    @_(
+       'id',
+       'id id',
+    )
     def show_category(self, p):
-        return ' '.join([x for x in p])
+        if hasattr(p, 'id'):
+            return p.id
+        return f"{p.id0} {p.id1}"
 
     # custom show commands
     @_('SHOW ENGINE identifier STATUS',
@@ -585,8 +544,7 @@ def show(self, p):
             modes=[p[3]]
         )
 
-    @_('SHOW FUNCTION CODE identifier',
-       'SHOW PROCEDURE CODE identifier')
+    @_('SHOW id id identifier')
     def show(self, p):
         category = p[1] + ' ' + p[2]
         return Show(
@@ -1135,14 +1093,6 @@ def select(self, p):
         select.where = where_expr
         return select
 
-    # Special cases for keyword-like identifiers
-    @_('select FROM TABLES')
-    def select(self, p):
-        select = p.select
-        ensure_select_keyword_order(select, 'FROM')
-        select.from_table = Identifier(p.TABLES)
-        return select
-
     @_('select FROM from_table_aliased',
        'select FROM join_tables_implicit',
        'select FROM join_tables')
@@ -1645,6 +1595,7 @@ def parameter(self, p):
        'HORIZON',
        'HOSTS',
        'INDEXES',
+       'INDEX',
        'INTEGRATION',
        'INTEGRATIONS',
        'ISOLATION',
@@ -1686,6 +1637,7 @@ def parameter(self, p):
        'STREAM',
        'STREAMS',
        'TABLES',
+       'TABLE',
        'TRAIN',
        'TRANSACTION',
        'TRIGGERS',
@@ -1696,7 +1648,17 @@ def parameter(self, p):
        'WARNINGS',
        'MODEL',
        'MODELS',
-       'AGENT'
+       'AGENT',
+       'SCHEMAS',
+       'FUNCTION',
+       'charset',
+       'PROCEDURE',
+       'ML_ENGINES',
+       'HANDLERS',
+       'BINARY',
+       'KNOWLEDGE_BASES',
+       'ALL',
+       'CREATE',
        )
     def id(self, p):
         return p[0]

diff --git a/mindsdb_sql/parser/dialects/mysql/parser.py b/mindsdb_sql/parser/dialects/mysql/parser.py
@@ -594,14 +594,6 @@ def select(self, p):
         select.where = where_expr
         return select
 
-    # Special cases for keyword-like identifiers
-    @_('select FROM TABLES')
-    def select(self, p):
-        select = p.select
-        ensure_select_keyword_order(select, 'FROM')
-        select.from_table = Identifier(p.TABLES)
-        return select
-
     @_('select FROM from_table_aliased',
        'select FROM join_tables_implicit',
        'select FROM join_tables')

diff --git a/tests/test_parser/test_base_sql/test_show.py b/tests/test_parser/test_base_sql/test_show.py
@@ -36,12 +36,6 @@ def test_show_category(self, dialect):
             assert str(ast) == str(expected_ast)
             assert ast.to_tree() == expected_ast.to_tree()
 
-    def test_show_unknown_category_error(self, dialect):
-        sql = "SHOW abracadabra"
-
-        with pytest.raises(ParsingException):
-            parse_sql(sql, dialect=dialect)
-
     def test_show_unknown_condition_error(self, dialect):
         sql = "SHOW databases WITH"
         with pytest.raises(ParsingException):