@@ -482,11 +482,7 @@ def simplify_equality(expression: exp.Expression) -> exp.Expression:
482482 if isinstance (expression , COMPARISONS ):
483483 l , r = expression .left , expression .right
484484
485- if l .__class__ in INVERSE_OPS :
486- pass
487- elif r .__class__ in INVERSE_OPS :
488- l , r = r , l
489- else :
485+ if not l .__class__ in INVERSE_OPS :
490486 return expression
491487
492488 if r .is_number :
@@ -828,7 +824,8 @@ def _datetrunc_neq(
828824
829825
830826DATETRUNC_BINARY_COMPARISONS : t .Dict [t .Type [exp .Expression ], DateTruncBinaryTransform ] = {
831- exp .LT : lambda l , dt , u , d : l < date_literal (date_floor (dt , u , d )),
827+ exp .LT : lambda l , dt , u , d : l
828+ < date_literal (dt if dt == date_floor (dt , u , d ) else date_floor (dt , u , d ) + interval (u )),
832829 exp .GT : lambda l , dt , u , d : l >= date_literal (date_floor (dt , u , d ) + interval (u )),
833830 exp .LTE : lambda l , dt , u , d : l < date_literal (date_floor (dt , u , d ) + interval (u )),
834831 exp .GTE : lambda l , dt , u , d : l >= date_literal (date_ceil (dt , u , d )),
@@ -858,12 +855,7 @@ def simplify_datetrunc(expression: exp.Expression, dialect: Dialect) -> exp.Expr
858855 if isinstance (expression , exp .Binary ):
859856 l , r = expression .left , expression .right
860857
861- if _is_datetrunc_predicate (l , r ):
862- pass
863- elif _is_datetrunc_predicate (r , l ):
864- comparison = INVERSE_COMPARISONS .get (comparison , comparison )
865- l , r = r , l
866- else :
858+ if not _is_datetrunc_predicate (l , r ):
867859 return expression
868860
869861 l = t .cast (exp .DateTrunc , l )
@@ -906,12 +898,12 @@ def sort_comparison(expression: exp.Expression) -> exp.Expression:
906898 l , r = expression .this , expression .expression
907899 l_column = isinstance (l , exp .Column )
908900 r_column = isinstance (r , exp .Column )
909- l_literal = isinstance ( l , ( exp . Literal , exp . Boolean ) )
910- r_literal = isinstance ( r , ( exp . Literal , exp . Boolean ) )
901+ l_const = _is_constant ( l )
902+ r_const = _is_constant ( r )
911903
912- if (l_column and not r_column ) or (r_literal and not l_literal ):
904+ if (l_column and not r_column ) or (r_const and not l_const ):
913905 return expression
914- if (r_column and not l_column ) or (l_literal and not r_literal ) or (gen (l ) > gen (r )):
906+ if (r_column and not l_column ) or (l_const and not r_const ) or (gen (l ) > gen (r )):
915907 return INVERSE_COMPARISONS .get (expression .__class__ , expression .__class__ )(
916908 this = r , expression = l
917909 )
0 commit comments