extract and/or expansion

[scpubgit/Q-Branch.git] / t / 04modifiers.t

diff --git a/t/04modifiers.t b/t/04modifiers.t
index 702c299..9a1dfb1 100644 (file)
--- a/t/04modifiers.t
+++ b/t/04modifiers.t
@@ -393,7 +393,7 @@ for my $case (@and_or_tests) {
         \@bind,
         $case->{stmt},
         $case->{bind},
-      ) || diag_where( $case->{where} );
+      ) || (diag_where ( $case->{where} ), diag dumper ([ EXP => $sql->_expand_expr($case->{where}) ]));
     } [], 'No warnings within and-or tests';
 
     is_deeply ($case->{where}, $where_copy, 'Where conditions unchanged');
@@ -414,7 +414,7 @@ for my $case (@nest_tests) {
         \@bind,
         $case->{stmt},
         $case->{bind},
-      ) || diag_where ( $case->{where} );
+      ) || (diag_where ( $case->{where} ), diag dumper ([ EXP => $sql->_expand_expr($case->{where}) ]));
     });
   }
 }
@@ -428,7 +428,7 @@ for my $case (@numbered_mods) {
     local $SIG{__WARN__} = sub { push @w, @_ };
 
     my $sql = SQL::Abstract->new($case->{args} || {});
-    {
+    lives_ok {
       my ($old_s, @old_b) = $sql->where($case->{backcompat});
       my ($new_s, @new_b) = $sql->where($case->{correct});
       is_same_sql_bind(