'and' + 'or' support

Author: AmirPupko

pandas_to_sql/engine/columns/common.py

@@ -68,10 +68,18 @@ def __eq__(self,other):
 
     def __ne__(self,other):
         return create_column_from_operation(self, other, BoolColumn, '<>')
+    
+    def __and__(self,other):
+        return create_column_from_operation(self, other, BoolColumn, 'AND')
+    
+    def __or__(self,other):
+        return create_column_from_operation(self, other, BoolColumn, 'OR')
 
     class_type.__lt__ = __lt__
     class_type.__gt__ = __gt__
     class_type.__le__ = __le__
     class_type.__ge__ = __ge__
     class_type.__eq__ = __eq__
     class_type.__ne__ = __ne__
+    class_type.__and__ = __and__
+    class_type.__or__ = __or__

pandas_to_sql/testing/tests/test_operations_compare.py

@@ -70,4 +70,15 @@ def test_neg_bool():
 def test_neg_numeric():
     df = pytest.df1
     df['new_value'] = -df.random_int
-    assert_(df)
+    assert_(df)
+
+
+def test_two_conds_and():
+    df = pytest.df1
+    df['new_value'] = (df.random_float > 1) & (df.random_float <=2)
+    assert_(df)
+
+def test_two_conds_or():
+    df = pytest.df1
+    df['new_value'] = (df.random_float > 1) or True
+    assert_(df)