fix error when sql select from more than one table

eosphoros-ai · Oct 8, 2023 · acfab5a · acfab5a
1 parent b0d5783
commit acfab5a
Show file tree

Hide file tree

Showing 12 changed files with 3,976 additions and 3,930 deletions.
diff --git a/sqlgpt_parser/parser/mysql_parser/parser.py b/sqlgpt_parser/parser/mysql_parser/parser.py
@@ -1042,7 +1042,7 @@ def p_table_primary(p):
     r"""table_primary : aliased_relation
     | derived_table
     | LPAREN relations RPAREN"""
-    if len(p) == 3:
+    if len(p) == 4:
         p[0] = p[2]
     else:
         p[0] = p[1]
@@ -2950,6 +2950,7 @@ def p_non_reserved(p):
     | CELIING
     | CEIL
     | CEILING
+    | CHARACTER
     | CHARACTER_LENGTH
     | CHAR_LENGTH
     | COERCIBILITY
@@ -3061,12 +3062,14 @@ def p_non_reserved(p):
     | LOG
     | LOG10
     | LOG2
+    | LONG
     | LOWER
     | LPAD
     | LTRIM
     | MAKEDATE
     | MAKE_SET
     | MASTER_POS_WAIT
+    | MATCH
     | MD5
     | MID
     | MONTHNAME
@@ -3088,6 +3091,7 @@ def p_non_reserved(p):
     | POWER
     | QUOTE
     | RANDOM_BYTES
+    | RANGE
     | RANK
     | READS
     | REDOFILE
@@ -3380,6 +3384,7 @@ def p_not_keyword_token(p):
     | SERIALIZABLE
     | SESSION
     | SHARE
+    | SHOW
     | SHUTDOWN
     | SIGN
     | SIGNED

diff --git a/sqlgpt_parser/parser/mysql_parser/parser_table.py b/sqlgpt_parser/parser/mysql_parser/parser_table.py
diff --git a/sqlgpt_parser/parser/mysql_parser/reserved.py b/sqlgpt_parser/parser/mysql_parser/reserved.py
@@ -747,7 +747,6 @@
     'CAST',
     'CHANGE',
     'CHAR',
-    'CHARACTER',
     'CHECK',
     'COLLATE',
     'CONCAT',
@@ -851,11 +850,9 @@
     'LOCALTIME',
     'LOCALTIMESTAMP',
     'LOCK',
-    'LONG',
     'LONGBLOB',
     'LONGTEXT',
     'LOW_PRIORITY',
-    'MATCH',
     'MAXVALUE',
     'MEDIUMBLOB',
     'MEDIUMINT',
@@ -886,7 +883,6 @@
     'PROCEDURE',
     'RADIANS',
     'RAND',
-    'RANGE',
     'READ',
     'REAL',
     'RECURSIVE',
@@ -906,7 +902,6 @@
     'SECOND_MICROSECOND',
     'SELECT',
     'SET',
-    'SHOW',
     'SIGNAL',
     'SIN',
     'SMALLINT',
@@ -990,6 +985,7 @@
     'CELIING',
     'CEIL',
     'CEILING',
+    'CHARACTER',
     'CHARACTER_LENGTH',
     'CHAR_LENGTH',
     'COERCIBILITY',
@@ -1102,6 +1098,7 @@
     'LOG',
     'LOG10',
     'LOG2',
+    'LONG',
     'LOWER',
     'LPAD',
     'LTRIM',
@@ -1131,6 +1128,7 @@
     'POWER',
     'QUOTE',
     'RANDOM_BYTES',
+    'RANGE',
     'RANK',
     'READS',
     'REDOFILE',
@@ -1341,6 +1339,7 @@
     "LOCKED",
     "LOGS",
     "MASTER",
+    'MATCH',
     'MAX',
     "MAX_ROWS",
     "MB",
@@ -1420,6 +1419,7 @@
     "SERIALIZABLE",
     "SESSION",
     "SHARE",
+    'SHOW',
     "SHUTDOWN",
     'SIGN',
     "SIGNED",

diff --git a/sqlgpt_parser/parser/oceanbase_parser/parser.py b/sqlgpt_parser/parser/oceanbase_parser/parser.py
@@ -1041,7 +1041,7 @@ def p_table_primary(p):
     r"""table_primary : aliased_relation
     | derived_table
     | LPAREN relations RPAREN"""
