Merge 'sybase' into 'trunk'

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

diff --git a/t/746sybase.t b/t/746sybase.t
index 84ed68a..9e0caae 100644 (file)
--- a/t/746sybase.t
+++ b/t/746sybase.t
@@ -6,13 +6,12 @@ use Test::More;
 use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
-
-require DBIx::Class::Storage::DBI::Sybase;
-require DBIx::Class::Storage::DBI::Sybase::NoBindVars;
+use DBIx::Class::Storage::DBI::Sybase;
+use DBIx::Class::Storage::DBI::Sybase::NoBindVars;
 
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_SYBASE_${_}" } qw/DSN USER PASS/};
 
-my $TESTS = 51 + 2;
+my $TESTS = 48 + 2;
 
 if (not ($dsn && $user)) {
   plan skip_all =>
@@ -158,7 +157,8 @@ SQL
 
   is( $it->count, 7, 'COUNT of GROUP_BY ok' );
 
-# do an IDENTITY_INSERT
+# do an identity insert (which should happen with no txn when using
+# placeholders.)
   {
     no warnings 'redefine';
 
@@ -178,7 +178,7 @@ SQL
     $schema->resultset('Artist')
       ->create({ artistid => 999, name => 'mtfnpy' });
 
-    ok((grep /IDENTITY_INSERT/i, @debug_out), 'IDENTITY_INSERT used');
+    ok((grep /IDENTITY_INSERT/i, @debug_out), 'IDENTITY_INSERT');
 
     SKIP: {
       skip 'not testing lack of txn on IDENTITY_INSERT with NoBindVars', 1
@@ -188,23 +188,6 @@ SQL
     }
   }
 
-# do an IDENTITY_UPDATE
-  {
-    my @debug_out;
-    local $schema->storage->{debug} = 1;
-    local $schema->storage->debugobj->{callback} = sub {
-      push @debug_out, $_[1];
-    };
-
-    lives_and {
-      $schema->resultset('Artist')
-        ->find(999)->update({ artistid => 555 });
-      ok((grep /IDENTITY_UPDATE/i, @debug_out));
-    } 'IDENTITY_UPDATE used';
-    $ping_count-- if $@;
-  }
-
-
 # test insert_bulk using populate, this should always pass whether or not it
 # does anything Sybase specific or not. Just here to aid debugging.
   lives_ok {
@@ -281,7 +264,7 @@ SQL
 
 # mostly stolen from the blob stuff Nniuq wrote for t/73oracle.t
   SKIP: {
-    skip 'TEXT/IMAGE support does not work with FreeTDS', 16
+    skip 'TEXT/IMAGE support does not work with FreeTDS', 13
       if $schema->storage->using_freetds;
 
     my $dbh = $schema->storage->_dbh;
@@ -334,9 +317,20 @@ SQL
 
     # blob insert with explicit PK
     # also a good opportunity to test IDENTITY_INSERT
+    {
+      local $SIG{__WARN__} = sub {};
+      eval { $dbh->do('DROP TABLE bindtype_test') };
 
-    $rs->delete;
-
+      $dbh->do(qq[
+        CREATE TABLE bindtype_test 
+        (
+          id    INT   IDENTITY PRIMARY KEY,
+          bytea INT   NULL,
+          blob  IMAGE NULL,
+          clob  TEXT  NULL
+        )
+      ],{ RaiseError => 1, PrintError => 0 });
+    }
     my $created = eval { $rs->create( { id => 1, blob => $binstr{large} } ) };
     ok(!$@, "inserted large blob without dying with manual PK");
     diag $@ if $@;
@@ -365,27 +359,13 @@ SQL
     diag $@ if $@;
     ok($got eq $new_str, "verified updated blob");
 
-    # try a blob update with IDENTITY_UPDATE
-    lives_and {
-      $new_str = $binstr{large} . 'hlagh';
-      $rs->find(1)->update({ id => 999, blob => $new_str });
-      ok($rs->find(999)->blob eq $new_str);
-    } 'verified updated blob with IDENTITY_UPDATE';
-
     ## try multi-row blob update
     # first insert some blobs
-    $rs->delete;
+    $rs->find(1)->delete;
     $rs->create({ blob => $binstr{large} }) for (1..3);
     $new_str = $binstr{large} . 'foo';
     $rs->update({ blob => $new_str });
     is((grep $_->blob eq $new_str, $rs->all), 3, 'multi-row blob update');
-
-    # make sure impossible blob update throws
-    throws_ok {
-      $rs->update({ clob => 'foo' });
-      $rs->create({ clob => 'bar' });
-      $rs->search({ clob => 'foo' })->update({ clob => 'bar' });
-    } qr/impossible/, 'impossible blob update throws';
   }
 
 # test MONEY column support