remove unsafe_insert

[dbsrgits/DBIx-Class.git] / t / 746sybase.t

diff --git a/t/746sybase.t b/t/746sybase.t
index e8a08d0..b8a42e2 100644 (file)
--- a/t/746sybase.t
+++ b/t/746sybase.t
@@ -11,19 +11,24 @@ use DBIx::Class::Storage::DBI::Sybase::NoBindVars;
 
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_SYBASE_${_}" } qw/DSN USER PASS/};
 
-my $TESTS = 39 + 2;
+my $TESTS = 40 + 2;
 
 if (not ($dsn && $user)) {
   plan skip_all =>
     'Set $ENV{DBICTEST_SYBASE_DSN}, _USER and _PASS to run this test' .
     "\nWarning: This test drops and creates the tables " .
     "'artist' and 'bindtype_test'";
+} else {
+  plan tests => $TESTS*2 + 1;
 }
 
 my @storage_types = (
   'DBI::Sybase',
   'DBI::Sybase::NoBindVars',
 );
+my $schema;
+my $storage_idx = -1;
+
 sub get_schema {
   DBICTest::Schema->connect($dsn, $user, $pass, {
     on_connect_call => [
@@ -41,21 +46,9 @@ my $ping_count = 0;
   };
 }
 
-my $schema;
-my $storage_idx = -1;
-
 for my $storage_type (@storage_types) {
   $storage_idx++;
-  _run_tests ($storage);
-}
-
-
-
 
-is $ping_count, 0, 'no pings';
-
-
-sub _run_tests {
   unless ($storage_type eq 'DBI::Sybase') { # autodetect
     DBICTest::Schema->storage_type("::$storage_type");
   }
@@ -315,21 +308,36 @@ SQL
   });
 
 # test insert transaction when there's an active cursor
-  TODO: { 
-#    local $TODO = 'not supported yet or possibly ever';
+  SKIP: {
+    skip 'not testing insert with active cursor if using ::NoBindVars', 1
+      if $storage_type =~ /NoBindVars/i;
+
+    my $artist_rs = $schema->resultset('Artist');
+    $artist_rs->first;
+    lives_ok {
+      my $row = $schema->resultset('Money')->create({ amount => 100 });
+      $row->delete;
+    } 'inserted a row with an active cursor';
+    $ping_count-- if $@; # dbh_do calls ->connected
+  }
 
-    SKIP: {
-      skip 'not testing insert with active cursor if using unsafe_insert', 1
-        if $schema->storage->unsafe_insert;
+# test insert in an outer transaction when there's an active cursor
+  TODO: {
+    local $TODO = 'this should work once we have eager cursors';
+
+# clear state, or we get a deadlock on $row->delete
+# XXX figure out why this happens
+    $schema->storage->disconnect;
 
-      my $artist_rs = $schema->resultset('Artist');
-      $artist_rs->first;
-      lives_ok {
+    lives_ok {
+      $schema->txn_do(sub {
+        my $artist_rs = $schema->resultset('Artist');
+        $artist_rs->first;
         my $row = $schema->resultset('Money')->create({ amount => 100 });
         $row->delete;
-      } 'inserted a row with an active cursor';
-      $ping_count-- if $@; # dbh_do calls ->connected
-    }
+      });
+    } 'inserted a row with an active cursor in outer txn';
+    $ping_count-- if $@; # dbh_do calls ->connected
   }
 
 # Now test money values.
@@ -361,6 +369,8 @@ SQL
   diag $@ if $@;
 }
 
+is $ping_count, 0, 'no pings';
+
 # clean up our mess
 END {
   if (my $dbh = eval { $schema->storage->_dbh }) {