Consolidate various $storage state resets in $storage->disconnect()

[dbsrgits/DBIx-Class.git] / t / sqlmaker / core_quoted.t

diff --git a/t/sqlmaker/core_quoted.t b/t/sqlmaker/core_quoted.t
index 4392cc2..8e45566 100644 (file)
--- a/t/sqlmaker/core_quoted.t
+++ b/t/sqlmaker/core_quoted.t
@@ -4,9 +4,7 @@ use warnings;
 use Test::More;
 
 use lib qw(t/lib);
-use DBIC::SqlMakerTest;
-
-use_ok('DBICTest');
+use DBICTest ':DiffSQL';
 
 my $schema = DBICTest->init_schema();
 
@@ -26,7 +24,7 @@ my ($sql, @bind) = $sql_maker->select(
                 '-join_type' => ''
               },
               {
-                'artist.artistid' => 'me.artist'
+                'artist.artistid' => { -ident => 'me.artist' },
               }
             ],
             [
@@ -35,14 +33,14 @@ my ($sql, @bind) = $sql_maker->select(
                 '-join_type' => 'left'
               },
               {
-                'tracks.cd' => 'me.cdid'
+                'tracks.cd' => { -ident => 'me.cdid' },
               }
             ],
           ],
           [
             'me.cdid',
             { count => 'tracks.cd' },
-            { min => 'me.year', -as => 'me.minyear' },
+            { min => 'me.year', -as => 'minyear' },
           ],
           {
             'artist.name' => 'Caterwauler McCrae',
@@ -56,7 +54,7 @@ my ($sql, @bind) = $sql_maker->select(
 is_same_sql_bind(
   $sql, \@bind,
   q/
-    SELECT `me`.`cdid`, COUNT( `tracks`.`cd` ), MIN( `me`.`year` ) AS `me`.`minyear`
+    SELECT `me`.`cdid`, COUNT( `tracks`.`cd` ), MIN( `me`.`year` ) AS `minyear`
       FROM `cd` `me`
       JOIN `artist` `artist` ON ( `artist`.`artistid` = `me`.`artist` )
       LEFT JOIN `tracks` `tracks` ON ( `tracks`.`cd` = `me`.`cdid` )
@@ -309,7 +307,7 @@ $sql_maker->quote_char([qw/[ ]/]);
                 '-join_type' => ''
               },
               {
-                'artist.artistid' => 'me.artist'
+                'artist.artistid' => { -ident => 'me.artist' }
               }
             ]
           ],