ENH: Add order of operations to boolean evaluation

Author: zbrookle

dataframe_sql/grammar/sql.grammar

@@ -90,9 +90,12 @@ alias: NAME -> alias_string
 _window_name: NAME
 limit_count: integer -> limit_count
 skip_rows: integer
-bool_expression: bool_expression "AND"i bool_expression -> bool_and
-                 | bool_expression "OR"i bool_expression -> bool_or
-                 | comparison_type
+bool_expression: bool_parentheses
+                 | bool_expression "AND"i bool_parentheses -> bool_and
+                 | bool_expression "OR"i bool_parentheses -> bool_or
+bool_parentheses: comparison_type
+                 | "(" bool_expression "AND"i comparison_type ")" -> bool_and
+                 | "(" bool_expression "OR"i comparison_type ")" -> bool_or
 comparison_type: equals | not_equals | greater_than | less_than | greater_than_or_equal | less_than_or_equal | between | in_expr | not_in_expr
 equals: expression_math "=" expression_math
 not_equals: expression_math ("<>" | "!=") expression_math

dataframe_sql/parsing/sql_parser.py

@@ -521,6 +521,9 @@ def bool_and(self, truth_series_pair: List[Value]) -> ValueWithPlan:
             f"{plans[0]} & {plans[1]}",
         )
 
+    def bool_parentheses(self, bool_expression_in_list: list):
+        return bool_expression_in_list[0]
+
     def bool_or(self, truth_series_pair):
         """
         Return the truth value of the series pair
@@ -1166,7 +1169,7 @@ def join_expression(self, *args):
                 join_type = "outer"
 
         # Check that there is a column from both sides
-        column_comparison = join_condition.children[0].children
+        column_comparison = join_condition.children[0].children[0].children
         column1 = str(column_comparison[0].children)
         column2 = str(column_comparison[1].children)
 

dataframe_sql/sql_objects.py

@@ -244,6 +244,24 @@ def __init__(self, value, execution_plan):
     def __repr__(self):
         return Value.__repr__(self) + ")"
 
+    def __or__(self, other):
+        if not isinstance(other, Value):
+            raise Exception(f"Operator | is not supported between type {type(other)} "
+                            f"and type ValueWithPlan")
+
+        return ValueWithPlan(self.get_value() | other.get_value(),
+                             f"{self.get_plan_representation()} | "
+                             f"{other.get_plan_representation()}")
+
+    def __and__(self, other):
+        if not isinstance(other, Value):
+            raise Exception(f"Operator && is not supported between type {type(other)} "
+                            f"and type ValueWithPlan")
+
+        ValueWithPlan(self.get_value() & other.get_value(),
+                      f"{self.get_plan_representation()} & "
+                      f"{other.get_plan_representation()}")
+
     def get_plan_representation(self) -> str:
         return self.execution_plan
 

dataframe_sql/tests/pandas_sql_functionality_test.py

@@ -1394,7 +1394,7 @@ def test_sql_data_types():
     tm.assert_frame_equal(pandas_frame, my_frame)
 
 
-def test_order_of_operations_no_parens():
+def test_math_order_of_operations_no_parens():
     """
     Test math parentheses
     :return:
@@ -1410,14 +1410,14 @@ def test_order_of_operations_no_parens():
     tm.assert_frame_equal(pandas_frame, my_frame)
 
 
-def test_order_of_operations_with_parens():
+def test_math_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"
+        "select 20 * (avocado_id + 3) / (20 + avocado_id) as my_math from avocado"
     )
 
     pandas_frame = AVOCADO.copy()[["avocado_id"]]
@@ -1429,10 +1429,24 @@ def test_order_of_operations_with_parens():
 
     tm.assert_frame_equal(pandas_frame, my_frame)
 
+def test_boolean_order_of_operations_with_parens():
+    """
+    Test boolean order of operations with parentheses
+    :return:
+    """
+    my_frame = query(
+        "select * from forest_fires "
+        "where (month = 'oct' and day = 'fri') or "
+        "(month = 'nov' and day = 'tue')"
+    )
+
+
+
+
 
 if __name__ == "__main__":
     register_env_tables()
 
-    test_order_of_operations_with_parens()
+    test_right_joins()
 
     remove_env_tables()