Merge branch 'master' into dq

[dbsrgits/SQL-Abstract.git] / t / 04modifiers.t

diff --git a/t/04modifiers.t b/t/04modifiers.t
index 27db12c..2d88771 100644 (file)
--- a/t/04modifiers.t
+++ b/t/04modifiers.t
@@ -2,6 +2,7 @@ use strict;
 use warnings;
 use Test::More;
 use Test::Exception;
+use Test::Warn;
 use SQL::Abstract::Test import => [qw(is_same_sql_bind diag_where)];
 
 use SQL::Abstract;
@@ -304,10 +305,9 @@ my @and_or_tests = (
   },
 );
 
-# modN and mod_N were a bad design decision - they go away in SQLA2, warn now
-my @numbered_mods = (
-  {
-    backcompat => {
+# modN and mod_N were a bad design decision - they went away
+my @invalid_numbered_mods = (
+    {
       -and => [a => 10, b => 11],
       -and2 => [ c => 20, d => 21 ],
       -nest => [ x => 1 ],
@@ -315,17 +315,7 @@ my @numbered_mods = (
       -or => { m => 7, n => 8 },
       -or2 => { m => 17, n => 18 },
     },
-    correct => { -and => [
-      -and => [a => 10, b => 11],
-      -and => [ c => 20, d => 21 ],
-      -nest => [ x => 1 ],
-      -nest => [ y => 2 ],
-      -or => { m => 7, n => 8 },
-      -or => { m => 17, n => 18 },
-    ] },
-  },
-  {
-    backcompat => {
+    {
       -and2 => [a => 10, b => 11],
       -and_3 => [ c => 20, d => 21 ],
       -nest2 => [ x => 1 ],
@@ -333,15 +323,6 @@ my @numbered_mods = (
       -or2 => { m => 7, n => 8 },
       -or_3 => { m => 17, n => 18 },
     },
-    correct => [ -and => [
-      -and => [a => 10, b => 11],
-      -and => [ c => 20, d => 21 ],
-      -nest => [ x => 1 ],
-      -nest => [ y => 2 ],
-      -or => { m => 7, n => 8 },
-      -or => { m => 17, n => 18 },
-    ] ],
-  },
 );
 
 my @nest_tests = (
@@ -352,12 +333,12 @@ my @nest_tests = (
  },
  {
    where => {a => 1, -nest => {b => 2, c => 3}},
-   stmt  => 'WHERE ( ( (b = ? AND c = ?) AND a = ? ) )',
+   stmt  => 'WHERE ( ( b = ? AND c = ? AND a = ? ) )',
    bind  => [qw/2 3 1/],
  },
  {
    where => {a => 1, -or => {-nest => {b => 2, c => 3}}},
-   stmt  => 'WHERE ( ( (b = ? AND c = ?) AND a = ? ) )',
+   stmt  => 'WHERE ( ( b = ? AND c = ? AND a = ? ) )',
    bind  => [qw/2 3 1/],
  },
  {
@@ -372,23 +353,44 @@ my @nest_tests = (
  },
  {
    where => [a => 1, -nest => {b => 2, c => 3}, -nest => [d => 4, e => 5]],
-   stmt  => 'WHERE ( ( a = ? OR ( b = ? AND c = ? ) OR ( d = ? OR e = ? ) ) )',
+   stmt  => 'WHERE ( ( a = ? OR ( b = ? AND c = ? ) OR d = ? OR e = ? ) )',
    bind  => [qw/1 2 3 4 5/],
  },
+ {
+   where => { -and => [
+    -and => [a => 10, b => 11],
+    -and => [ c => 20, d => 21 ],
+    -nest => [ x => 1 ],
+    -nest => [ y => 2 ],
+    -or => { m => 7, n => 8 },
+    -or => { m => 17, n => 18 },
+   ] },
+   stmt => 'WHERE ( ( a = ? AND b = ? AND c = ? AND d = ? AND ( x = ? ) AND ( y = ? ) AND ( m = ? OR n = ? ) AND ( m = ? OR n = ? ) ) )',
+   bind => [ 10, 11, 20, 21, 1, 2, 7, 8, 17, 18 ],
+ },
+ {
+   where => [ -and => [
+    -and => [a => 10, b => 11],
+    -and => [ c => 20, d => 21 ],
+    -nest => [ x => 1 ],
+    -nest => [ y => 2 ],
+    -or => { m => 7, n => 8 },
+    -or => { m => 17, n => 18 },
+   ] ],
+   stmt => 'WHERE ( ( ( a = ? AND b = ? AND c = ? AND d = ? AND ( x = ? ) AND ( y = ? ) AND ( m = ? OR n = ? ) AND ( m = ? OR n = ? ) ) ) )',
+   bind => [ 10, 11, 20, 21, 1, 2, 7, 8, 17, 18 ],
+ },
 );
 
 for my $case (@and_or_tests) {
   TODO: {
     local $TODO = $case->{todo} if $case->{todo};
 
-    my @w;
-    local $SIG{__WARN__} = sub { push @w, @_ };
-
     my $sql = SQL::Abstract->new ($case->{args} || {});
 
     my $where_copy = dclone($case->{where});
 
-    lives_ok (sub {
+    warnings_are {
       my ($stmt, @bind) = $sql->where($case->{where});
       is_same_sql_bind(
         $stmt,
@@ -396,9 +398,7 @@ for my $case (@and_or_tests) {
         $case->{stmt},
         $case->{bind},
       ) || diag_where( $case->{where} );
-    });
-    is (@w, 0, 'No warnings within and-or tests')
-      || diag join "\n", 'Emitted warnings:', @w;
+    } [], 'No warnings within and-or tests';
 
     is_deeply ($case->{where}, $where_copy, 'Where conditions unchanged');
   }
@@ -423,39 +423,11 @@ for my $case (@nest_tests) {
   }
 }
 
-
-
-my $w_str = "\QUse of [and|or|nest]_N modifiers is deprecated and will be removed in SQLA v2.0\E";
-for my $case (@numbered_mods) {
-  TODO: {
-    local $TODO = $case->{todo} if $case->{todo};
-
-    my @w;
-    local $SIG{__WARN__} = sub { push @w, @_ };
+for my $case (@invalid_numbered_mods) {
     my $sql = SQL::Abstract->new ($case->{args} || {});
-    lives_ok (sub {
-      my ($old_s, @old_b) = $sql->where($case->{backcompat});
-      my ($new_s, @new_b) = $sql->where($case->{correct});
-      is_same_sql_bind(
-        $old_s, \@old_b,
-        $new_s, \@new_b,
-        'Backcompat and the correct(tm) syntax result in identical statements',
-      ) || diag_where ( {
-        backcompat => $case->{backcompat},
-        correct => $case->{correct},
-      });
-    });
-
-    ok (@w, 'Warnings were emitted about a mod_N construct');
-
-    my @non_match;
-    for (@w) {
-      push @non_match, $_ if ($_ !~ /$w_str/);
-    }
-
-    is (@non_match, 0, 'All warnings match the deprecation message')
-      || diag join "\n", 'Rogue warnings:', @non_match;
-  }
+    throws_ok (sub {
+      $sql->where($case);
+    }, qr/\QUse of [and|or|nest]_N modifiers is no longer supported/, 'Exception thrown on bogus syntax');
 }
 
 done_testing;