Merge develop for v1.5.1

theory · theory · commit c2820669bc2f · 2025-03-16T12:58:21.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@
 /local/
 /LocaleData/
 /lib/LocaleData/
+.vscode/
diff --git a/Changes b/Changes
@@ -1,5 +1,12 @@
 Revision history for Perl extension App::Sqitch
 
+1.5.1  2025-03-16T26:55:17Z
+     - 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
        relative to their parent headers, which messed with the HTML output on
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-App/Sqitch version v1.5.0
+App/Sqitch version v1.5.1
 =========================
 
 | Release           | Coverage          | Database                              ||
diff --git a/dist.ini b/dist.ini
@@ -2,7 +2,7 @@ name = App-Sqitch
 license = MIT
 copyright_holder = "iovation Inc., David E. Wheeler"
 copyright_year = 2012-2025
-version = v1.5.0
+version = v1.5.1
 
 [GatherDir]
 exclude_filename = dist/cpanfile
diff --git a/dist/sqitch.spec b/dist/sqitch.spec
@@ -1,5 +1,5 @@
 Name:           sqitch
-Version:        1.5.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Sensible database change management
 License:        MIT
@@ -309,6 +309,9 @@ also be installed.
 # No additional files required.
 
 %changelog
+* Sun Mar 16 2025 David E. Wheeler <david@justatheory.com> 1.5.1-1
+- Upgrade to v1.5.1.
+
 * Tue Jan 7 2025 David E. Wheeler <david@justatheory.com> 1.5.0-1
 - Upgrade to v1.5.0.
 - Replace DBD::mysql with DBD::MariaDB.
diff --git a/inc/Menlo/Sqitch.pm b/inc/Menlo/Sqitch.pm
@@ -64,7 +64,7 @@ sub remove_build_dependencies {
 
 1;
 
-# List of distirbutions that might be installed but are not actually needed to
+# List of distributions that might be installed but are not actually needed to
 # run Sqitch. Used to track unneeded installs so they can be removed by
 # remove_build_dependencies().
 #
diff --git a/lib/App/Sqitch/Engine/mysql.pm b/lib/App/Sqitch/Engine/mysql.pm
@@ -65,7 +65,7 @@ sub _def_user { $_[0]->_mycnf->{user} || $_[0]->sqitch->sysuser }
 sub _def_pass { $ENV{MYSQL_PWD} || shift->_mycnf->{password} }
 
 sub _dsn {
-    (my $dsn = shift->uri->dbi_dsn) =~ s/\Adbi:mysql/dbi:MariaDB/;
+    (my $dsn = shift->registry_uri->dbi_dsn) =~ s/\Adbi:mysql/dbi:MariaDB/;
     return $dsn;
 }
 
diff --git a/po/App-Sqitch.pot b/po/App-Sqitch.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: App-Sqitch v1.5.0\n"
+"Project-Id-Version: App-Sqitch v1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-04 14:21-0500\n"
+"POT-Creation-Date: 2025-01-18 18:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/t/exasol.t b/t/exasol.t
@@ -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) {
diff --git a/t/firebird.t b/t/firebird.t
@@ -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 {
@@ -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;
     },
diff --git a/t/lib/DBIEngineTest.pm b/t/lib/DBIEngineTest.pm
@@ -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',
diff --git a/t/lib/TestConfig.pm b/t/lib/TestConfig.pm
@@ -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;
diff --git a/t/mysql.t b/t/mysql.t
@@ -62,7 +62,7 @@ my $sqitch_uri = $uri->clone;
 $sqitch_uri->dbname('sqitch');
 is $mysql->registry_uri, $sqitch_uri, 'registry_uri should be correct';
 is $mysql->uri, $uri, qq{uri should be "$uri"};
-is $mysql->_dsn, 'dbi:MariaDB:database=mydb', 'DSN should use MariaDB';
+is $mysql->_dsn, 'dbi:MariaDB:database=sqitch', 'DSN should use MariaDB';
 is $mysql->registry_destination, 'db:mysql:sqitch',
     'registry_destination should be the same as registry_uri';
 is $mysql->_lock_name, 'sqitch working on ' . $uri->dbname,
diff --git a/t/snowflake.t b/t/snowflake.t
@@ -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, {
diff --git a/xt/release.md b/xt/release.md
@@ -6,9 +6,9 @@ use the `$VERSION` and `$OLD_VERSION` environment variables for consistency. The
 assumption is that they're set to the old and new versions, respectively, e.g.,
 
 ``` sh
-export OLD_VERSION=1.4.1
-export VERSION=1.5.0
-export NEXT_VERSION=1.5.1
+export OLD_VERSION=1.5.0
+export VERSION=1.5.1
+export NEXT_VERSION=1.5.2
 ```
 
 Preparation

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-App/Sqitch version v1.5.0`
	`1`	`+App/Sqitch version v1.5.1`
`2`	`2`	`=========================`
`3`	`3`
`4`	`4`	`\| Release \| Coverage \| Database \|\|`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ sub remove_build_dependencies {`
`64`	`64`
`65`	`65`	`1;`
`66`	`66`
`67`		`-# List of distirbutions that might be installed but are not actually needed to`
	`67`	`+# List of distributions that might be installed but are not actually needed to`
`68`	`68`	`# run Sqitch. Used to track unneeded installs so they can be removed by`
`69`	`69`	`# remove_build_dependencies().`
`70`	`70`	`#`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ sub _def_user { $_[0]->_mycnf->{user} \|\| $_[0]->sqitch->sysuser }`
`65`	`65`	`sub _def_pass { $ENV{MYSQL_PWD} \|\| shift->_mycnf->{password} }`
`66`	`66`
`67`	`67`	`sub _dsn {`
`68`		`- (my $dsn = shift->uri->dbi_dsn) =~ s/\Adbi:mysql/dbi:MariaDB/;`
	`68`	`+ (my $dsn = shift->registry_uri->dbi_dsn) =~ s/\Adbi:mysql/dbi:MariaDB/;`
`69`	`69`	`return $dsn;`
`70`	`70`	`}`
`71`	`71`