Really fix @INC munging of the taint test

[dbsrgits/DBIx-Class.git] / t / storage / error.t

diff --git a/t/storage/error.t b/t/storage/error.t
index e57d892..61d6782 100644 (file)
--- a/t/storage/error.t
+++ b/t/storage/error.t
@@ -6,15 +6,50 @@ use Test::Warn;
 use Test::Exception;
 
 use lib qw(t/lib);
-use_ok( 'DBICTest' );
-use_ok( 'DBICTest::Schema' );
+use DBICTest;
 
 my $schema = DBICTest->init_schema;
 
 warnings_are ( sub {
-  throws_ok (sub {
-    $schema->resultset('CD')->create({ title => 'vacation in antarctica' });
-  }, qr/NULL/);  # as opposed to some other error
+  throws_ok (
+    sub {
+      $schema->resultset('CD')->create({ title => 'vacation in antarctica' })
+    },
+    qr/DBI Exception.+(?x:
+      \QNOT NULL constraint failed: cd.artist\E
+        |
+      \Qcd.artist may not be NULL\E
+    )/s
+  );  # as opposed to some other error
 }, [], 'No warnings besides exception' );
 
+my $dbh = $schema->storage->dbh;
+
+throws_ok (
+  sub {
+    $dbh->do ('INSERT INTO nonexistent_table VALUES (1)')
+  },
+  qr/DBI Exception.+no such table.+nonexistent_table/s,
+  'DBI exceptions properly handled by dbic-installed callback'
+);
+
+# This usage is a bit unusual but it was actually seen in the wild
+# destruction of everything except the $dbh should use the proper
+# exception fallback:
+
+SKIP: {
+  if (DBIx::Class::_ENV_::PEEPEENESS) {
+    skip "Your perl version $] appears to leak like a sieve - skipping garbage collected \$schema test", 1;
+  }
+
+  undef ($schema);
+  throws_ok (
+    sub {
+      $dbh->do ('INSERT INTO nonexistent_table VALUES (1)')
+    },
+    qr/DBI Exception.+unhandled by DBIC.+no such table.+nonexistent_table/s,
+    'callback works after $schema is gone'
+  );
+}
+
 done_testing;