BUG: Fix bug where you couldn't multiply or perform math operations on the right side of a column

Author: zbrookle

dataframe_sql/grammar/sql.grammar

@@ -56,6 +56,7 @@ order: expression_math ["ASC"i] -> order_asc
 column_name: [NAME "."] NAME
 ?expression_product: expression
                   | expression_product "*" expression -> expression_mul
+                  | expression "*" expression -> expression_mul
                   | expression_product "/" expression -> expression_div
 
 ?expression: [NAME "."] (NAME | STAR) -> column_name
@@ -104,12 +105,8 @@ not_in_expr: expression_math "NOT"i "IN"i "(" [expression_math ","] expression_m
 boolean: "true"i -> true
        | "false"i -> false
 ?number_expr: product
-            | number_expr "+" product -> add
-            | number_expr "-" product -> sub
 
 ?product: NUMBER
-        | product "*" NUMBER -> mul
-        | product "/" NUMBER -> div
 
 integer: /[1-9][0-9]*/
 STAR: "*"

dataframe_sql/sql_select_query.py

@@ -123,6 +123,7 @@ def __init__(self, sql: str, show_exececution_plan: bool = False):
     def parse_sql(self):
         try:
             tree = self.parser.parse(self.sql)
+            print(tree.pretty())
 
             table_info = TableInfo()
 

dataframe_sql/tests/pandas_sql_functionality_test.py

@@ -1394,9 +1394,20 @@ def test_sql_data_types():
     tm.assert_frame_equal(pandas_frame, my_frame)
 
 
+def test_math_parentheses():
+    """
+    Test math parentheses
+    :return:
+    """
+
+    my_frame = query("select 20 * avocado_id from avocado")
+
+    print(my_frame)
+
+
 if __name__ == "__main__":
     register_env_tables()
 
-    test_sql_data_types()
+    test_right_left_math()
 
     remove_env_tables()