Convert (in)equality with undef to (not) defined/IS NOT NULL ops

[dbsrgits/Data-Query.git] / lib / Data / Query / ExprBuilder.pm

diff --git a/lib/Data/Query/ExprBuilder.pm b/lib/Data/Query/ExprBuilder.pm
index 35c0187..3c62973 100644 (file)
--- a/lib/Data/Query/ExprBuilder.pm
+++ b/lib/Data/Query/ExprBuilder.pm
@@ -32,11 +32,36 @@ use overload (
       });
     }
   }
-    qw(+ - * / % ** << >> . < > == != lt le gt ge eq ne),
+    qw(+ - * / % ** << >> . < > lt le gt ge ),
 
     # since 'and' and 'or' aren't operators we borrow the bitwise ops
     [ '&' => 'and' ], [ '|' => 'or' ],
   ),
+
+  # equality operators (need undef maping)
+  (map {
+    my ($overload, $as) = ref($_) ? @$_ : ($_, $_);
+    $overload => sub {
+      Data::Query::ExprBuilder->new({
+        expr => grep(!defined, @_[0,1])
+          ?  (map { $overload =~ /==|eq/ ? perl_operator(not => $_) : $_ }
+              perl_operator(defined => map { defined($_) ? $_->{expr} : () } @_[0,1]))
+          :  perl_operator(
+               $as,
+               map {
+                 (Scalar::Util::blessed($_)
+                 && $_->isa('Data::Query::ExprBuilder'))
+                   ? $_->{expr}
+                   : perl_scalar_value($_)
+                  # we're called with ($left, $right, 0) or ($right, $left, 1)
+                } $_[2] ? @_[1,0] : @_[0,1]
+              )
+      });
+    }
+  }
+    qw(== != eq ne)
+
+  ),
   # unsupported
   (map {
     my $op = $_;