Merge develop for v1.4.1

.github/workflows/cockroach.yml

@@ -18,13 +18,13 @@ jobs:
     steps:
       - name: Start CockroachDB
         run: docker run -d -p 26257:26257 cockroachdb/cockroach:latest-v${{ matrix.version }} start-single-node --insecure
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}

.github/workflows/coverage.yml

@@ -49,13 +49,13 @@ jobs:
         run: rm -rf /opt/hostedtoolcache
       - name: Start CockroachDB
         run: docker run -d -p 26257:26257 cockroachdb/cockroach:latest start-single-node --insecure
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}

.github/workflows/exasol.yml

@@ -20,15 +20,15 @@ jobs:
         ports: [ 8563 ]
         options: --privileged
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Clients
         run: .github/ubuntu/exasol.sh
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}

.github/workflows/firebird.yml

@@ -29,15 +29,15 @@ jobs:
           ISC_PASSWORD: nix
           FIREBIRD_DATABASE: sqitchtest.db
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Clients
         run: .github/ubuntu/firebird.sh
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}

.github/workflows/mysql.yml

@@ -39,15 +39,15 @@ jobs:
         ports: [ 3306 ]
         options: --health-cmd="healthcheck.sh --innodb_initialized || mysqladmin ping --protocol=tcp" --health-interval=5s --health-timeout=2s --health-retries=3
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Clients
         run: .github/ubuntu/mysql.sh
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}

.github/workflows/oracle.yml

@@ -40,15 +40,15 @@ jobs:
           --health-timeout 10s
           --health-retries 10
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Clients
         run: .github/ubuntu/oracle.sh
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}

.github/workflows/os.yml

@@ -12,26 +12,29 @@ jobs:
     strategy:
       matrix:
         include:
-          - { icon: 🐧, os: ubuntu,  name: Linux }
-          - { icon: 🍎, os: macos,   name: macOS }
-          - { icon: 🪟, os: windows, name: Windows }
+          - { icon: 🐧, on: ubuntu,  name: Linux }
+          - { icon: 🍎, on: macos,   name: macOS }
+          - { icon: 🪟, on: windows, name: Windows }
     name: ${{ matrix.icon }} ${{ matrix.name }}
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.on }}-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - run: perl -V
+      - if: runner.os == 'Linux'
+        name: Install Apt Packages
+        run: sudo apt-get install -qq aspell-en language-pack-fr language-pack-en language-pack-de language-pack-it
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      # Remove Locale::TextDomain if https://github.com/gflohr/libintl-perl/issues/7 fixed and released.
-      - if: ${{ matrix.os == 'windows' }}
-        run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Encode Win32::Console::ANSI Win32API::Net Win32::Locale Win32::ShellQuote DateTime::TimeZone::Local::Win32 Locale::[email protected]
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends ExtUtils::MakeMaker List::MoreUtils::XS
+      - if: runner.os == 'Windows'
+        run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Encode Win32::Console::ANSI Win32API::Net Win32::Locale Win32::ShellQuote DateTime::TimeZone::Local::Win32
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Test::Spelling Test::Pod Test::Pod::Coverage
       - name: prove

.github/workflows/perl.yml

@@ -19,20 +19,22 @@ jobs:
     name: 🧅 Perl ${{ matrix.perl }} on ${{ matrix.os[0] }} ${{ matrix.os[1] }}
     runs-on: ${{ matrix.os[1] }}-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: "${{ matrix.perl }}" }
       - run: perl -V
+      - if: runner.os == 'Linux'
+        name: Install Apt Packages
+        run: sudo apt-get install -qq language-pack-fr language-pack-en language-pack-de language-pack-it
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      # Remove Locale::TextDomain if https://github.com/gflohr/libintl-perl/issues/7 fixed and released.
-      - if: ${{ matrix.os[1] == 'windows' }}
-        run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Encode Win32::Console::ANSI Win32API::Net Win32::Locale Win32::ShellQuote DateTime::TimeZone::Local::Win32 Locale::[email protected]
+      - if: runner.os == 'Windows'
+        run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Encode Win32::Console::ANSI Win32API::Net Win32::Locale Win32::ShellQuote DateTime::TimeZone::Local::Win32
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Test::Spelling Test::Pod Test::Pod::Coverage
       - name: prove

.github/workflows/pg.yml

@@ -15,13 +15,13 @@ jobs:
     name: 🐘 Postgres ${{ matrix.pg }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}

.github/workflows/release.yml

@@ -10,13 +10,13 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
     - name: Check out the repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Setup Perl
       id: perl
       uses: shogo82148/actions-setup-perl@v1
       with: { perl-version: latest }
     - name: Cache CPAN Modules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: local
         key: perl-${{ steps.perl.outputs.perl-hash }}

.github/workflows/snowflake.yml

@@ -11,15 +11,15 @@ jobs:
     name: ❄️ Snowflake
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Clients
         run: .github/ubuntu/snowflake.sh
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}

.github/workflows/sqlite.yml

@@ -16,13 +16,13 @@ jobs:
     name: 💡 SQLite ${{ matrix.sqlite }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}

.github/workflows/vertica.yml

@@ -27,15 +27,15 @@ jobs:
         image: ${{ matrix.image }}:${{ matrix.version }}
         ports: [ 5433 ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Clients
         run: .github/ubuntu/vertica.sh
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}

