Harmonize DBICTEST_VIA_REPLICATED detection in tests

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

diff --git a/t/storage/base.t b/t/storage/base.t
index b16938b..df59e91 100644 (file)
--- a/t/storage/base.t
+++ b/t/storage/base.t
@@ -1,20 +1,24 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+
 use strict;
 use warnings;
 
 use Test::More;
 use Test::Warn;
 use Test::Exception;
-use lib qw(t/lib);
+
 use DBICTest;
-use Data::Dumper;
+use DBIx::Class::_Util 'dump_value';
 
 my $schema = DBICTest->init_schema( sqlite_use_file => 1 );
 
-is( ref($schema->storage), 'DBIx::Class::Storage::DBI::SQLite',
-    'Storage reblessed correctly into DBIx::Class::Storage::DBI::SQLite' );
-
 my $storage = $schema->storage;
-$storage->ensure_connected;
+
+is(
+  ref($storage),
+  'DBIx::Class::Storage::DBI::SQLite',
+  'Storage reblessed correctly into DBIx::Class::Storage::DBI::SQLite'
+) unless $storage->isa('DBIx::Class::Storage::DBI::Replicated');
 
 throws_ok {
     $schema->storage->throw_exception('test_exception_42');
@@ -25,6 +29,33 @@ throws_ok {
 } qr/prepare_cached failed/, 'exception via DBI->HandleError, etc';
 
 
+# make sure repeated disconnection works
+{
+  my $fn = DBICTest->_sqlite_dbfilename;
+
+  lives_ok {
+    $schema->storage->ensure_connected;
+    my $dbh = $schema->storage->dbh;
+    $schema->storage->disconnect for 1,2;
+    unlink $fn;
+    $dbh->disconnect;
+  };
+
+  lives_ok {
+    $schema->storage->ensure_connected;
+    $schema->storage->disconnect for 1,2;
+    unlink $fn;
+    $schema->storage->disconnect for 1,2;
+  };
+
+  lives_ok {
+    $schema->storage->ensure_connected;
+    $schema->storage->_dbh->disconnect;
+    unlink $fn;
+    $schema->storage->disconnect for 1,2;
+  };
+}
+
 # testing various invocations of connect_info ([ ... ])
 
 my $coderef = sub { 42 };
@@ -121,19 +152,23 @@ 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
-  local $Data::Dumper::Sortkeys = 1;
-  my $arg_dump = Dumper ($invocations->{$type}{args});
+  my $arg_dump = dump_value $invocations->{$type}{args};
 
   warnings_exist (
     sub { $storage->connect_info ($invocations->{$type}{args}) },
-     $invocations->{$type}{warn} || (),
+     $invocations->{$type}{warn} || [],
     'Warned about ignored attributes',
   );
 
-  is ($arg_dump, Dumper ($invocations->{$type}{args}), "$type didn't modify passed arguments");
+  is (
+    $arg_dump,
+    dump_value $invocations->{$type}{args},
+    "$type didn't modify passed arguments",
+  );
 
   is_deeply ($storage->_dbi_connect_info, $invocations->{$type}{dbi_connect_info}, "$type produced correct _dbi_connect_info");
   ok ( (not $storage->auto_savepoint and not $storage->unsafe), "$type correctly ignored extra hashref");
@@ -145,6 +180,43 @@ 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 'This set of tests relies on being connected to SQLite', 1
+    if $env_dsn and $env_dsn !~ /\:SQLite\:/;
 
-1;
+  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');
+
+  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;