Merge pull request #17 from zbrookle/parentheses

BUG: Fix issue where you can't perform algebra on the left side of an expression

Author: zbrookle

dataframe_sql/grammar/sql.grammar

@@ -104,12 +104,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,45 @@ def test_sql_data_types():
     tm.assert_frame_equal(pandas_frame, my_frame)
 
 
+def test_order_of_operations_no_parens():
+    """
+    Test math parentheses
+    :return:
+    """
+
+    my_frame = query("select 20 * avocado_id + 3 / 20 as my_math from avocado")
+
+    pandas_frame = AVOCADO.copy()[["avocado_id"]]
+    pandas_frame["my_math"] = 20 * pandas_frame["avocado_id"] + 3 / 20
+
+    pandas_frame = pandas_frame.drop(columns=["avocado_id"])
+
+    tm.assert_frame_equal(pandas_frame, my_frame)
+
+
+# def test_order_of_operations_with_parens():
+#     """
+#     Test math parentheses
+#     :return:
+#     """
+#
+#     my_frame = query(
+#         "select 20 * (avocado_id + 3) / (20 + avocado_id) as my_math from " "avocado"
+#     )
+#
+#     pandas_frame = AVOCADO.copy()[["avocado_id"]]
+#     pandas_frame["my_math"] = (
+#         20 * (pandas_frame["avocado_id"] + 3) / (20 + pandas_frame["avocado_id"])
+#     )
+#
+#     pandas_frame = pandas_frame.drop(columns=["avocado_id"])
+#
+#     tm.assert_frame_equal(pandas_frame, my_frame)
+
+
 if __name__ == "__main__":
     register_env_tables()
 
-    test_sql_data_types()
+    # test_order_of_operations_with_parens()
 
     remove_env_tables()

dataframe_sql/tests/sql_execution_plan_test.py

@@ -82,7 +82,8 @@ def test_using_math():
         "select temp, 1 + 2 * 3 as my_number from forest_fires",
         show_execution_plan=True,
     )
-    assert plan == "FOREST_FIRES.loc[:, ['temp']].assign(my_number=7, )"
+
+    assert plan == "FOREST_FIRES.loc[:, ['temp']].assign(my_number=1 + 2 * 3)"
 
 
 def test_distinct():
@@ -1086,6 +1087,6 @@ def test_timestamps():
 if __name__ == "__main__":
     register_env_tables()
 
-    # test_rank_statement_one_column()
+    test_using_math()
 
     remove_env_tables()