X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F751msaccess.t;h=bf4cdacfa036212af9e4363b9507b63e78fbeda3;hb=13ad6d2a9f92ee1fd3baf4921643901055b26b62;hp=403dc21912d3a41060b6747acf4774ba0b581d4b;hpb=199fbc453ec03891d0e156d7353c5e992ba4de47;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/751msaccess.t b/t/751msaccess.t
index 403dc21..bf4cdac 100644
--- a/t/751msaccess.t
+++ b/t/751msaccess.t
@@ -8,8 +8,6 @@ use Try::Tiny;
 use DBIx::Class::Optional::Dependencies ();
 use lib qw(t/lib);
 use DBICTest;
-use DBIC::DebugObj ();
-use DBIC::SqlMakerTest;
 
 my ($dsn,  $user,  $pass)  = @ENV{map { "DBICTEST_MSACCESS_ODBC_${_}" } qw/DSN USER PASS/};
 my ($dsn2, $user2, $pass2) = @ENV{map { "DBICTEST_MSACCESS_ADO_${_}" }  qw/DSN USER PASS/};
@@ -42,15 +40,13 @@ my @info = (
   [ $dsn2, $user2 || '', $pass2 || '' ],
 );
 
-my $schema;
-
 foreach my $info (@info) {
   my ($dsn, $user, $pass) = @$info;
 
   next unless $dsn;
 
 # Check that we can connect without any options.
-  $schema = DBICTest::Schema->connect($dsn, $user, $pass);
+  my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
   lives_ok {
     $schema->storage->ensure_connected;
   } 'connection without any options';
@@ -66,7 +62,7 @@ foreach my $info (@info) {
     LongReadLen => $maxloblen,
   });
 
-  my $guard = Scope::Guard->new(\&cleanup);
+  my $guard = Scope::Guard->new(sub { cleanup($schema) });
 
   my $dbh = $schema->storage->dbh;
 
@@ -146,12 +142,7 @@ EOF
     title => 'my track',
   });
 
-  my ($sql, @bind);
-
   my $joined_track = try {
-    local $schema->storage->{debug} = 1;
-    local $schema->storage->{debugobj} = DBIC::DebugObj->new(\$sql, \@bind);
-
     $schema->resultset('Artist')->search({
       artistid => $first_artistid,
     }, {
@@ -164,25 +155,10 @@ EOF
     diag "Could not execute two-step left join: $_";
   };
 
-  s/^'//, s/'\z// for @bind;
-
-  is_same_sql_bind(
-    $sql,
-    \@bind,
-    'SELECT [me].[artistid], [me].[name], [me].[rank], [me].[charfield], [tracks].[title] FROM ( ( [artist] [me] LEFT JOIN cd [cds] ON [cds].[artist] = [me].[artistid] ) LEFT JOIN [track] [tracks] ON [tracks].[cd] = [cds].[cdid] ) WHERE ( [artistid] = ? )',
-    [1],
-    'correct SQL for two-step left join',
-  );
-
   is try { $joined_track->get_column('track_title') }, 'my track',
     'two-step left join works';
 
-  ($sql, @bind) = ();
-
   $joined_artist = try {
-    local $schema->storage->{debug} = 1;
-    local $schema->storage->{debugobj} = DBIC::DebugObj->new(\$sql, \@bind);
-
     $schema->resultset('Track')->search({
       trackid => $track->trackid,
     }, {
@@ -195,16 +171,6 @@ EOF
     diag "Could not execute two-step inner join: $_";
   };
 
-  s/^'//, s/'\z// for @bind;
-
-  is_same_sql_bind(
-    $sql,
-    \@bind,
-    'SELECT [me].[trackid], [me].[cd], [me].[position], [me].[title], [me].[last_updated_on], [me].[last_updated_at], [artist].[name] FROM ( ( [track] [me] INNER JOIN cd [cd] ON [cd].[cdid] = [me].[cd] ) INNER JOIN [artist] [artist] ON [artist].[artistid] = [cd].[artist] ) WHERE ( [trackid] = ? )',
-    [$track->trackid],
-    'correct SQL for two-step inner join',
-  );
-
   is try { $joined_artist->get_column('artist_name') }, 'foo',
     'two-step inner join works';
 
@@ -442,6 +408,8 @@ SQL
 done_testing;
 
 sub cleanup {
+  my $schema = shift;
+
   if (my $storage = eval { $schema->storage }) {
     # cannot drop a table if it has been used, have to reconnect first
     $schema->storage->disconnect;