X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F04modifiers.t;h=355ef67c8dd8d17f9a15df375ebe4de850eaeb2e;hb=d282bb5005b32a73d3120560fb895c5e753c7ef3;hp=91c9dfa3323093f696be6b13f968db83cb47296a;hpb=2f641e1f330d3eab166e317788b8737c55cc5d40;p=dbsrgits%2FSQL-Abstract.git

diff --git a/t/04modifiers.t b/t/04modifiers.t
index 91c9dfa..355ef67 100644
--- a/t/04modifiers.t
+++ b/t/04modifiers.t
@@ -7,6 +7,7 @@ use Test::Exception;
 use SQL::Abstract::Test import => ['is_same_sql_bind'];
 
 use Data::Dumper;
+use Storable qw/dclone/;
 use SQL::Abstract;
 
 =begin
@@ -176,8 +177,8 @@ my @and_or_tests = (
 
   {
     where => { -and => [a => 1, b => 2, k => [11, 12] ], x => 9, -or => { c => 3, d => 4, l => { '=' => [21, 22] } } },
-    stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND ((l = ? OR l = ?) OR c = ? OR d = ? ) AND x = ?',
-    bind => [qw/1 2 11 12 21 22 3 4 9/],
+    stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND (c = ? OR d = ? OR (l = ? OR l = ?) ) AND x = ?',
+    bind => [qw/1 2 11 12 3 4 21 22 9/],
   },
 
   {
@@ -196,8 +197,8 @@ my @and_or_tests = (
     # explicit OR logic in arrays should leave everything intact
     args => { logic => 'or' },
     where => { -and => [a => 1, b => 2, k => [11, 12] ], x => 9, -or => { c => 3, d => 4, l => { '=' => [21, 22] } }  },
-    stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND ( l = ? OR l = ? OR c = ? OR d = ? ) AND x = ? ',
-    bind => [qw/1 2 11 12 21 22 3 4 9/],
+    stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND ( c = ? OR d = ? OR l = ? OR l = ? ) AND x = ? ',
+    bind => [qw/1 2 11 12 3 4 21 22 9/],
   },
 
   {
@@ -361,12 +362,17 @@ my @nest_tests = (
  },
  {
    where => {a => 1, -nest => {-or => {b => 2, c => 3}}},
-   stmt  => 'WHERE ( ( (c = ? OR b = ?) AND a = ? ) )',
-   bind  => [qw/3 2 1/],
+   stmt  => 'WHERE ( ( (b = ? OR c = ?) AND a = ? ) )',
+   bind  => [qw/2 3 1/],
+ },
+ {
+   where => [a => 1, -nest => {b => 2, c => 3}, -nest => [d => 4, e => 5]],
+   stmt  => 'WHERE ( ( a = ? OR ( b = ? AND c = ? ) OR ( d = ? OR e = ? ) ) )',
+   bind  => [qw/1 2 3 4 5/],
  },
 );
 
-plan tests => @and_or_tests*3 + @numbered_mods*4 + @nest_tests*2;
+plan tests => @and_or_tests*4 + @numbered_mods*4 + @nest_tests*2;
 
 for my $case (@and_or_tests) {
   TODO: {
@@ -376,7 +382,10 @@ for my $case (@and_or_tests) {
 
     my @w;
     local $SIG{__WARN__} = sub { push @w, @_ };
+
     my $sql = SQL::Abstract->new ($case->{args} || {});
+    my $where_copy = dclone($case->{where});
+
     lives_ok (sub { 
       my ($stmt, @bind) = $sql->where($case->{where});
       is_same_sql_bind(
@@ -389,6 +398,8 @@ for my $case (@and_or_tests) {
     });
     is (@w, 0, 'No warnings within and-or tests')
       || diag join "\n", 'Emitted warnings:', @w;
+
+    is_deeply ($case->{where}, $where_copy, 'Where conditions unchanged');
   }
 }