X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstorage%2Fbase.t;h=df3641eacd56bf715e30299d6a9fc14c89c68f39;hb=0488c7e1294791e01dc75dfe633454d0f4201384;hp=c0bde464bdb0ea71547a8cd724dfe35476aab791;hpb=7755a91d0b45594f948d6b09cf7dc1fdad9b8a90;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/storage/base.t b/t/storage/base.t
index c0bde46..df3641e 100644
--- a/t/storage/base.t
+++ b/t/storage/base.t
@@ -3,37 +3,11 @@ use warnings;
 
 use Test::More;
 use Test::Warn;
+use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
 use Data::Dumper;
 
-{
-    package DBICTest::ExplodingStorage::Sth;
-    use strict;
-    use warnings;
-
-    sub execute { die "Kablammo!" }
-
-    sub bind_param {}
-
-    package DBICTest::ExplodingStorage;
-    use strict;
-    use warnings;
-    use base 'DBIx::Class::Storage::DBI::SQLite';
-
-    my $count = 0;
-    sub sth {
-      my ($self, $sql) = @_;
-      return bless {},  "DBICTest::ExplodingStorage::Sth" unless $count++;
-      return $self->next::method($sql);
-    }
-
-    sub connected {
-      return 0 if $count == 1;
-      return shift->next::method(@_);
-    }
-}
-
 my $schema = DBICTest->init_schema( sqlite_use_file => 1 );
 
 is( ref($schema->storage), 'DBIx::Class::Storage::DBI::SQLite',
@@ -42,27 +16,13 @@ is( ref($schema->storage), 'DBIx::Class::Storage::DBI::SQLite',
 my $storage = $schema->storage;
 $storage->ensure_connected;
 
-eval {
+throws_ok {
     $schema->storage->throw_exception('test_exception_42');
-};
-like($@, qr/\btest_exception_42\b/, 'basic exception');
+} qr/\btest_exception_42\b/, 'basic exception';
 
-eval {
+throws_ok {
     $schema->resultset('CD')->search_literal('broken +%$#$1')->all;
-};
-like($@, qr/prepare_cached failed/, 'exception via DBI->HandleError, etc');
-
-bless $storage, "DBICTest::ExplodingStorage";
-$schema->storage($storage);
-
-eval { 
-    $schema->resultset('Artist')->create({ name => "Exploding Sheep" });
-};
-
-is($@, "", "Exploding \$sth->execute was caught");
-
-is(1, $schema->resultset('Artist')->search({name => "Exploding Sheep" })->count,
-  "And the STH was retired");
+} qr/prepare_cached failed/, 'exception via DBI->HandleError, etc';
 
 
 # testing various invocations of connect_info ([ ... ])
@@ -143,6 +103,7 @@ my $invocations = {
             AutoCommit => 0,
           },
       ],
+      warn => qr/\QYou provided explicit AutoCommit => 0 in your connection_info/,
   },
   'connect_info ([ \%attr_with_coderef ])' => {
       args => [ {
@@ -160,6 +121,7 @@ my $invocations = {
 };
 
 for my $type (keys %$invocations) {
+  local $ENV{DBIC_UNSAFE_AUTOCOMMIT_OK};
 
   # we can not use a cloner portably because of the coderef
   # so compare dumps instead
@@ -168,7 +130,7 @@ for my $type (keys %$invocations) {
 
   warnings_exist (
     sub { $storage->connect_info ($invocations->{$type}{args}) },
-     $invocations->{$type}{warn} || (),
+     $invocations->{$type}{warn} || [],
     'Warned about ignored attributes',
   );
 
@@ -184,6 +146,42 @@ for my $type (keys %$invocations) {
   );
 }
 
-done_testing;
+# make sure connection-less storages do not throw on _determine_driver
+# but work with ENV at the same time
+SKIP: for my $env_dsn (undef, (DBICTest->_database)[0] ) {
+  skip 'Subtest relies on being connected to SQLite', 1
+    if $env_dsn and $env_dsn !~ /\:SQLite\:/;
+
+  local $ENV{DBI_DSN} = $env_dsn || '';
+
+  my $s = DBICTest::Schema->connect();
+  is_deeply (
+    $s->storage->connect_info,
+    [],
+    'Starting with no explicitly passed in connect info'
+  . ($env_dsn ? ' (with DBI_DSN)' : ''),
+  );
+
+  my $sm = $s->storage->sql_maker;
+
+  ok (! $s->storage->connected, 'Storage does not appear connected after SQLMaker instance is taken');
 
-1;
+  if ($env_dsn) {
+    isa_ok($sm, 'DBIx::Class::SQLMaker');
+
+    ok ( $s->storage->_driver_determined, 'Driver determined (with DBI_DSN)');
+    isa_ok ( $s->storage, 'DBIx::Class::Storage::DBI::SQLite' );
+  }
+  else {
+    isa_ok($sm, 'DBIx::Class::SQLMaker');
+
+    ok (! $s->storage->_driver_determined, 'Driver undetermined');
+
+    throws_ok {
+      $s->storage->ensure_connected
+    } qr/You did not provide any connection_info/,
+    'sensible exception on empty conninfo connect';
+  }
+}
+
+done_testing;