X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F01generate.t;h=245ca557c301e43c29c66170686cb27a47c9e88b;hb=40f2f2311d048aece00793477ab4b734d20f57bc;hp=833b2e3f8c4fda3c6db3bbd385e4272fe373620a;hpb=b9b5a0b15e324b820975e789abdacb0e4285f4b9;p=dbsrgits%2FSQL-Abstract.git

diff --git a/t/01generate.t b/t/01generate.t
index 833b2e3..245ca55 100644
--- a/t/01generate.t
+++ b/t/01generate.t
@@ -69,20 +69,6 @@ my @tests = (
       },
       {
               func   => 'select',
-              args   => [[qw/test1 test2/], '*', { 'test1.a' => { 'In', ['boom', 'bang'] } }],
-              stmt   => 'SELECT * FROM test1, test2 WHERE ( test1.a IN ( ?, ? ) )',
-              stmt_q => 'SELECT * FROM `test1`, `test2` WHERE ( `test1`.`a` IN ( ?, ? ) )',
-              bind   => ['boom', 'bang']
-      },
-      {
-              func   => 'select',
-              args   => ['test', '*', { a => { 'between', ['boom', 'bang'] } }],
-              stmt   => 'SELECT * FROM test WHERE ( a BETWEEN ? AND ? )',
-              stmt_q => 'SELECT * FROM `test` WHERE ( `a` BETWEEN ? AND ? )',
-              bind   => ['boom', 'bang']
-      },
-      {
-              func   => 'select',
               args   => ['test', '*', { a => { '!=', 'boom' } }],
               stmt   => 'SELECT * FROM test WHERE ( a != ? )',
               stmt_q => 'SELECT * FROM `test` WHERE ( `a` != ? )',
@@ -536,64 +522,55 @@ my @tests = (
       },
       {
               func => 'select',
-              args => ['test', '*', { a => { -in => [] }, b => { -not_in => [] }, c => { -in => 42 } }],
-              stmt => 'SELECT * FROM test WHERE ( 0=1 AND 1=1 AND c IN ( ? ))',
-              stmt_q => 'SELECT * FROM `test` WHERE ( 0=1 AND 1=1 AND `c` IN ( ? ))',
-              bind => [ 42 ],
+              args => ['test', '*', { a => { '=' => undef }, b => { -is => undef }, c => { -like => undef } }],
+              stmt => 'SELECT * FROM test WHERE ( a IS NULL AND b IS NULL AND c IS NULL )',
+              stmt_q => 'SELECT * FROM `test` WHERE ( `a` IS NULL AND `b` IS NULL AND `c` IS NULL )',
+              bind => [],
+              warns => qr/\QSupplying an undefined argument to 'LIKE' is deprecated/,
       },
       {
               func => 'select',
-              args => ['test', '*', { a => { -in => [] }, b => { -not_in => [] } }],
-              stmt => 'SELECT * FROM test WHERE ( 0=1 AND 1=1 )',
-              stmt_q => 'SELECT * FROM `test` WHERE ( 0=1 AND 1=1 )',
+              args => ['test', '*', { a => { '!=' => undef }, b => { -is_not => undef }, c => { -not_like => undef } }],
+              stmt => 'SELECT * FROM test WHERE ( a IS NOT NULL AND b IS NOT  NULL AND c IS NOT  NULL )',
+              stmt_q => 'SELECT * FROM `test` WHERE ( `a` IS NOT  NULL AND `b` IS NOT  NULL AND `c` IS NOT  NULL )',
               bind => [],
+              warns => qr/\QSupplying an undefined argument to 'NOT LIKE' is deprecated/,
       },
       {
-              throws => qr/
-                \QSQL::Abstract before v1.75 used to generate incorrect SQL \E
-                \Qwhen the -IN operator was given an undef-containing list: \E
-                \Q!!!AUDIT YOUR CODE AND DATA!!! (the upcoming Data::Query-based \E
-                \Qversion of SQL::Abstract will emit the logically correct SQL \E
-                \Qinstead of raising this exception)\E
-              /x,
               func => 'select',
-              args => ['test', '*', { a => { -in => [42, undef] }, b => { -not_in => [42, undef] } } ],
-              stmt => 'SELECT * FROM test WHERE ( ( a IN ( ? ) OR a IS NULL ) AND b NOT IN ( ? ) AND b IS NOT NULL )',
-              stmt_q => 'SELECT * FROM `test` WHERE ( ( `a` IN ( ? ) OR `a` IS NULL ) AND `b` NOT IN ( ? ) AND `b` IS NOT NULL )',
-              bind => [ 42, 42 ],
-      },
-      {
-              throws => qr/
-                \QSQL::Abstract before v1.75 used to generate incorrect SQL \E
-                \Qwhen the -IN operator was given an undef-containing list: \E
-                \Q!!!AUDIT YOUR CODE AND DATA!!! (the upcoming Data::Query-based \E
-                \Qversion of SQL::Abstract will emit the logically correct SQL \E
-                \Qinstead of raising this exception)\E
-              /x,
-              func => 'select',
-              args => ['test', '*', { a => { -in => [undef] }, b => { -not_in => [undef] } } ],
-              stmt => 'SELECT * FROM test WHERE ( a IS NULL AND b IS NOT NULL )',
-              stmt_q => 'SELECT * FROM `test` WHERE ( `a` IS NULL AND `b` IS NOT NULL )',
+              args => ['test', '*', { a => { IS => undef }, b => { LIKE => undef } }],
+              stmt => 'SELECT * FROM test WHERE ( a IS NULL AND b IS NULL )',
+              stmt_q => 'SELECT * FROM `test` WHERE ( `a` IS NULL AND `b` IS NULL )',
               bind => [],
+              warns => qr/\QSupplying an undefined argument to 'LIKE' is deprecated/,
       },
       {
               func => 'select',
-              args => ['test', '*', { a => { -in => undef } }],
-              throws => qr/Argument passed to the 'IN' operator can not be undefined/,
+              args => ['test', '*', { a => { 'IS NOT' => undef }, b => { 'NOT LIKE' => undef } }],
+              stmt => 'SELECT * FROM test WHERE ( a IS NOT NULL AND b IS NOT  NULL )',
+              stmt_q => 'SELECT * FROM `test` WHERE ( `a` IS NOT  NULL AND `b` IS NOT  NULL )',
+              bind => [],
+              warns => qr/\QSupplying an undefined argument to 'NOT LIKE' is deprecated/,
       },
 );
 
 # check is( not) => undef
