removed unnecessary use of Test::Exception

[dbsrgits/DBIx-Class.git] / t / 73oracle.t

diff --git a/t/73oracle.t b/t/73oracle.t
index aafd1f0..907c278 100644 (file)
--- a/t/73oracle.t
+++ b/t/73oracle.t
@@ -11,13 +11,6 @@ use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
 
-plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('test_rdbms_oracle')
-  unless DBIx::Class::Optional::Dependencies->req_ok_for ('test_rdbms_oracle');
-
-$ENV{NLS_SORT} = "BINARY";
-$ENV{NLS_COMP} = "BINARY";
-$ENV{NLS_LANG} = "AMERICAN";
-
 my ($dsn,  $user,  $pass)  = @ENV{map { "DBICTEST_ORA_${_}" }  qw/DSN USER PASS/};
 
 # optional:
@@ -26,6 +19,13 @@ my ($dsn2, $user2, $pass2) = @ENV{map { "DBICTEST_ORA_EXTRAUSER_${_}" } qw/DSN U
 plan skip_all => 'Set $ENV{DBICTEST_ORA_DSN}, _USER and _PASS to run this test.'
   unless ($dsn && $user && $pass);
 
+plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('test_rdbms_oracle')
+  unless DBIx::Class::Optional::Dependencies->req_ok_for ('test_rdbms_oracle');
+
+$ENV{NLS_SORT} = "BINARY";
+$ENV{NLS_COMP} = "BINARY";
+$ENV{NLS_LANG} = "AMERICAN";
+
 {
   package    # hide from PAUSE
     DBICTest::Schema::ArtistFQN;
@@ -393,7 +393,6 @@ sub _run_tests {
 
     # disable BLOB mega-output
     my $orig_debug = $schema->storage->debug;
-    $schema->storage->debug (0);
 
     local $TODO = 'Something is confusing column bindtype assignment when quotes are active'
                 . ': https://rt.cpan.org/Ticket/Display.html?id=64206'
@@ -403,6 +402,13 @@ sub _run_tests {
     foreach my $size (qw( small large )) {
       $id++;
 
+      if ($size eq 'small') {
+        $schema->storage->debug($orig_debug);
+      }
+      elsif ($size eq 'large') {
+        $schema->storage->debug(0);
+      }
+
       my $str = $binstr{$size};
       lives_ok {
         $rs->create( { 'id' => $id, blob => "blob:$str", clob => "clob:$str" } )
@@ -441,9 +447,9 @@ sub _run_tests {
       is (@objs, 1, 'One row found matching on both LOBs as a subquery');
 
       lives_ok {
-        $rs->search({ blob => "blob:$str", clob => "clob:$str" })
+        $rs->search({ id => $id, blob => "blob:$str", clob => "clob:$str" })
           ->update({ blob => 'updated blob', clob => 'updated clob' });
-      } 'blob UPDATE with WHERE clause survived';
+      } 'blob UPDATE with blobs in WHERE clause survived';
 
       @objs = $rs->search({ blob => "updated blob", clob => 'updated clob' })->all;
       is @objs, 1, 'found updated row';
@@ -451,10 +457,20 @@ sub _run_tests {
       ok (try { $objs[0]->clob }||'' eq "updated clob", 'clob updated/retrieved correctly');
 
       lives_ok {
-        $rs->search({ blob => "updated blob", clob => "updated clob" })
+        $rs->search({ id => $id  })
+          ->update({ blob => 're-updated blob', clob => 're-updated clob' });
+      } 'blob UPDATE without blobs in WHERE clause survived';
+
+      @objs = $rs->search({ blob => 're-updated blob', clob => 're-updated clob' })->all;
+      is @objs, 1, 'found updated row';
+      ok (try { $objs[0]->blob }||'' eq 're-updated blob', 'blob updated/retrieved correctly');
+      ok (try { $objs[0]->clob }||'' eq 're-updated clob', 'clob updated/retrieved correctly');
+
+      lives_ok {
+        $rs->search({ blob => "re-updated blob", clob => "re-updated clob" })
           ->delete;
       } 'blob DELETE with WHERE clause survived';
-      @objs = $rs->search({ blob => "updated blob", clob => 'updated clob' })->all;
+      @objs = $rs->search({ blob => "re-updated blob", clob => 're-updated clob' })->all;
       is @objs, 0, 'row deleted successfully';
     }