Merge 'trunk' into 'replication_dedux'

[dbsrgits/DBIx-Class.git] / t / 93nobindvars.t

diff --git a/t/93nobindvars.t b/t/93nobindvars.t
index f90cf7d..c955a06 100644 (file)
--- a/t/93nobindvars.t
+++ b/t/93nobindvars.t
@@ -21,13 +21,17 @@ plan tests => 4;
 
 { # Fake storage driver for mysql + no bind variables
     package DBIx::Class::Storage::DBI::MySQLNoBindVars;
+    use Class::C3;
     use base qw/
-        DBIx::Class::Storage::DBI::mysql
         DBIx::Class::Storage::DBI::NoBindVars
+        DBIx::Class::Storage::DBI::mysql
     /;
     $INC{'DBIx/Class/Storage/DBI/MySQLNoBindVars.pm'} = 1;
 }
 
+# XXX Class::C3 doesn't like some of the Storage stuff happening late...
+Class::C3::reinitialize();
+
 my $schema = DBICTest::Schema->clone;
 $schema->storage_type('::DBI::MySQLNoBindVars');
 $schema->connection($dsn, $user, $pass);
@@ -61,5 +65,5 @@ is( $it->next, undef, "next past end of resultset ok" );
 
 # clean up our mess
 END {
-    $dbh->do("DROP TABLE artist");
+    $dbh->do("DROP TABLE artist") if $dbh;
 }