Skip to content

Commit

Permalink
Fix test failures with Encode v2.99.
Browse files Browse the repository at this point in the history
Most likely caused by [this
change](dankogai/p5-encode#135). It happens because
Locale::Message's bound textdomain filter always passes the optional second
argument, if if it never has one. In the past, that worked okay beause Encode
treated `undef` the same as 0, so we still got the default malformed data
handling. But now that it doesn't, we have to explicitly give the bound text
domain filter a malformed data check parameter. So we give it the default,
`FB_DEFAULT`.

Also update the latest version of Exasol 6.1 to test.
  • Loading branch information
theory committed Feb 1, 2019
1 parent 660ad17 commit 4cfd1dc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ jobs:
- &exasol
stage: ☀️ Exasol
if: branch = master
env: EXASOL=6.1.0-d1
env: EXASOL=6.1.1-d1
before_install:
- source dev/linux-exasol
- source dev/linux-prereqs
Expand Down
2 changes: 2 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Revision history for Perl extension App::Sqitch
- Fixed an issue with command argument parsing so that it truly never
returns a target without an engine specified, as documented.
- Removed documentation for methods that don't exist.
- Fixed test failures due to a change in Encode v2.99 that's stricter
about `undef` arguments that should be defined.

[Improvements]
- The Snowflake engine now consults the `connections.warehousename`,
Expand Down
2 changes: 1 addition & 1 deletion lib/App/Sqitch.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ our $VERSION = '0.9999';
BEGIN {
# Force Locale::TextDomain to encode in UTF-8 and to decode all messages.
$ENV{OUTPUT_CHARSET} = 'UTF-8';
bind_textdomain_filter 'App-Sqitch' => \&Encode::decode_utf8;
bind_textdomain_filter 'App-Sqitch' => \&Encode::decode_utf8, Encode::FB_DEFAULT;
}

# Okay to load Sqitch classes now that types are created.
Expand Down
5 changes: 2 additions & 3 deletions lib/App/Sqitch/Command/upgrade.pm
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,15 @@ sub execute {

my $engine = $target->engine;


if ($engine->needs_upgrade) {
$self->info( __x(
$self->info(__x(
'Upgrading registry {registry} to version {version}',
registry => $engine->registry_destination,
version => $engine->registry_release,
));
$engine->upgrade_registry;
} else {
$self->info( __x(
$self->info(__x(
'Registry {registry} is up-to-date at version {version}',
registry => $engine->registry_destination,
version => $engine->registry_release,
Expand Down

0 comments on commit 4cfd1dc

Please sign in to comment.