X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F74mssql.t;h=263fecbc3842a5bd2e08adfa31c0850543435f19;hb=c1f3f2e8a79c6a4081c9949fa30da09d18d64d3b;hp=2ec7fa5fed223459c8a5094b686c6e581fbccca5;hpb=65d351219882184861384aedac6f251b6797d0d7;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/74mssql.t b/t/74mssql.t
index 2ec7fa5..263fecb 100644
--- a/t/74mssql.t
+++ b/t/74mssql.t
@@ -1,13 +1,6 @@
 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';
@@ -201,13 +194,14 @@ 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;
 
@@ -223,45 +217,40 @@ SQL
     } "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'] ];
-
-      weaken(my $a_rs_cp = $artist_rs);
-
-      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";
-    }
+                 .'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