X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsearch%2Fselect_chains.t;h=e57fc26620cee0f6e22228b20633c41cc4a85aa7;hb=f7f53a894c479aa594b9082ee461568fab8a81f3;hp=8873608964e673011e33a3e0d36f8ec0b28b452f;hpb=37aafa2ede65e38af8fe9eda374ad4626290932f;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/search/select_chains.t b/t/search/select_chains.t
index 8873608..e57fc26 100644
--- a/t/search/select_chains.t
+++ b/t/search/select_chains.t
@@ -2,7 +2,6 @@ use strict;
 use warnings;
 
 use Test::More;
-use Test::Exception;
 
 use lib qw(t/lib);
 use DBIC::SqlMakerTest;
@@ -32,7 +31,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' } }  ],
@@ -53,15 +52,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,20 +93,35 @@ while (@chain) {
 }
 
 # Make sure we don't lose bits even with weird selector specs
-$rs = $schema->resultset('CD')->search ({}, {
-  'columns'   => [ 'me.title' ],
-})->search ({}, {
-  '+select'   => \'me.year AS foo',
-})->search ({}, {
-  '+select'   => [ \'me.artistid AS bar' ],
-})->search ({}, {
-  '+select'   => { count => 'artistid', -as => 'baz' },
-});
+# 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
+
+  { '+select'   => \'me.year AS foo' },   # duplication of identical select expected (FIXME ?)
+  { '+select'   => \['me.year AS foo'] },
+
+  { '+select'   => [ \'me.artistid AS bar' ] },
+  { '+select'   => { count => 'artistid', -as => 'baz' } },
+) {
+  for (qw/columns select as/) {
+    ok (! exists $rs->{attrs}{$_}, "No eager '$_' attr on fresh resultset" );
+  }
+
+  $rs = $rs->search({}, $attr);
+}
 
 is_same_sql_bind (
   $rs->as_query,
   '( SELECT
+      me.cdid,
+      me.artist,
       me.title,
+      me.year,
+      me.genreid,
+      me.single_track,
+      me.year AS foo,
       me.year AS foo,
       me.artistid AS bar,
       COUNT( artistid ) AS baz
@@ -108,4 +131,45 @@ is_same_sql_bind (
   '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;