-    if len(p) == 3:
+    if len(p) == 4:
         p[0] = p[2]
     else:
         p[0] = p[1]
@@ -3082,6 +3082,7 @@ def p_non_reserved(p):
     | CEILING
     | CHAIN
     | CHANGED
+    | CHARACTER
     | CHARACTER_LENGT
     | CHARACTER_LENGTH
     | CHARSET
@@ -3393,6 +3394,7 @@ def p_non_reserved(p):
     | LOGFILE
     | LOGONLY_REPLICA_NUM
     | LOGS
+    | LONG
     | LONGB
     | LOOP
     | LOWER
@@ -3427,6 +3429,7 @@ def p_non_reserved(p):
     | MASTER_SSL_KEY
     | MASTER_SSL_VERIFY_SERVER_CERT
     | MASTER_USER
+    | MATCH
     | MATCHED
     | MATERIALIZED
     | MAX
@@ -3575,6 +3578,7 @@ def p_non_reserved(p):
     | R32
     | RANDOM
     | RANDOM_BYTES
+    | RANGE
     | RANK
     | READS
     | READ_ONLY
@@ -3675,6 +3679,7 @@ def p_non_reserved(p):
     | SHA1
     | SHA2
     | SHARE
+    | SHOW
     | SHUTDOWN
     | SKIP
     | SIGN

diff --git a/sqlgpt_parser/parser/oceanbase_parser/parser_table.py b/sqlgpt_parser/parser/oceanbase_parser/parser_table.py
diff --git a/sqlgpt_parser/parser/oceanbase_parser/reserved.py b/sqlgpt_parser/parser/oceanbase_parser/reserved.py
@@ -742,7 +742,6 @@
     'CASE',
     'CHANGE',
     'CHAR',
-    'CHARACTER',
     'CHECK',
     'COLLATE',
     'CONCAT',
@@ -846,11 +845,9 @@
     'LOCALTIME',
     'LOCALTIMESTAMP',
     'LOCK',
-    'LONG',
     'LONGBLOB',
     'LONGTEXT',
     'LOW_PRIORITY',
-    'MATCH',
     'MAXVALUE',
     'MEDIUMBLOB',
     'MEDIUMINT',
@@ -881,7 +878,6 @@
     'PROCEDURE',
     'RADIANS',
     'RAND',
-    'RANGE',
     'READ',
     'REAL',
     'RECURSIVE',
@@ -901,7 +897,6 @@
     'SECOND_MICROSECOND',
     'SELECT',
     'SET',
-    'SHOW',
     'SIGNAL',
     'SIN',
     'SMALLINT',
@@ -1041,6 +1036,7 @@
     'CEILING',
     'CHAIN',
     'CHANGED',
+    'CHARACTER',
     'CHARACTER_LENGT',
     'CHARACTER_LENGTH',
     'CHARSET',
@@ -1354,6 +1350,7 @@
     'LOGFILE',
     'LOGONLY_REPLICA_NUM',
     'LOGS',
+    'LONG',
     'LONGB',
     'LOOP',
     'LOWER',
@@ -1388,6 +1385,7 @@
     'MASTER_SSL_KEY',
     'MASTER_SSL_VERIFY_SERVER_CERT',
     'MASTER_USER',
+    'MATCH',
     'MATCHED',
     'MATERIALIZED',
     'MAX',
@@ -1538,6 +1536,7 @@
     'R32',
     'RANDOM',
     'RANDOM_BYTES',
+    'RANGE',
     'RANK',
     'RAWTOHEX',
     'READS',
@@ -1641,6 +1640,7 @@
     'SHA1',
     'SHA2',
     'SHARE',
+    'SHOW',
     'SHUTDOWN',
     'SKIP',
     'SIGN',

diff --git a/sqlgpt_parser/parser/odps_parser/parser.py b/sqlgpt_parser/parser/odps_parser/parser.py
@@ -1043,7 +1043,7 @@ def p_table_primary(p):
     r"""table_primary : aliased_relation
     | derived_table
     | LPAREN relations RPAREN"""
-    if len(p) == 3:
+    if len(p) == 4:
         p[0] = p[2]
     else:
         p[0] = p[1]
@@ -3088,6 +3088,7 @@ def p_non_reserved(p):
     | CEILING
     | CHAIN
     | CHANGED
+    | CHARACTER
     | CHARACTER_LENGT
     | CHARACTER_LENGTH
     | CHARSET
