X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsearch%2Fselect_chains.t;h=ed8f23b451b0bf17024d2dd61558722356daa8bd;hb=a5a7bb733a940db710b7408508374833683a2e79;hp=234439dc4890380cd7be3349eb1f3a95701450de;hpb=eb37b376461257fc2faf281c905d14d8bb3a3757;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/search/select_chains.t b/t/search/select_chains.t
index 234439d..ed8f23b 100644
--- a/t/search/select_chains.t
+++ b/t/search/select_chains.t
@@ -4,9 +4,7 @@ use warnings;
 use Test::More;
 
 use lib qw(t/lib);
-use DBIC::SqlMakerTest;
-use DBICTest;
-
+use DBICTest ':DiffSQL';
 
 my $schema = DBICTest->init_schema();
 
@@ -22,7 +20,7 @@ my @chain = (
     '+columns'  => [ { max_year => { max => 'me.year', -as => 'last_y' }}, ],
     '+select'   => [ { count => 'me.cdid' }, ],
     '+as'       => [ 'cnt' ],
-  } => 'SELECT me.cdid, LOWER( title ) AS lctitle, me.genreid, MAX( me.year ) AS last_y, COUNT( me.cdid ) FROM cd me',
+  } => 'SELECT me.cdid, LOWER( title ) AS lctitle, MAX( me.year ) AS last_y, me.genreid, COUNT( me.cdid ) FROM cd me',
 
   {
     select      => [ { min => 'me.cdid' }, ],
@@ -31,7 +29,7 @@ my @chain = (
 
   {
     '+columns' => [ { cnt => { count => 'cdid', -as => 'cnt' } } ],
-  } => 'SELECT MIN( me.cdid ), COUNT ( cdid ) AS cnt FROM cd me',
+  } => 'SELECT COUNT ( cdid ) AS cnt, MIN( me.cdid ) FROM cd me',
 
   {
     columns => [ { foo => { coalesce => [qw/a b c/], -as => 'firstfound' } }  ],
@@ -52,15 +50,24 @@ my @chain = (
   {
     '+select'   => [ 'me.year' ],
     '+as'       => [ 'year' ],
-  } => 'SELECT COALESCE( a, b, c ) AS firstfound, me.year, MAX( me.year ) AS last_y, COUNT( me.cdid ) AS cnt FROM cd me',
+  } => 'SELECT COALESCE( a, b, c ) AS firstfound, me.year, MAX( me.year ) AS last_y, COUNT( me.cdid ) AS cnt, me.year FROM cd me',
 
   {
     '+columns'   => [ 'me.year' ],
-  } => 'SELECT COALESCE( a, b, c ) AS firstfound, me.year, MAX( me.year ) AS last_y, COUNT( me.cdid ) AS cnt FROM cd me',
+  } => 'SELECT COALESCE( a, b, c ) AS firstfound, me.year, MAX( me.year ) AS last_y, COUNT( me.cdid ) AS cnt, me.year FROM cd me',
 
   {
     '+columns'   => 'me.year',
-  } => 'SELECT COALESCE( a, b, c ) AS firstfound, me.year, MAX( me.year ) AS last_y, COUNT( me.cdid ) AS cnt FROM cd me',
+  } => 'SELECT COALESCE( a, b, c ) AS firstfound, me.year, MAX( me.year ) AS last_y, COUNT( me.cdid ) AS cnt, me.year FROM cd me',
+
+  # naked selector at the end should just work
+  {
+    '+select'   => 'me.moar_stuff',
+  } => 'SELECT COALESCE( a, b, c ) AS firstfound, me.year, MAX( me.year ) AS last_y, COUNT( me.cdid ) AS cnt, me.year, me.moar_stuff FROM cd me',
+
+  {
+    '+select'   => [ { MOAR => 'f', -as => 'func' } ],
+  } => 'SELECT COALESCE( a, b, c ) AS firstfound, me.year, MAX( me.year ) AS last_y, COUNT( me.cdid ) AS cnt, me.year, me.moar_stuff, MOAR(f) AS func FROM cd me',
 
 );
 
@@ -85,6 +92,7 @@ while (@chain) {
 
 # Make sure we don't lose bits even with weird selector specs
 # also check that the default selector list is lazy
+# and make sure that unaliased +select does not go crazy
 $rs = $schema->resultset('CD');
 for my $attr (
   { '+columns'  => [ 'me.title' ] },    # this one should be de-duplicated but not the select's
@@ -111,14 +119,55 @@ is_same_sql_bind (
       me.year,
       me.genreid,
       me.single_track,
-      COUNT( artistid ) AS baz,
       me.year AS foo,
       me.year AS foo,
-      me.artistid AS bar
+      me.artistid AS bar,
+      COUNT( artistid ) AS baz
         FROM cd me
   )',
   [],
   'Correct chaining before attr resolution'
 );
 
+# Test the order of columns
+$rs = $schema->resultset('CD')->search ({}, {
+  'select'   => [ 'me.cdid', 'me.title' ],
+});
+
+is_same_sql_bind (
+  $rs->as_query,
+  '( SELECT
+      me.cdid,
+      me.title
+      FROM cd me
+  )',
+  [],
+  'Correct order of selected columns'
+);
+
+# Test bare +select with as from root of resultset
+$rs = $schema->resultset('CD')->search ({}, {
+  '+select'   => [
+    \ 'foo',
+    { MOAR => 'f', -as => 'func' },
+   ],
+});
+
+is_same_sql_bind (
+  $rs->as_query,
+  '( SELECT
+      me.cdid,
+      me.artist,
+      me.title,
+      me.year,
+      me.genreid,
+      me.single_track,
+      foo,
+      MOAR( f ) AS func
+       FROM cd me
+  )',
+  [],
+  'Correct order of selected columns'
+);
+
 done_testing;