[Refactor] New rule parser to support AST

core/ast/__init__.py

@@ -11,8 +11,8 @@
     SubqueryNode,
     ColumnNode,
     LiteralNode,
-    VarNode,
-    VarSetNode,
+    ElementVariableNode,
+    SetVariableNode,
     OperatorNode,
     FunctionNode,
     SelectNode,
@@ -22,6 +22,7 @@
     GroupByNode,
     HavingNode,
     OrderByNode,
+    OrderByItemNode,
     LimitNode,
     OffsetNode,
     QueryNode
@@ -34,8 +35,8 @@
     'SubqueryNode',
     'ColumnNode',
     'LiteralNode',
-    'VarNode',
-    'VarSetNode',
+    'ElementVariableNode',
+    'SetVariableNode',
     'OperatorNode',
     'FunctionNode',
     'SelectNode',

core/ast/node.py

@@ -168,19 +168,35 @@ def __eq__(self, other):
     def __hash__(self):
         return hash((super().__hash__(), self.value, self.unit))
 
-class VarNode(Node):
-    """VarSQL variable node"""
+class ElementVariableNode(Node):
+    """Rule element variable ``<name>`` (see ``VarType.ElementVariable`` in rule_parser_v2)."""
     def __init__(self, _name: str, **kwargs):
         super().__init__(NodeType.VAR, **kwargs)
         self.name = _name
 
+    def __eq__(self, other):
+        if not isinstance(other, ElementVariableNode):
+            return False
+        return super().__eq__(other) and self.name == other.name
+
+    def __hash__(self):
+        return hash((super().__hash__(), self.name))
+
 
-class VarSetNode(Node):
-    """VarSQL variable set node"""
+class SetVariableNode(Node):
+    """Rule set variable ``<<name>>`` (see ``VarType.SetVariable`` in rule_parser_v2)."""
     def __init__(self, _name: str, **kwargs):
         super().__init__(NodeType.VARSET, **kwargs)
         self.name = _name
 
+    def __eq__(self, other):
+        if not isinstance(other, SetVariableNode):
+            return False
+        return super().__eq__(other) and self.name == other.name
+
+    def __hash__(self):
+        return hash((super().__hash__(), self.name))
+
 
 class OperatorNode(Node):
     """Operator node"""

core/query_parser.py

@@ -4,9 +4,9 @@
     CaseNode, WhenThenNode,
     OperatorNode, UnaryOperatorNode, FunctionNode, GroupByNode, HavingNode,
     OrderByNode, OrderByItemNode, LimitNode, OffsetNode, SubqueryNode,
-    VarNode, VarSetNode, JoinNode, ListNode
+    ElementVariableNode, SetVariableNode, JoinNode, ListNode
 )
-# TODO: implement VarNode, VarSetNode
+# TODO: implement ElementVariableNode, SetVariableNode
 from core.ast.enums import JoinType, SortOrder
 import mo_sql_parsing as mosql
 import json