$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'
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
# 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;