X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F74mssql.t;h=c0c3e4294feb3d8443ab4e024ba5ac6f10e5ab38;hb=1d29e7e26524c98be9ce63a91ec91b1e0d75c03d;hp=0ccaa23bf7f1810b8e709da006d7ae2e1a6cca0a;hpb=49b3a2641b8687764378abc01554bb8804a4bc26;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/74mssql.t b/t/74mssql.t
index 0ccaa23..c0c3e42 100644
--- a/t/74mssql.t
+++ b/t/74mssql.t
@@ -1,15 +1,9 @@
 use strict;
 use warnings;
 
-# use this if you keep a copy of DBD::Sybase linked to FreeTDS somewhere else
-BEGIN {
-  if (my $lib_dirs = $ENV{DBICTEST_MSSQL_PERL5LIB}) {
-    unshift @INC, $_ for split /:/, $lib_dirs;
-  }
-}
-
 use Test::More;
 use Test::Exception;
+use Scalar::Util 'weaken';
 use DBIx::Class::Optional::Dependencies ();
 use lib qw(t/lib);
 use DBICTest;
@@ -24,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 = (
@@ -39,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
@@ -123,7 +117,8 @@ for my $storage_type (@test_storages) {
 SQL
    });
 
-   my $rs = $schema->resultset('Money');
+  my $rs = $schema->resultset('Money');
+  weaken(my $rs_cp = $rs);  # nested closure refcounting is an utter mess in perl
 
   my $row;
   lives_ok {
@@ -151,7 +146,7 @@ SQL
   # test simple transaction with commit
   lives_ok {
     $schema->txn_do(sub {
-      $rs->create({ amount => 300 });
+      $rs_cp->create({ amount => 300 });
     });
   } 'simple transaction';
 
@@ -163,7 +158,7 @@ SQL
   # test rollback
   throws_ok {
     $schema->txn_do(sub {
-      $rs->create({ amount => 700 });
+      $rs_cp->create({ amount => 700 });
       die 'mtfnpy';
     });
   } qr/mtfnpy/, 'simple failed txn';
@@ -199,65 +194,63 @@ SQL
     $rs->delete;
   }
 
-  # test transaction handling on a disconnected handle
   my $wrappers = {
     no_transaction => sub { shift->() },
     txn_do => sub { my $code = shift; $schema->txn_do(sub { $code->() } ) },
     txn_begin => sub { $schema->txn_begin; shift->(); $schema->txn_commit },
     txn_guard => sub { my $g = $schema->txn_scope_guard; shift->(); $g->commit },
   };
+
+  # test transaction handling on a disconnected handle
   for my $wrapper (keys %$wrappers) {
     $rs->delete;
 
     # a reconnect should trigger on next action
     $schema->storage->_get_dbh->disconnect;
 
+
     lives_and {
       $wrappers->{$wrapper}->( sub {
-        $rs->create({ amount => 900 + $_ }) for 1..3;
+        $rs_cp->create({ amount => 900 + $_ }) for 1..3;
       });
       is $rs->count, 3;
     } "transaction on disconnected handle with $wrapper wrapper";
   }
 
-  TODO: {
+  # test transaction handling on a disconnected handle with multiple active
+  # statements
+  for my $wrapper (keys %$wrappers) {
+    $schema->storage->disconnect;
+    $rs->delete;
+    $rs->reset;
+    $rs->create({ amount => 1000 + $_ }) for (1..3);
+
+    my $artist_rs = $schema->resultset('Artist')->search({
+      name => { -like => 'Artist %' }
+    });;
+
+    $rs->next;
+
+    my $map = [ ['Artist 1', '1002.00'], ['Artist 2', '1003.00'] ];
+
+    weaken(my $a_rs_cp = $artist_rs);
+
     local $TODO = 'Transaction handling with multiple active statements will '
-                 .'need eager cursor support.';
-
-    # test transaction handling on a disconnected handle with multiple active
-    # statements
-    my $wrappers = {
-      no_transaction => sub { shift->() },
-      txn_do => sub { my $code = shift; $schema->txn_do(sub { $code->() } ) },
-      txn_begin => sub { $schema->txn_begin; shift->(); $schema->txn_commit },
-      txn_guard => sub { my $g = $schema->txn_scope_guard; shift->(); $g->commit },
-    };
-    for my $wrapper (keys %$wrappers) {
-      $rs->reset;
-      $rs->delete;
-      $rs->create({ amount => 1000 + $_ }) for (1..3);
-
-      my $artist_rs = $schema->resultset('Artist')->search({
-        name => { -like => 'Artist %' }
-      });;
-
-      $rs->next;
-
-      my $map = [ ['Artist 1', '1002.00'], ['Artist 2', '1003.00'] ];
-
-      lives_and {
-        my @results;
-
-        $wrappers->{$wrapper}->( sub {
-          while (my $money = $rs->next) {
-            my $artist = $artist_rs->next;
-            push @results, [ $artist->name, $money->amount ];
-          };
-        });
-
-        is_deeply \@results, $map;
-      } "transactions with multiple active statement with $wrapper wrapper";
-    }
+                 .'need eager cursor support.'
+      unless $wrapper eq 'no_transaction';
+
+    lives_and {
+      my @results;
+
+      $wrappers->{$wrapper}->( sub {
+        while (my $money = $rs_cp->next) {
+          my $artist = $a_rs_cp->next;
+          push @results, [ $artist->name, $money->amount ];
+        };
+      });
+
+      is_deeply \@results, $map;
+    } "transactions with multiple active statement with $wrapper wrapper";
   }
 
   # test RNO detection when version detection fails
@@ -279,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/,
@@ -291,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');
@@ -301,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');
 
@@ -332,4 +323,6 @@ END {
     $dbh->do("IF OBJECT_ID('cd', 'U') IS NOT NULL DROP TABLE cd");
     $dbh->do("IF OBJECT_ID('money_test', 'U') IS NOT NULL DROP TABLE money_test");
   }
+
+  undef $schema;
 }