X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02where.t;h=204a8fd52ddadac0188cff031271863e004e8501;hb=03e6883c5f3918df6a5b6cb7fad8e1e5131e3876;hp=6d89b8c5a2bbde7c8dd5a8c7775d58f0d5a1afa2;hpb=3cdadcbe32e98b018af5bca2d8270b13d2d2a77a;p=scpubgit%2FQ-Branch.git

diff --git a/t/02where.t b/t/02where.t
index 6d89b8c..204a8fd 100644
--- a/t/02where.t
+++ b/t/02where.t
@@ -2,7 +2,8 @@ use strict;
 use warnings;
 use Test::More;
 use Test::Warn;
-use SQL::Abstract::Test import => [qw(is_same_sql_bind diag_where) ];
+use Test::Exception;
+use SQL::Abstract::Test import => [qw(is_same_sql_bind diag_where dumper) ];
 
 use SQL::Abstract;
 
@@ -10,6 +11,12 @@ my $not_stringifiable = bless {}, 'SQLA::NotStringifiable';
 
 my @handle_tests = (
     {
+        where => 'foo',
+        order => [],
+        stmt => ' WHERE foo',
+        bind => [],
+    },
+    {
         where => {
             requestor => 'inna',
             worker => ['nwiger', 'rcwe', 'sfz'],
@@ -328,12 +335,12 @@ my @handle_tests = (
 # Op against random functions (these two are oracle-specific)
    {
        where => { timestamp => { '!=' => { -trunc => { -year => \'sysdate' } } } },
-       stmt => " WHERE ( timestamp != TRUNC (YEAR sysdate) )",
+       stmt => " WHERE ( timestamp != TRUNC(YEAR(sysdate)) )",
        bind => [],
    },
    {
        where => { timestamp => { '>=' => { -to_date => '2009-12-21 00:00:00' } } },
-       stmt => " WHERE ( timestamp >= TO_DATE ? )",
+       stmt => " WHERE ( timestamp >= TO_DATE(?) )",
        bind => ['2009-12-21 00:00:00'],
    },
 
@@ -386,17 +393,39 @@ my @handle_tests = (
         stmt  => " WHERE ( (NOT ( c AND (NOT ( (NOT a = ?) AND (NOT b) )) )) ) ",
         bind => [ 1 ],
     },
+    {
+        where => \"0",
+        stmt  => " WHERE ( 0 ) ",
+        bind => [ ],
+    },
+    {
+        where => { artistid => {} },
+        stmt => '',
+        bind => [ ],
+    },
+    {
+        where => [ -and => [ {}, [] ], -or => [ {}, [] ] ],
+        stmt => '',
+        bind => [ ],
+    },
+    {
+        where => { '=' => \'bozz' },
+        stmt => 'WHERE = bozz',
+        bind => [ ],
+    },
 );
 
 for my $case (@handle_tests) {
     my $sql = SQL::Abstract->new;
     my ($stmt, @bind);
-    warnings_exist {
-      ($stmt, @bind) = $sql->where($case->{where}, $case->{order});
-    } $case->{warns} || [];
+    lives_ok {
+      warnings_exist {
+        ($stmt, @bind) = $sql->where($case->{where}, $case->{order});
+      } $case->{warns} || [];
+    };
 
     is_same_sql_bind($stmt, \@bind, $case->{stmt}, $case->{bind})
-      || diag_where ( $case->{where} );
+      || do { diag_where ( $case->{where} ); diag dumper($sql->_expand_expr($case->{where})) };
 }
 
 done_testing;