@@ -3399,6 +3400,7 @@ def p_non_reserved(p):
     | LOGFILE
     | LOGONLY_REPLICA_NUM
     | LOGS
+    | LONG
     | LONGB
     | LOOP
     | LOWER
@@ -3433,6 +3435,7 @@ def p_non_reserved(p):
     | MASTER_SSL_KEY
     | MASTER_SSL_VERIFY_SERVER_CERT
     | MASTER_USER
+    | MATCH
     | MATCHED
     | MATERIALIZED
     | MAX
@@ -3583,6 +3586,7 @@ def p_non_reserved(p):
     | RANDOM
     | RANDOM_BYTES
     | RANK
+    | RANGE
     | READS
     | READ_ONLY
     | READ_WRITE
@@ -3682,6 +3686,7 @@ def p_non_reserved(p):
     | SHA1
     | SHA2
     | SHARE
+    | SHOW
     | SHUTDOWN
     | SKIP
     | SIGN

diff --git a/sqlgpt_parser/parser/odps_parser/parser_table.py b/sqlgpt_parser/parser/odps_parser/parser_table.py
diff --git a/sqlgpt_parser/parser/odps_parser/reserved.py b/sqlgpt_parser/parser/odps_parser/reserved.py
@@ -633,7 +633,6 @@
     'PREPARE',
     'PRIMARY',
     'PROCEDURE',
-    'RANGE',
     'READS',
     'REAL',
     'RECURSIVE',
@@ -742,7 +741,6 @@
     'CASE',
     'CHANGE',
     'CHAR',
-    'CHARACTER',
     'CHECK',
     'COLLATE',
     'CONCAT',
@@ -846,11 +844,9 @@
     'LOCALTIME',
     'LOCALTIMESTAMP',
     'LOCK',
-    'LONG',
     'LONGBLOB',
     'LONGTEXT',
     'LOW_PRIORITY',
-    'MATCH',
     'MAXVALUE',
     'MEDIUMBLOB',
     'MEDIUMINT',
@@ -901,7 +897,6 @@
     'SECOND_MICROSECOND',
     'SELECT',
     'SET',
-    'SHOW',
     'SIGNAL',
     'SIN',
     'SMALLINT',
@@ -1041,6 +1036,7 @@
     'CEILING',
     'CHAIN',
     'CHANGED',
+    'CHARACTER',
     'CHARACTER_LENGT',
     'CHARACTER_LENGTH',
     'CHARSET',
@@ -1354,6 +1350,7 @@
     'LOGFILE',
     'LOGONLY_REPLICA_NUM',
     'LOGS',
+    'LONG',
     'LONGB',
     'LOOP',
     'LOWER',
@@ -1388,6 +1385,7 @@
     'MASTER_SSL_KEY',
     'MASTER_SSL_VERIFY_SERVER_CERT',
     'MASTER_USER',
+    'MATCH',
     'MATCHED',
     'MATERIALIZED',
     'MAX',
@@ -1539,6 +1537,7 @@
     'R32',
     'RANDOM',
     'RANDOM_BYTES',
+    'RANGE',
     'RANK',
     'RAWTOHEX',
     'READS',
@@ -1642,6 +1641,7 @@
     'SHA1',
     'SHA2',
     'SHARE',
+    'SHOW',
     'SHUTDOWN',
     'SKIP',
     'SIGN',

diff --git a/sqlgpt_parser/parser/parser_utils.py b/sqlgpt_parser/parser/parser_utils.py
@@ -218,9 +218,16 @@ def visit_query_specification(self, node, context):
                     | ParserUtils.CollectInfo.COLLECT_MIN_MAX_EXPRESSION_COLUMN
                 )
                 self.process(node.select, context)
-                context = ParserUtils.CollectInfo.COLLECT_TABLE
+                context = (
+                    ParserUtils.CollectInfo.COLLECT_TABLE
+                    | ParserUtils.CollectInfo.COLLECT_FILTER_COLUMN
+                )
                 if node.from_:
-                    self.process(node.from_, context)
+                    if isinstance(node.from_, list):
+                        for item in node.from_:
+                            self.process(item, context)
+                    else:
+                        self.process(node.from_, context)
                 context = (
                     ParserUtils.CollectInfo.COLLECT_IN_EXPRESSION_COLUMN
                     | ParserUtils.CollectInfo.COLLECT_FILTER_COLUMN