X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F95sql_maker_quote.t;h=4fa987bfef4159d091e3734ac599e0c0ceb0fd86;hb=d0a3e4e2efdfb2370e0dfe7a45a3aa08a2560ca3;hp=5dd71a8208dd99a3bd96744df1a037d171a69d22;hpb=8682bb0758d4dd03517a8f0e4d0f9dcaf3b9ac44;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/95sql_maker_quote.t b/t/95sql_maker_quote.t
index 5dd71a8..4fa987b 100644
--- a/t/95sql_maker_quote.t
+++ b/t/95sql_maker_quote.t
@@ -2,18 +2,17 @@ use strict;
 use warnings;
 
 use Test::More;
-use SQL::Abstract::Test import => ['is_same_sql_bind'];
 
+use lib qw(t/lib);
+use DBIC::SqlMakerTest;
 
 BEGIN {
     eval "use DBD::SQLite";
     plan $@
         ? ( skip_all => 'needs DBD::SQLite for testing' )
-        : ( tests => 8 );
+        : ( tests => 12 );
 }
 
-use lib qw(t/lib);
-
 use_ok('DBICTest');
 
 my $schema = DBICTest->init_schema();
@@ -58,6 +57,32 @@ is_same_sql_bind(
   'got correct SQL and bind parameters for count query with quoting'
 );
 
+
+($sql, @bind) = $sql_maker->select(
+          [
+            {
+              'me' => 'cd'
+            }
+          ],
+          [
+            'me.cdid',
+            'me.artist',
+            'me.title',
+            'me.year'
+          ],
+          undef,
+          'year DESC',
+          undef,
+          undef
+);
+
+is_same_sql_bind(
+  $sql, \@bind,
+  q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY `year DESC`/, [],
+  'scalar ORDER BY okay (single value)'
+);
+
+
 ($sql, @bind) = $sql_maker->select(
           [
             {
@@ -72,7 +97,8 @@ is_same_sql_bind(
           ],
           undef,
           [
-            { -desc => 'year' }
+            'year DESC',
+            'title ASC'
           ],
           undef,
           undef
@@ -80,32 +106,94 @@ is_same_sql_bind(
 
 is_same_sql_bind(
   $sql, \@bind,
-  q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY `year` DESC/, [],
-  'hashref ORDER BY okay'
+  q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY `year DESC`, `title ASC`/, [],
+  'scalar ORDER BY okay (multiple values)'
 );
 
+SKIP: {
+  skip "SQL::Abstract < 1.49 does not support hashrefs in order_by", 2
+    if $SQL::Abstract::VERSION < 1.49;
+
+  ($sql, @bind) = $sql_maker->select(
+            [
+              {
+                'me' => 'cd'
+              }
+            ],
+            [
+              'me.cdid',
+              'me.artist',
+              'me.title',
+              'me.year'
+            ],
+            undef,
+            { -desc => 'year' },
+            undef,
+            undef
+  );
+
+  is_same_sql_bind(
+    $sql, \@bind,
+    q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY `year` DESC/, [],
+    'hashref ORDER BY okay (single value)'
+  );
+
+
+  ($sql, @bind) = $sql_maker->select(
+            [
+              {
+                'me' => 'cd'
+              }
+            ],
+            [
+              'me.cdid',
+              'me.artist',
+              'me.title',
+              'me.year'
+            ],
+            undef,
+            [
+              { -desc => 'year' },
+              { -asc => 'title' }
+            ],
+            undef,
+            undef
+  );
+
+  is_same_sql_bind(
+    $sql, \@bind,
+    q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY `year` DESC, `title` ASC/, [],
+    'hashref ORDER BY okay (multiple values)'
+  );
+
+}
+
 
 ($sql, @bind) = $sql_maker->select(
-      [
-        {
-          'me' => 'cd'
-        }
-      ],
-      [
-        'me.*'
-      ],
-      undef,
-      [],
-      undef,
-      undef    
+          [
+            {
+              'me' => 'cd'
+            }
+          ],
+          [
+            'me.cdid',
+            'me.artist',
+            'me.title',
+            'me.year'
+          ],
+          undef,
+          \'year DESC',
+          undef,
+          undef
 );
 
 is_same_sql_bind(
   $sql, \@bind,
-  q/SELECT `me`.* FROM `cd` `me`/, [],
-  'select attr with me.* is right'
+  q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY year DESC/, [],
+  'did not quote ORDER BY with scalarref (single value)'
 );
 
+
 ($sql, @bind) = $sql_maker->select(
           [
             {
@@ -120,7 +208,8 @@ is_same_sql_bind(
           ],
           undef,
           [
-            \'year DESC'
+            \'year DESC',
+            \'title ASC'
           ],
           undef,
           undef
@@ -128,10 +217,11 @@ is_same_sql_bind(
 
 is_same_sql_bind(
   $sql, \@bind,
-  q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY year DESC/, [],
-  'did not quote ORDER BY with scalarref'
+  q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY year DESC, title ASC/, [],
+  'did not quote ORDER BY with scalarref (multiple values)'
 );
 
+
 ($sql, @bind) = $sql_maker->update(
           'group',
           {
@@ -146,6 +236,33 @@ is_same_sql_bind(
   'quoted table names for UPDATE'
 );
 
+SKIP: {
+  skip "select attr with star does not work in SQL::Abstract < 1.49", 1
+    if $SQL::Abstract::VERSION < 1.49;
+
+  ($sql, @bind) = $sql_maker->select(
+        [
+          {
+            'me' => 'cd'
+          }
+        ],
+        [
+          'me.*'
+        ],
+        undef,
+        [],
+        undef,
+        undef    
+  );
+
+  is_same_sql_bind(
+    $sql, \@bind,
+    q/SELECT `me`.* FROM `cd` `me`/, [],
+    'select attr with me.* is right'
+  );
+}
+
+
 $sql_maker->quote_char([qw/[ ]/]);
 
 ($sql, @bind) = $sql_maker->select(