X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsearch%2Fselect_chains.t;h=58b6ff0d66618e425684503832396113181f31f5;hb=5f7ac523d6179423620e5d20a83d3245a2f29385;hp=6771d3b38009b9e5d76c27f9b46a1729aa563685;hpb=3a55f069eca6624d5b3229cf354139cbfd6fa9fa;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/search/select_chains.t b/t/search/select_chains.t
index 6771d3b..58b6ff0 100644
--- a/t/search/select_chains.t
+++ b/t/search/select_chains.t
@@ -14,15 +14,16 @@ my $schema = DBICTest->init_schema();
 my @chain = (
   {
     columns     => [ 'cdid' ],
-    '+select'   => [ { lower => 'title' }, 'genreid' ],
-    '+as'       => [ qw/title_lc genreid/ ],
+    '+columns'  => [ { title_lc => { lower => 'title' } } ],
+    '+select'   => [ 'genreid' ],
+    '+as'       => [ 'genreid' ],
   } => 'SELECT me.cdid, LOWER( title ), me.genreid FROM cd me',
 
   {
     '+columns'  => [ { max_year => { max => 'me.year' }}, ],
     '+select'   => [ { count => 'me.cdid' }, ],
     '+as'       => [ 'cnt' ],
-  } => 'SELECT me.cdid, MAX( me.year ), LOWER( title ), me.genreid, COUNT( me.cdid ) FROM cd me',
+  } => 'SELECT me.cdid, LOWER( title ), MAX( me.year ), me.genreid, COUNT( me.cdid ) FROM cd me',
 
   {
     select      => [ { min => 'me.cdid' }, ],
@@ -31,7 +32,7 @@ my @chain = (
 
   {
     '+columns' => [ { cnt => { count => 'cdid' } } ],
-  } => 'SELECT COUNT ( cdid ), MIN( me.cdid ) FROM cd me',
+  } => 'SELECT MIN( me.cdid ), COUNT ( cdid ) FROM cd me',
 
   {
     columns => [ 'year' ],
@@ -49,7 +50,7 @@ while (@chain) {
 
   is_same_sql_bind (
     $rs->as_query,
-    "x( $sql )", # the x-es are here until SQLA is fixed
+    "($sql)",
     [],
     "Test $testno of SELECT assembly ok",
   );
@@ -57,4 +58,4 @@ while (@chain) {
   $testno++;
 }
 
-done_testing;
\ No newline at end of file
+done_testing;