X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F05in_between.t;h=fc3aa1d231e361f722467cdec212d45da4bd03cc;hb=ddd6fbb6f333f2247acd57f93a2307ce4ef0ae97;hp=ae6e61cad6d9b15425cab7aa9e3a119517665e51;hpb=4a1f01a3175d4c88af2adebe6b0482e57ee4c88a;p=dbsrgits%2FSQL-Abstract.git

diff --git a/t/05in_between.t b/t/05in_between.t
index ae6e61c..fc3aa1d 100644
--- a/t/05in_between.t
+++ b/t/05in_between.t
@@ -1,12 +1,10 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 use Test::More;
+use Test::Warn;
 use Test::Exception;
-use SQL::Abstract::Test import => ['is_same_sql_bind'];
+use SQL::Abstract::Test import => [qw(is_same_sql_bind diag_where dumper)];
 
-use Data::Dumper;
 use SQL::Abstract;
 
 my @in_between_tests = (
@@ -65,56 +63,250 @@ my @in_between_tests = (
     test => '-between with literal sql with a literal (\"\'this\' AND \'that\'")',
   },
 
+  # generate a set of invalid -between tests
+  ( map { {
+    where => { x => { -between => $_ } },
+    test => 'invalid -between args',
+    throws => qr|Operator 'BETWEEN' requires either an arrayref with two defined values or expressions, or a single literal scalarref/arrayref-ref|,
+  } } (
+    [ 1, 2, 3 ],
+    [ 1, undef, 3 ],
+    [ undef, 2, 3 ],
+    [ 1, 2, undef ],
+    [ 1, undef ],
+    [ undef, 2 ],
+    [ undef, undef ],
+    [ 1 ],
+    [ undef ],
+    [],
+    1,
+    undef,
+  )),
+  {
+    where => {
+      start0 => { -between => [ 1, { -upper => 2 } ] },
+      start1 => { -between => \["? AND ?", 1, 2] },
+      start2 => { -between => \"lower(x) AND upper(y)" },
+      start3 => { -between => [
+        \"lower(x)",
+        \["upper(?)", 'stuff' ],
+      ] },
+    },
+    stmt => "WHERE (
+          ( start0 BETWEEN ? AND UPPER ?          )
+      AND ( start1 BETWEEN ? AND ?                )
+      AND ( start2 BETWEEN lower(x) AND upper(y)  )
+      AND ( start3 BETWEEN lower(x) AND upper(?)  )
+    )",
+    bind => [1, 2, 1, 2, 'stuff'],
+    test => '-between POD test',
+  },
+  {
+    args => { bindtype => 'columns' },
+    where => {
+      start0 => { -between => [ 1, { -upper => 2 } ] },
+      start1 => { -between => \["? AND ?", [ start1 => 1], [start1 => 2] ] },
+      start2 => { -between => \"lower(x) AND upper(y)" },
+      start3 => { -between => [
+        \"lower(x)",
+        \["upper(?)", [ start3 => 'stuff'] ],
+      ] },
+    },
+    stmt => "WHERE (
+          ( start0 BETWEEN ? AND UPPER ?          )
+      AND ( start1 BETWEEN ? AND ?                )
+      AND ( start2 BETWEEN lower(x) AND upper(y)  )
+      AND ( start3 BETWEEN lower(x) AND upper(?)  )
+    )",
+    bind => [
+      [ start0 => 1 ],
+      [ start0 => 2 ],
+      [ start1 => 1 ],
+      [ start1 => 2 ],
+      [ start3 => 'stuff' ],
+    ],
+    test => '-between POD test',
+  },
+  {
+    where => { 'test1.a' => { 'In', ['boom', 'bang'] } },
+    stmt => ' WHERE ( test1.a IN ( ?, ? ) )',
+    bind => ['boom', 'bang'],
+    test => 'In (no dash, initial cap) with qualified column',
+  },
+  {
+    where => { a => { 'between', ['boom', 'bang'] } },
+    stmt => ' WHERE ( a BETWEEN ? AND ? )',
+    bind => ['boom', 'bang'],
+    test => 'between (no dash) with two placeholders',
+  },
 
   {
-    parenthesis_significant => 1,
     where => { x => { -in => [ 1 .. 3] } },
-    stmt => "WHERE ( x IN (?, ?, ?) )",
-    bind => [ 1 .. 3],
+    stmt => "WHERE x IN (?, ?, ?)",
+    bind => [ 1 .. 3 ],
     test => '-in with an array of scalars',
   },
   {
-    parenthesis_significant => 1,
+    where => { x => { -in => [] } },
+    stmt => "WHERE 0=1",
+    bind => [],
+    test => '-in with an empty array',
+  },
+  {
     where => { x => { -in => \'( 1,2,lower(y) )' } },
-    stmt => "WHERE ( x IN (1, 2, lower(y) ) )",
+    stmt => "WHERE x IN ( 1,2,lower(y) )",
     bind => [],
     test => '-in with a literal scalarref',
   },
+
+  # note that outer parens are opened even though literal was requested below
   {
-    parenthesis_significant => 1,
     where => { x => { -in => \['( ( ?,?,lower(y) ) )', 1, 2] } },
-    stmt => "WHERE ( x IN (?, ?, lower(y) ) )",
+    stmt => "WHERE x IN ( ?,?,lower(y) )",
     bind => [1, 2],
     test => '-in with a literal arrayrefref',
   },
