X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F01generate.t;h=9606a8c8b72fdd0f4c9161edf02ab66b769bcf6b;hb=7823ae897bb3fbcdc14fdbb72c85052f36f69944;hp=bee3d9def92ade4a8a9330b9c99d0b4d4d2bd835;hpb=e30faf881505a049a20b9d9a3ca5d3cc1d0e09a0;p=scpubgit%2FQ-Branch.git

diff --git a/t/01generate.t b/t/01generate.t
old mode 100755
new mode 100644
index bee3d9d..9606a8c
--- a/t/01generate.t
+++ b/t/01generate.t
@@ -516,7 +516,7 @@ my @tests = (
               stmt   => 'SELECT * FROM test WHERE ( a < to_date(?, \'MM/DD/YY\') AND b = ? )',
               stmt_q => 'SELECT * FROM `test` WHERE ( `a` < to_date(?, \'MM/DD/YY\') AND `b` = ? )',
               bind   => [[{dummy => 1} => '02/02/02'], [b => 8]],
-      },             
+      },
       #57
       {
               func   => 'select',
@@ -525,8 +525,25 @@ my @tests = (
               stmt   => 'SELECT * FROM test WHERE ( a = ? AND b = ? ) OR ( c = ? AND d = ?  )',
               stmt_q => 'SELECT * FROM `test` WHERE ( `a` = ? AND `b` = ?  ) OR ( `c` = ? AND `d` = ? )',
               bind   => [[a => 'a'], [b => 'b'], [ c => 'c'],[ d => 'd']],
-      },          
-      
+      },
+      #58
+      {
+              func   => 'select',
+              new    => {bindtype => 'columns'},
+              args   => ['test', '*', [ { a => 1, b => 1}, [ a => 2, b => 2] ] ],
+              stmt   => 'SELECT * FROM test WHERE ( a = ? AND b = ? ) OR ( a = ? OR b = ? )',
+              stmt_q => 'SELECT * FROM `test` WHERE ( `a` = ? AND `b` = ? ) OR ( `a` = ? OR `b` = ? )',
+              bind   => [[a => 1], [b => 1], [ a => 2], [ b => 2]],
+      },
+      #59
+      {
+              func   => 'select',
+              new    => {bindtype => 'columns'},
+              args   => ['test', '*', [ [ a => 1, b => 1], { a => 2, b => 2 } ] ],
+              stmt   => 'SELECT * FROM test WHERE ( a = ? OR b = ? ) OR ( a = ? AND b = ? )',
+              stmt_q => 'SELECT * FROM `test` WHERE ( `a` = ? OR `b` = ? ) OR ( `a` = ? AND `b` = ? )',
+              bind   => [[a => 1], [b => 1], [ a => 2], [ b => 2]],
+      },
 );