Enable soft_commit with DBD::Firebird as well

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / 10_09firebird_common.t

diff --git a/t/10_09firebird_common.t b/t/10_09firebird_common.t
index 65ce5c0..69611a7 100644 (file)
--- a/t/10_09firebird_common.t
+++ b/t/10_09firebird_common.t
@@ -22,7 +22,7 @@ for (qw(FIREBIRD FIREBIRD_ODBC FIREBIRD_INTERBASE)) {
     $dsns{$_}{user} = $ENV{"DBICTEST_${_}_USER"};
     $dsns{$_}{password} = $ENV{"DBICTEST_${_}_PASS"};
     $dsns{$_}{connect_info_opts} = { on_connect_call => 'use_softcommit' }
-        if /\AFIREBIRD(?:_INTERBASE)\z/;
+        if /\AFIREBIRD(?:_INTERBASE)?\z/;
 };
 
 plan skip_all => 'You need to set the DBICTEST_FIREBIRD_DSN, _USER and _PASS and/or the DBICTEST_FIREBIRD_ODBC_DSN, _USER and _PASS and/or the DBICTEST_FIREBIRD_INTERBASE_DSN, _USER and _PASS environment variables'
@@ -58,7 +58,7 @@ my $tester = dbixcsl_common_tests->new(
     null        => '',
     preserve_case_mode_is_exclusive => 1,
     quote_char                      => '"',
-    connect_info => [ values %dsns ],
+    connect_info => [ map { $dsns{$_} } sort keys %dsns ],
     data_types  => {
         # based on the Interbase Data Definition Guide
         # http://www.ibphoenix.com/downloads/60DataDef.zip
@@ -198,7 +198,7 @@ q{
     # get rid of stupid warning from InterBase/GetInfo.pm
     if ($dsns{FIREBIRD_INTERBASE}) {
         local $SIG{__WARN__} = sigwarn_silencer(
-            qr{^Use of uninitialized value in sprintf at \S+DBD/InterBase/GetInfo\.pm line \d+\.$|^Missing argument in sprintf at \S+DBD/InterBase/GetInfo.pm line \d+\.$}
+            qr{^(?:Use of uninitialized value|Argument "[0-9_]+" isn't numeric|Missing argument) in sprintf at \S+DBD/InterBase/GetInfo.pm line \d+\.$}
         );
         require DBD::InterBase;
         require DBD::InterBase::GetInfo;