fix simplify connectors

Author: geooo109

sqlglot/optimizer/simplify.py

@@ -734,9 +734,9 @@ def _simplify_connectors(expression, left, right):
                     return exp.null()
                 if always_true(left) and always_true(right):
                     return exp.true()
-                if always_true(left) and right.is_type(exp.DataType.Type.BOOLEAN):
+                if always_true(left):
                     return right
-                if always_true(right) and left.is_type(exp.DataType.Type.BOOLEAN):
+                if always_true(right):
                     return left
                 return self._simplify_comparison(expression, left, right)
             elif isinstance(expression, exp.Or):
@@ -748,14 +748,18 @@ def _simplify_connectors(expression, left, right):
                     or (always_false(left) and is_null(right))
                 ):
                     return exp.null()
-                if is_false(left) and right.is_type(exp.DataType.Type.BOOLEAN):
+                if is_false(left):
                     return right
-                if is_false(right) and left.is_type(exp.DataType.Type.BOOLEAN):
+                if is_false(right):
                     return left
                 return self._simplify_comparison(expression, left, right, or_=True)
 
         if isinstance(expression, exp.Connector):
-            return self._flat_simplify(expression, _simplify_connectors, root)
+            expression = self._flat_simplify(expression, _simplify_connectors, root)
+            if not isinstance(
+                expression, (exp.Connector, exp.Boolean, exp.Null)
+            ) and not expression.is_type(exp.DataType.Type.BOOLEAN):
+                expression = expression.and_(exp.true(), copy=False)
         return expression
 
     @annotate_types_on_change

tests/fixtures/optimizer/simplify.sql

@@ -175,28 +175,28 @@ A AND (A OR B);
 A AND TRUE;
 
 A AND D AND E AND (B OR A);
-A AND D AND E AND TRUE;
+A AND D AND E;
 
 D AND A AND E AND (B OR A);
-A AND D AND E AND TRUE;
+A AND D AND E;
 
 (A OR B) AND A;
 A AND TRUE;
 
 C AND D AND (A OR B) AND E AND F AND A;
-A AND C AND D AND E AND F AND TRUE;
+A AND C AND D AND E AND F;
 
 A OR (A AND B);
-A OR FALSE;
+A AND TRUE;
 
 (A AND B) OR A;
-A OR FALSE;
+A AND TRUE;
 
 A AND (NOT A OR B);
-A AND (B OR FALSE);
+A AND B;
 
 (NOT A OR B) AND A;
-A AND (B OR FALSE);
+A AND B;
 
 A OR (NOT A AND B);
 A OR (B AND TRUE);