Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libintl and fix Exasol and Firebird test errors #860

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Revision history for Perl extension App::Sqitch
- Fixed a bug introduced in v1.5.0 where the MySQL engine connected to
the target database instead of the registry database. Thanks to
@tiberiusferreira for the report (#862)!
- Fixed test failures with some Exasol and Firebird configurations.
Thanks to Slaven Rezić for the report (#858)!

1.5.0 2025-01-08T03:22:40
- Fix improperly nested Pod headers that were incrementing two levels
Expand Down
2 changes: 1 addition & 1 deletion t/exasol.t
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ END {
$uri = URI->new(
$ENV{SQITCH_TEST_EXASOL_URI} ||
$ENV{EXA_URI} ||
'db:dbadmin:password@localhost/dbadmin'
'db:exasol://dbadmin:password@localhost/dbadmin'
);
my $err;
for my $i (1..30) {
Expand Down
8 changes: 5 additions & 3 deletions t/firebird.t
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ my $uri;
my $tmpdir;
my $have_fb_driver = 1; # assume DBD::Firebird is installed and so is Firebird

# Is DBD::Firebird realy installed?
# Is DBD::Firebird really installed?
try { require DBD::Firebird; } catch { $have_fb_driver = 0; };

BEGIN {
Expand Down Expand Up @@ -472,11 +472,13 @@ DBIEngineTest->run(
# DBD::Firebird.
my $cmd = $self->client;
my $cmd_echo = qx(echo "quit;" | "$cmd" -z -quiet 2>&1 );
return 0 unless $cmd_echo =~ m{Firebird}ims;
App::Sqitch::X::hurl('isql not for Firebird')
unless $cmd_echo =~ m{Firebird}ims;
chomp $cmd_echo;
say "# Detected $cmd_echo";
# Skip if no DBD::Firebird.
return 0 unless $have_fb_driver;
App::Sqitch::X::hurl('DBD::Firebird did not load')
unless $have_fb_driver;
say "# Connected to Firebird $fb_version" if $fb_version;
return 1;
},
Expand Down
2 changes: 1 addition & 1 deletion t/lib/DBIEngineTest.pm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ sub run {
);
if (my $code = $p{skip_unless}) {
try {
$code->( $engine ) || die 'NO';
$code->( $engine ) || App::Sqitch::X::hurl('NO');
} catch {
plan skip_all => sprintf(
'Unable to live-test %s engine: %s',
Expand Down
2 changes: 1 addition & 1 deletion t/lib/TestConfig.pm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BEGIN {
# Suppress warnings from Locale::Messages.
# https://github.com/gflohr/libintl-perl/issues/14
use Locale::Messages;
if ($Locale::Messages::package eq 'gettext_pp') {
if ($Locale::Messages::package eq 'gettext_pp' && Locale::Messages->VERSION < 1.35) {
no warnings qw(redefine prototype);
no strict 'refs';
my $orig = \&Locale::gettext_pp::__locale_category;
Expand Down
2 changes: 1 addition & 1 deletion t/snowflake.t
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ $uri = URI->new(
$ENV{SNOWSQL_URI} ||
'db:snowflake://accountname/?Driver=Snowflake'
);
$uri->host($uri->host . ".snowflakecomputing.com") if $uri->host !~ /snoflakecomputing[.]com/;
$uri->host($uri->host . ".snowflakecomputing.com") if $uri->host !~ /snowflakecomputing[.]com/;
my $err = try {
$snow->use_driver;
$dbh = DBI->connect($uri->dbi_dsn, $uri->user, $uri->password, {
Expand Down
Loading