.github/workflows/yugabyte.yml

@@ -34,13 +34,13 @@ jobs:
         uses: jameshartig/yugabyte-db-action@master
         with:
           yb_image_tag: "${{ matrix.tag }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Perl
         id: perl
         uses: shogo82148/actions-setup-perl@v1
         with: { perl-version: latest }
       - name: Cache CPAN Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}

.gitignore

@@ -13,7 +13,8 @@
 /_rpmbuild
 /target
 .build/
-*.mo
 .al
 /latest_changes.md
 /local/
+/LocaleData/
+/lib/LocaleData/

Changes

@@ -1,5 +1,38 @@
 Revision history for Perl extension App::Sqitch
 
+1.4.1  2024-02-04T16:35:32Z
+     - Removed the quoting of the role and warehouse identifiers that was
+       added to the Snowflake engine in v1.4.0. Turns out Snowflake allows a
+       warehouse to be specified in a different database, in which case dots
+       are valid in the name and should not be quoted! So users must properly
+       quote when necessary, but added notes to `sqitchtutorial-snowflake.pod`
+       on the need to use URI escapes for special characters. Thanks to
+       Patrick Sabo for the find, and to @marc-marketparts for validating
+       that URI encoding works.
+     - Added notes on URL encoding database URLs to `sqitch-target.pod`, the
+       main reference for database URLs in the Sqitch documentation.
+     - Fixed the output of the list of changes to be deployed or reverted to
+       actually require `--verbose` twice, as described in the v1.4.0 changes,
+       and not just once. Thanks to Erik Wienhold for the PR (#785)!
+     - Removed the duplicate change name from the output of the list of
+       changes to be deployed or reverted with `-VV`. Thanks to Erik Wienhold
+       for the PR (#787)!
+     - Fixed invalid template resolution when adding a singe change to
+       multiple engines at once. Thanks to Christian Riedel for the detailed
+       bug report (#795)!
+     - Fixed Oracle and Firebird test failures due to incorrect use of `chmod`.
+       Thanks to Slaven Rezić for the report and the fix (#807)!
+     - Tests now require Test::Warn 0.31 or later, as newline handling issues
+       cause test failures in earlier versions. Thanks to Slaven Rezić for the
+       test reports and for identifying the issue.
+     - Updated the locale configuration to fix issues in more recent versions
+       of Perl, and added tests to ensure that the sqitch CLI executes and
+       properly emits localized messages (except on Windows, where the language
+       codes are incompatible).
+     - Fixed an issue where the MySQL engine failed to recognize the MariaDB
+       `mysql` client installed by Homebrew on macOS. Thanks to Carlos Ramos
+       for the bug report and PR (#791)!
+
 1.4.0 2023-08-01T23:37:30Z
      - Fixed Snowflake warehouse and role setup to properly quote identifiers
        unless they're valid unquoted identifiers or already quoted. Thanks to

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 iovation, Inc., David E. Wheeler
+Copyright (c) 2012-2024 iovation, Inc., David E. Wheeler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -1,4 +1,4 @@
-App/Sqitch version v1.4.0
+App/Sqitch version v1.4.1
 =========================
 
 | Release           | Coverage          | Database                              ||
@@ -138,7 +138,7 @@ Linux distributions and Windows, see the [Installation documentation].
 License
 -------
 
-Copyright (c) 2012-2023 iovation Inc., David E. Wheeler
+Copyright (c) 2012-2024 iovation Inc., David E. Wheeler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

bin/sqitch

@@ -1,15 +1,6 @@
 #!perl -w -CAS
 
 # VERSION
-use POSIX qw(setlocale);
-BEGIN {
-    if ($^O eq 'MSWin32') {
-        require Win32::Locale;
-        setlocale POSIX::LC_ALL, Win32::Locale::get_locale();
-    } else {
-        setlocale POSIX::LC_ALL, '';
-    }
-}
+use locale;
 use App::Sqitch;
-
 exit App::Sqitch->go;

dist.ini

@@ -1,8 +1,8 @@
 name = App-Sqitch
 license = MIT
 copyright_holder = "iovation Inc., David E. Wheeler"
-copyright_year = 2012-2023
-version = v1.4.0
+copyright_year = 2012-2024
+version = v1.4.1
 
 [GatherDir]
 exclude_filename = dist/cpanfile

dist/cpanfile

@@ -1,4 +1,4 @@
-# This file is generated by Dist::Zilla::Plugin::CPANFile v6.030
+# This file is generated by Dist::Zilla::Plugin::CPANFile v6.031
 # Do not edit this file directly. To change prereqs, edit the `dist.ini` file.
 
 requires "Algorithm::Backoff::Exponential" => "0.006";
@@ -54,6 +54,7 @@ requires "URI::QueryParam" => "0";
 requires "URI::db" => "0.20";
 requires "User::pwent" => "0";
 requires "constant" => "0";
+requires "locale" => "0";
 requires "namespace::autoclean" => "0.16";
 requires "overload" => "0";
 requires "parent" => "0";
@@ -104,7 +105,7 @@ on 'test' => sub {
   requires "Test::MockObject::Extends" => "0";
   requires "Test::More" => "0.94";
   requires "Test::NoWarnings" => "0.083";
-  requires "Test::Warn" => "0";
+  requires "Test::Warn" => "0.31";
   requires "base" => "0";
   requires "lib" => "0";
 };