Merge pull request #7 from qidi1/fix-time-interval-format-error

fix format time interval error

README.md

@@ -34,7 +34,7 @@ Query(query_body=QuerySpecification(select=Select(distinct=False, select_items=[
 ### Format SQL
 ```python
 >>> from sqlgpt_parser.format.formatter import format_sql
->>> from sqlgpt_parser.mysql_parser import parser
+>>> from sqlgpt_parser.parser.mysql_parser import parser
 >>> result=parser.parse("select * from t")
 >>> format_sql(result)
 'SELECT\n  *\nFROM\n  t'

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "sqlgpt-parser"
-version = "0.0.1a3"
+version = "0.0.1a4"
 authors = [
   { name="luliwjc", email="[email protected]" },
   { name="Ifffff", email="[email protected]" },

sqlgpt_parser/format/formatter.py

@@ -36,6 +36,9 @@ def visit_at_time_zone(self, node, context):
             self.process(node.time_zone, context),
         )
 
+    def visit_time_interval(self, node, context):
+        return f"INTERVAL {self.process(node.value, context)} {node.unit.upper()}"
+
     def visit_current_time(self, node, unmangle_names):
         return "%s%s" % (node.type, "(%s)" % node.precision if node.precision else "")
 
@@ -106,7 +109,7 @@ def visit_dereference_expression(self, node, unmangle_names):
 
     def visit_function_call(self, node, unmangle_names):
         ret = ""
-        arguments = self._join_expressions(node.args, unmangle_names)
+        arguments = self._join_expressions(node.arguments, unmangle_names)
         if "count" == node.name.lower() and len(arguments) != 0 and arguments[0] == '*':
             arguments = "*"
         if node.distinct:

sqlgpt_parser/parser/mysql_parser/parser.py

@@ -59,6 +59,7 @@
     TrimFunc,
     WhenClause,
     JsonTableColumn,
+    TimeInterval,
 )
 from sqlgpt_parser.parser.tree.grouping import SimpleGroupBy
 from sqlgpt_parser.parser.tree.join_criteria import JoinOn, JoinUsing, NaturalJoin
@@ -72,6 +73,7 @@
     TimeLiteral,
     DefaultLiteral,
     ErrorLiteral,
+    TimestampLiteral,
 )
 from sqlgpt_parser.parser.tree.node import Node
 from sqlgpt_parser.parser.tree.qualified_name import QualifiedName
@@ -689,7 +691,12 @@ def p_date_lit(p):
     r"""date_lit : DATE  string_lit
     | TIME  string_lit
     | TIMESTAMP  string_lit"""
-    p[0] = DateLiteral(p.lineno(1), p.lexpos(1), value=p[2], unit=p[1])
+    if p.slice[1].type.upper() == "DATE":
+        p[0] = DateLiteral(p.lineno(1), p.lexpos(1), value=p[2])
+    elif p.slice[1].type.upper() == "TIME":
+        p[0] = TimeLiteral(p.lineno(1), p.lexpos(1), value=p[2])
+    elif p.slice[1].type.upper() == "TIMESTAMP":
+        p[0] = TimestampLiteral(p.lineno(1), p.lexpos(1), value=p[2])
 
 
 def p_order(p):
@@ -3437,7 +3444,7 @@ def p_time_interval(p):
     r"""time_interval : INTERVAL expression time_unit
     | QM"""
     if len(p) == 4:
-        p[0] = TimeLiteral(p.lineno(1), p.lexpos(1), value=p[2], unit=p[3])
+        p[0] = TimeInterval(p.lineno(1), p.lexpos(1), value=p[2], unit=p[3])
     else:
         p[0] = p[1]
 

sqlgpt_parser/parser/oceanbase_parser/parser.py

@@ -59,6 +59,7 @@
     TrimFunc,
     WhenClause,
     JsonTableColumn,
+    TimeInterval,
 )
 from sqlgpt_parser.parser.tree.grouping import SimpleGroupBy
 from sqlgpt_parser.parser.tree.join_criteria import JoinOn, JoinUsing, NaturalJoin
@@ -72,6 +73,7 @@
     TimeLiteral,
     DefaultLiteral,
     ErrorLiteral,
+    TimestampLiteral,
 )
 from sqlgpt_parser.parser.tree.node import Node
 from sqlgpt_parser.parser.tree.qualified_name import QualifiedName
@@ -686,7 +688,12 @@ def p_date_lit(p):
     r"""date_lit : DATE  string_lit
     | TIME  string_lit
     | TIMESTAMP  string_lit"""
-    p[0] = DateLiteral(p.lineno(1), p.lexpos(1), value=p[2], unit=p[1])
+    if p.slice[1].type.upper() == "DATE":
+        p[0] = DateLiteral(p.lineno(1), p.lexpos(1), value=p[2])
+    elif p.slice[1].type.upper() == "TIME":
+        p[0] = TimeLiteral(p.lineno(1), p.lexpos(1), value=p[2])
+    elif p.slice[1].type.upper() == "TIMESTAMP":
+        p[0] = TimestampLiteral(p.lineno(1), p.lexpos(1), value=p[2])
 
 
 def p_order(p):
@@ -3859,7 +3866,7 @@ def p_time_interval(p):
     r"""time_interval : INTERVAL expression time_unit
     | QM"""
     if len(p) == 4:
-        p[0] = TimeLiteral(p.lineno(1), p.lexpos(1), value=p[2], unit=p[3])
+        p[0] = TimeInterval(p.lineno(1), p.lexpos(1), value=p[2], unit=p[3])
     else:
         p[0] = p[1]