Only load DBICTest::Schema when needed in tests

[dbsrgits/DBIx-Class.git] / t / 74mssql.t

diff --git a/t/74mssql.t b/t/74mssql.t
index 263fecb..c0c3e42 100644 (file)
--- a/t/74mssql.t
+++ b/t/74mssql.t
@@ -18,13 +18,13 @@ plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missin
   unless DBIx::Class::Optional::Dependencies->req_ok_for ('test_rdbms_mssql_sybase');
 
 {
-  my $srv_ver = DBICTest::Schema->connect($dsn, $user, $pass)->storage->_server_info->{dbms_version};
+  my $srv_ver = DBICTest->connect_schema($dsn, $user, $pass)->storage->_server_info->{dbms_version};
   ok ($srv_ver, 'Got a test server version on fresh schema: ' . ($srv_ver||'???') );
 }
 
 my $schema;
 
-my $testdb_supports_placeholders = DBICTest::Schema->connect($dsn, $user, $pass)
+my $testdb_supports_placeholders = DBICTest->connect_schema($dsn, $user, $pass)
                                                     ->storage
                                                      ->_supports_typeless_placeholders;
 my @test_storages = (
@@ -33,7 +33,7 @@ my @test_storages = (
 );
 
 for my $storage_type (@test_storages) {
-  $schema = DBICTest::Schema->connect($dsn, $user, $pass);
+  $schema = DBICTest->connect_schema($dsn, $user, $pass);
 
   if ($storage_type =~ /NoBindVars\z/) {
     # since we want to use the nobindvar - disable the capability so the
@@ -272,8 +272,7 @@ SQL
   }
 
   {
-    my $schema = DBICTest::Schema->clone;
-    $schema->connection($dsn, $user, $pass);
+    my $schema = DBICTest->connect_schema($dsn, $user, $pass);
 
     like $schema->storage->sql_maker->{limit_dialect},
       qr/^(?:Top|RowNumberOver)\z/,
@@ -284,8 +283,7 @@ SQL
 # test op-induced autoconnect
 lives_ok (sub {
 
-  my $schema =  DBICTest::Schema->clone;
-  $schema->connection($dsn, $user, $pass);
+  my $schema =  DBICTest->connect_schema($dsn, $user, $pass);
 
   my $artist = $schema->resultset ('Artist')->search ({}, { order_by => 'artistid' })->next;
   is ($artist->id, 1, 'Artist retrieved successfully');
@@ -294,7 +292,7 @@ lives_ok (sub {
 # test AutoCommit=0
 {
   local $ENV{DBIC_UNSAFE_AUTOCOMMIT_OK} = 1;
-  my $schema2 = DBICTest::Schema->connect($dsn, $user, $pass, { AutoCommit => 0 });
+  my $schema2 = DBICTest->connect_schema($dsn, $user, $pass, { AutoCommit => 0 });
 
   my $rs = $schema2->resultset('Money');