-for my $op (qw( is is_not), 'is not' ) {
+for my $op ( qw(not is is_not), 'is not' ) {
   (my $sop = uc $op) =~ s/_/ /gi;
 
-  push @tests, {
-    func => 'where',
-    args => [{ a => { "$_$op" => undef } }],
-    stmt => "WHERE a $sop NULL",
-    stmt_q => "WHERE `a` $sop NULL",
-    bind => [],
-  } for ('', '-');  # with and without -
+  $sop = 'IS NOT' if $sop eq 'NOT';
+
+  for my $uc (0, 1) {
+    for my $prefix ('', '-') {
+      push @tests, {
+        func => 'where',
+        args => [{ a => { ($prefix . ($uc ? uc $op : lc $op) ) => undef } }],
+        stmt => "WHERE a $sop NULL",
+        stmt_q => "WHERE `a` $sop NULL",
+        bind => [],
+      };
+    }
+  }
 }
 
 # check single-element inequality ops for no warnings
@@ -684,10 +661,10 @@ for my $t (@tests) {
       ) || diag dumper ({ args => $t->{args}, result => $stmt });
     }
     else {
-      warnings_exist(
+      warnings_like(
         sub { $cref->() },
         $t->{warns} || [],
-      );
+      ) || diag dumper ({ args => $t->{args}, result => $stmt });
 
       is_same_sql_bind(
         $stmt,