-);
+  {
+    where => {
+      status => { -in => \"(SELECT status_codes\nFROM states)" },
+    },
+    stmt => " WHERE status IN ( SELECT status_codes FROM states )",
+    bind => [],
+    test => '-in multi-line subquery test',
+  },
+  {
+    where => {
+      customer => { -in => \[
+        'SELECT cust_id FROM cust WHERE balance > ?',
+        2000,
+      ]},
+      status => { -in => \'SELECT status_codes FROM states' },
+    },
+    stmt => "
+      WHERE
+            customer IN ( SELECT cust_id FROM cust WHERE balance > ? )
+        AND status IN ( SELECT status_codes FROM states )
+    ",
+    bind => [2000],
+    test => '-in POD test',
+  },
+
+  {
+    where => { x => { -in => [ \['LOWER(?)', 'A' ], \'LOWER(b)', { -lower => 'c' } ] } },
+    stmt => " WHERE ( x IN ( LOWER(?), LOWER(b), LOWER ? ) )",
+    bind => [qw/A c/],
+    test => '-in with an array of function array refs with args',
+  },
+  {
+    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,
+    where => { x => { -in => [ 1, undef ] } },
+    stmt => " WHERE ( x IN ( ? ) OR x IS NULL )",
+    bind => [ 1 ],
+    test => '-in with undef as an element',
+  },
+  {
+    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,
+    where => { x => { -in => [ 1, undef, 2, 3, undef ] } },
+    stmt => " WHERE ( x IN ( ?, ?, ? ) OR x IS NULL )",
+    bind => [ 1, 2, 3 ],
+    test => '-in with multiple undef elements',
+  },
+  {
+    where => { a => { -in => 42 }, b => { -not_in => 42 } },
+    stmt => ' WHERE a IN ( ? ) AND b NOT IN ( ? )',
+    bind => [ 42, 42 ],
+    test => '-in, -not_in with scalar',
+  },
+  {
+    where => { a => { -in => [] }, b => { -not_in => [] } },
+    stmt => ' WHERE ( 0=1 AND 1=1 )',
+    bind => [],
+    test => '-in, -not_in with empty arrays',
+  },
+  {
+    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,
+    where => { a => { -in => [42, undef] }, b => { -not_in => [42, undef] } },
+    stmt => ' WHERE ( ( a IN ( ? ) OR a IS NULL ) AND b NOT IN ( ? ) AND b IS NOT NULL )',
+    bind => [ 42, 42 ],
+    test => '-in, -not_in with undef among elements',
+  },
+  {
+    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,
+    where => { a => { -in => [undef] }, b => { -not_in => [undef] } },
+    stmt => ' WHERE ( a IS NULL AND b IS NOT NULL )',
+    bind => [],
+    test => '-in, -not_in with just undef element',
+  },
+  {
+    where => { a => { -in => undef } },
+    throws => qr/Argument passed to the 'IN' operator can not be undefined/,
+    test => '-in with undef argument',
+  },
 
-plan tests => @in_between_tests*4;
+  {
+    where => { -in => [42] },
+    throws => qr/Illegal use of top-level '-in'/,
+    test => 'Top level -in',
+  },
+  {
+    where => { -between => [42, 69] },
+    throws => qr/Illegal use of top-level '-between'/,
+    test => 'Top level -between',
+  },
+);
 
 for my $case (@in_between_tests) {
   TODO: {
     local $TODO = $case->{todo} if $case->{todo};
     local $SQL::Abstract::Test::parenthesis_significant = $case->{parenthesis_significant};
+    my $label = $case->{test} || 'in-between test';
 
-    local $Data::Dumper::Terse = 1;
+    my $sql = SQL::Abstract->new ($case->{args} || {});
 
-    lives_ok (sub {
+    if (my $e = $case->{throws}) {
+      my $stmt;
+      throws_ok { ($stmt) = $sql->where($case->{where}) } $e, "$label throws correctly"
+        or diag dumper ({ where => $case->{where}, result => $stmt });
+    }
+    else {
+      my ($stmt, @bind);
+      warnings_are {
+        ($stmt, @bind) = $sql->where($case->{where});
+      } [], "$label gives no warnings";
 
-      my @w;
-      local $SIG{__WARN__} = sub { push @w, @_ };
-      my $sql = SQL::Abstract->new ($case->{args} || {});
-      lives_ok (sub { 
-        my ($stmt, @bind) = $sql->where($case->{where});
-        is_same_sql_bind(
-          $stmt,
-          \@bind,
-          $case->{stmt},
-          $case->{bind},
-        )
-          || diag "Search term:\n" . Dumper $case->{where};
-      });
-      is (@w, 0, $case->{test} || 'No warnings within in-between tests')
-        || diag join "\n", 'Emitted warnings:', @w;
-    }, "$case->{test} doesn't die");
+      is_same_sql_bind(
+        $stmt,
+        \@bind,
+        $case->{stmt},
+        $case->{bind},
+        "$label generates correct SQL and bind",
+      ) || diag_where ( $case->{where} );
+    }
   }
 }
+
+done_testing;