X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F01generate.t;h=2746b600861a44ea89206f41e3e8caf5e57eba6d;hb=46be4313ffbb0b347d7336608e115d8a941df4f3;hp=730423594512fe47613bd37744451c6d1702296b;hpb=e3f3851586e6d4b086bcf941c7a55e73d6df2df3;p=dbsrgits%2FSQL-Abstract.git

diff --git a/t/01generate.t b/t/01generate.t
index 7304235..2746b60 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` != ? )',
@@ -127,6 +113,13 @@ my @tests = (
               bind   => ['nwiger']
       },
       {
+              func   => 'select',
+              args   => [[\'test1', 'test2'], '*', { 'test1.a' => 'boom' } ],
+              stmt   => 'SELECT * FROM test1, test2 WHERE ( test1.a = ? )',
+              stmt_q => 'SELECT * FROM test1, `test2` WHERE ( `test1`.`a` = ? )',
+              bind   => ['boom']
+      },
+      {
               func   => 'insert',
               args   => ['test', {a => 1, b => 2, c => 3, d => 4, e => 5}],
               stmt   => 'INSERT INTO test (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)',
@@ -536,53 +529,6 @@ 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 ],
-      },
-      {
-              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 )',
-              bind => [],
-      },
-      {
-              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 )',
-              bind => [],
-      },
-      {
-              func => 'select',
-              args => ['test', '*', { a => { -in => undef } }],
-              throws => qr/Argument passed to the 'IN' operator can not be undefined/,
-      },
-      {
-              func => 'select',
               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 )',
@@ -613,19 +559,40 @@ my @tests = (
               bind => [],
               warns => qr/\QSupplying an undefined argument to 'NOT LIKE' is deprecated/,
       },
+      {
+              func => 'select',
+              args => ['`test``table`', ['`test``column`']],
+              stmt => 'SELECT `test``column` FROM `test``table`',
+              stmt_q => 'SELECT ```test````column``` FROM ```test````table```',
+              bind => [],
+      },
+      {
+              func => 'select',
+              args => ['`test\\`table`', ['`test`\\column`']],
+              stmt => 'SELECT `test`\column` FROM `test\`table`',
+              stmt_q => 'SELECT `\`test\`\\\\column\`` FROM `\`test\\\\\`table\``',
+              esc  => '\\',
+              bind => [],
+      },
 );
 
 # 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
@@ -697,9 +664,15 @@ for my $t (@tests) {
 
   for my $quoted (0, 1) {
 
-    my $maker = SQL::Abstract->new(%$new, $quoted
-      ? (quote_char => '`', name_sep => '.')
-      : ()
+    my $maker = SQL::Abstract->new(
+      %$new,
+      ($quoted ? (
+        quote_char => '`',
+        name_sep => '.',
+        ( $t->{esc} ? (
+          escape_char => $t->{esc},
+        ) : ())
+      ) : ())
     );
 
     my($stmt, @bind);
@@ -716,10 +689,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,