Merge branch 'master' into dq

[dbsrgits/SQL-Abstract.git] / t / 05in_between.t

diff --git a/t/05in_between.t b/t/05in_between.t
index d2ee54f..7336158 100644 (file)
--- a/t/05in_between.t
+++ b/t/05in_between.t
@@ -75,7 +75,7 @@ my @in_between_tests = (
       ] },
     },
     stmt => "WHERE (
-          ( start0 BETWEEN ? AND UPPER ?          )
+          ( start0 BETWEEN ? AND UPPER(?)         )
       AND ( start1 BETWEEN ? AND ?                )
       AND ( start2 BETWEEN lower(x) AND upper(y)  )
       AND ( start3 BETWEEN lower(x) AND upper(?)  )
@@ -95,7 +95,7 @@ my @in_between_tests = (
       ] },
     },
     stmt => "WHERE (
-          ( start0 BETWEEN ? AND UPPER ?          )
+          ( start0 BETWEEN ? AND UPPER(?)         )
       AND ( start1 BETWEEN ? AND ?                )
       AND ( start2 BETWEEN lower(x) AND upper(y)  )
       AND ( start3 BETWEEN lower(x) AND upper(?)  )
@@ -168,26 +168,24 @@ my @in_between_tests = (
   },
   {
     where => { x => { -in => [ \['LOWER(?)', 'A' ], \'LOWER(b)', { -lower => 'c' } ] } },
-    stmt => " WHERE ( x IN ( LOWER(?), LOWER(b), LOWER ? ) )",
+    stmt => " WHERE ( x IN ( LOWER(?), LOWER(b), LOWER(?) ) )",
     bind => [qw/A c/],
     test => '-in with an array of function array refs with args',
   },
   {
     where => { x => { -in => [ 1, undef ] } },
-    stmt => " WHERE ( x IN ( ?, NULL ) )",
-    bind => [ 1 ],
+    stmt => " WHERE ( x IN ( ?, ? ) )",
+    bind => [ 1, undef ],
     test => '-in with undef as an element', 
   },
   {
     where => { x => { -in => [ 1, undef, 2, 3, undef ] } },
-    stmt => " WHERE ( x IN ( ?, NULL, ?, ?, NULL ) )",
-    bind => [ 1, 2, 3 ],
+    stmt => " WHERE ( x IN ( ?, ?, ?, ?, ? ) )",
+    bind => [ 1, undef, 2, 3, undef ],
     test => '-in with undef as an element',
   },
 );
 
-plan tests => @in_between_tests*3;
-
 for my $case (@in_between_tests) {
   TODO: {
     local $TODO = $case->{todo} if $case->{todo};
@@ -214,3 +212,5 @@ for my $case (@in_between_tests) {
     diag "Error: $e\n Search term:\n".Dumper($case->{where}) if $e;
   }
 }
+
+done_testing;