Skip to content

Commit d2fb026

Browse files
committed
Increment to and timestamp v1.6.0
Update the translation dictionaries and remove the inline email address from `Sqitch.pm` that `gettext` now warns about.
1 parent c0c25f7 commit d2fb026

11 files changed

Lines changed: 234 additions & 189 deletions

File tree

Changes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Revision history for Perl extension App::Sqitch
22

3-
1.5.2 Not yet Released
3+
1.6.0 2025-10-06T13:00:00Z
44
- Refactored the parsing of arrays for engines that don't support arrays
55
(e.g., SQLite & Firebird). A new method in DBIEngine, `_parse_array`,
66
replaces inline uses of `split`. This allows the tests to more
@@ -9,7 +9,7 @@ Revision history for Perl extension App::Sqitch
99
- Added support for ClickHouse. It relies on the `clickhouse` (or
1010
`clickhouse-client`) CLI and ODBC driver. Like MySQL, it uses a
1111
database for the registry schema, where the tables use the `MergeTree`
12-
engine, and supports client certificate authentication and the
12+
engine. It supports client certificate authentication and the
1313
ClickHouse client configuration file format.
1414

1515
1.5.2 2025-04-29T15:13:35Z

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
App/Sqitch version v1.5.3-dev
1+
App/Sqitch version v1.6.0
22
=========================
33

44
| Release | Coverage | Database |||

dist.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name = App-Sqitch
22
license = MIT
33
copyright_holder = "David E. Wheeler, iovation Inc."
44
copyright_year = 2012-2025
5-
version = v1.5.3
5+
version = v1.6.0
66

77
[GatherDir]
88
exclude_filename = dist/cpanfile

dist/sqitch.spec

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: sqitch
2-
Version: 1.5.3-dev
2+
Version: 1.6.0
33
Release: 1%{?dist}
44
Summary: Sensible database change management
55
License: MIT
@@ -308,7 +308,7 @@ also be installed.
308308
%files snowflake
309309
# No additional files required.
310310

311-
%package snowflake
311+
%package clickhouse
312312
Summary: Sensible database change management for ClickHouse
313313
Group: Development/Libraries
314314
Requires: sqitch >= %{version}
@@ -330,6 +330,11 @@ driver also be installed.
330330
# No additional files required.
331331

332332
%changelog
333+
* Mon Oct 6 2025 David E. Wheeler <david@justatheory.com> 1.6.0-1
334+
- Upgrade to v1.1.6.0.
335+
- Add sqitch-clickhouse package.
336+
- Add XML::Tiny and YAML::Tiny dependencies to that package.
337+
333338
* Mon Apr 29 2025 David E. Wheeler <david@justatheory.com> 1.5.2-1
334339
- Upgrade to v1.5.2.
335340

@@ -347,15 +352,15 @@ driver also be installed.
347352

348353
* Mon Aug 1 2023 David E. Wheeler <david@justatheory.com> 1.4.0-1
349354
- Upgrade to v1.4.0.
350-
- Incrmented minimal DBI to 1.631.
355+
- Increment minimal DBI to 1.631.
351356

352357
* Sat Oct 1 2022 David E. Wheeler <david@justatheory.com> 1.3.1-1
353358
- Upgrade to v1.3.1.
354359

355360
* Fri Aug 12 2022 David E. Wheeler <david@justatheory.com> 1.3.0-1
356361
- Add Test::Exit build requirement.
357362
- Upgrade URI::db to v0.20.
358-
- Increased minimal MySQL version to 5.1.
363+
- Increase minimal MySQL version to 5.1.
359364

360365
* Sun Dec 5 2021 David E. Wheeler <david@justatheory.com> 1.2.1-1
361366
- Upgrade to v1.2.1.

inc/Menlo/Sqitch.pm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ Runtime-only dependencies
205205
Class-Singleton
206206
Class-XSAccessor
207207
Clone-Choose
208+
Clone-PP
208209
Config-GitLike
209210
DBD-Firebird
210211
DBD-MariaDB
@@ -257,6 +258,8 @@ Runtime-only dependencies
257258
Type-Tiny-XS
258259
URI-Nested
259260
URI-db
261+
XML-Tiny
262+
YAML-Tiny
260263
libintl-perl
261264
namespace-autoclean
262265
namespace-clean

lib/App/Sqitch.pm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ has user_email => (
112112
|| $self->config->get( key => 'user.email' )
113113
|| $ENV{ SQITCH_ORIG_EMAIL }
114114
|| do {
115-
my $sysname = $self->sysuser || hurl user => __(
116-
'Cannot infer your email address; run sqitch config --user user.email you@host.com'
115+
my $sysname = $self->sysuser || hurl user => __x(
116+
'Cannot infer your email address; run sqitch config --user user.email {email}',
117+
email => 'you@example.com',
117118
);
118119
require Sys::Hostname;
119120
"$sysname@" . Sys::Hostname::hostname();

po/App-Sqitch.pot

Lines changed: 55 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
# Sqitch Localization Messages
2-
# Copyright (c) 2012-2025 "iovation Inc., David E. Wheeler"
2+
# Copyright (c) 2012-2025 "David E. Wheeler, iovation Inc."
33
# This file is distributed under the same license as the App-Sqitch package.
44
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
55
#
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: App-Sqitch v1.5.3-dev\n"
9+
"Project-Id-Version: App-Sqitch v1.6.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2025-04-27 19:42-0400\n"
12-
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11+
"POT-Creation-Date: 2025-09-30 19:43-0400\n"
12+
"PO-Revision-Date: 2025-09-30 19:43-0400\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
1515
"Language: \n"
1616
"MIME-Version: 1.0\n"
17-
"Content-Type: text/plain; charset=CHARSET\n"
17+
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020

@@ -23,79 +23,79 @@ msgid "Cannot find your name; run sqitch config --user user.name \"YOUR NAME\""
2323
msgstr ""
2424

2525
#: lib/App/Sqitch.pm:116
26+
#, perl-brace-format
2627
msgid ""
27-
"Cannot infer your email address; run sqitch config --user user.email "
28-
"you@host.com"
28+
"Cannot infer your email address; run sqitch config --user user.email {email}"
2929
msgstr ""
3030

31-
#: lib/App/Sqitch.pm:280
31+
#: lib/App/Sqitch.pm:281
3232
#, perl-brace-format
3333
msgid "Cannot change to directory {directory}: {error}"
3434
msgstr ""
3535

36-
#: lib/App/Sqitch.pm:314 lib/App/Sqitch/Command.pm:114
36+
#: lib/App/Sqitch.pm:315 lib/App/Sqitch/Command.pm:115
3737
#, perl-brace-format
3838
msgid "\"{command}\" is not a valid command"
3939
msgstr ""
4040

41-
#: lib/App/Sqitch.pm:408
41+
#: lib/App/Sqitch.pm:409
4242
msgid ""
4343
"Sqitch seems to be unattended and there is no default value for this question"
4444
msgstr ""
4545

46-
#: lib/App/Sqitch.pm:427
46+
#: lib/App/Sqitch.pm:428
4747
msgctxt "Confirm prompt answer yes"
4848
msgid "Yes"
4949
msgstr ""
5050

51-
#: lib/App/Sqitch.pm:428
51+
#: lib/App/Sqitch.pm:429
5252
msgctxt "Confirm prompt answer no"
5353
msgid "No"
5454
msgstr ""
5555

56-
#: lib/App/Sqitch.pm:437
56+
#: lib/App/Sqitch.pm:438
5757
msgid "Please answer \"y\" or \"n\"."
5858
msgstr ""
5959

60-
#: lib/App/Sqitch.pm:440
60+
#: lib/App/Sqitch.pm:441
6161
msgid "No valid answer after 3 attempts; aborting"
6262
msgstr ""
6363

64-
#: lib/App/Sqitch.pm:461 lib/App/Sqitch.pm:468
64+
#: lib/App/Sqitch.pm:462 lib/App/Sqitch.pm:469
6565
#, perl-brace-format
6666
msgid "Cannot exec {command}: {error}"
6767
msgstr ""
6868

69-
#: lib/App/Sqitch.pm:484
69+
#: lib/App/Sqitch.pm:485
7070
#, perl-brace-format
7171
msgid "Error closing pipe to {command}: {error}"
7272
msgstr ""
7373

74-
#: lib/App/Sqitch.pm:488 lib/App/Sqitch/Engine/oracle.pm:765
74+
#: lib/App/Sqitch.pm:489 lib/App/Sqitch/Engine/oracle.pm:765
7575
#, perl-brace-format
7676
msgid "{command} unexpectedly returned exit value {exitval}"
7777
msgstr ""
7878

79-
#: lib/App/Sqitch/Command.pm:284
79+
#: lib/App/Sqitch/Command.pm:285
8080
#, perl-brace-format
8181
msgid "Unknown argument \"{arg}\""
8282
msgid_plural "Unknown arguments: {arg}"
8383
msgstr[0] ""
8484
msgstr[1] ""
8585

86-
#: lib/App/Sqitch/Command.pm:296
86+
#: lib/App/Sqitch/Command.pm:297
8787
msgid "Cannot specify both --all and engine, target, or plan arugments"
8888
msgstr ""
8989

90-
#: lib/App/Sqitch/Command.pm:316 lib/App/Sqitch/Command/add.pm:421
90+
#: lib/App/Sqitch/Command.pm:317 lib/App/Sqitch/Command/add.pm:421
9191
#: lib/App/Sqitch/Command/init.pm:203
9292
#: lib/App/Sqitch/Role/TargetConfigCommand.pm:250
9393
#: lib/App/Sqitch/Role/TargetConfigCommand.pm:337
9494
#, perl-brace-format
9595
msgid "Created {file}"
9696
msgstr ""
9797

98-
#: lib/App/Sqitch/Command.pm:323 lib/App/Sqitch/Role/TargetConfigCommand.pm:256
98+
#: lib/App/Sqitch/Command.pm:324 lib/App/Sqitch/Role/TargetConfigCommand.pm:256
9999
#, perl-brace-format
100100
msgid "Error creating {path}: {error}"
101101
msgstr ""
@@ -648,7 +648,7 @@ msgstr ""
648648
msgid "Too many changes specified; verifying from \"{from}\" to \"{to}\""
649649
msgstr ""
650650

651-
#: lib/App/Sqitch/Config.pm:25
651+
#: lib/App/Sqitch/Config.pm:29
652652
msgid "Could not determine home directory"
653653
msgstr ""
654654

@@ -1003,6 +1003,31 @@ msgstr[1] ""
10031003
msgid "Check successful"
10041004
msgstr ""
10051005

1006+
#: lib/App/Sqitch/Engine/clickhouse.pm:70
1007+
#, perl-brace-format
1008+
msgid ""
1009+
"Client config {cfg_key} value \"{cfg_val}\" conflicts with ODBC param "
1010+
"{odb_param} value \"{odbc_val}\""
1011+
msgstr ""
1012+
1013+
#: lib/App/Sqitch/Engine/clickhouse.pm:270 lib/App/Sqitch/Engine/mysql.pm:145
1014+
#, perl-brace-format
1015+
msgid "Database name missing in URI \"{uri}\""
1016+
msgstr ""
1017+
1018+
#: lib/App/Sqitch/Engine/clickhouse.pm:348
1019+
#: lib/App/Sqitch/Engine/firebird.pm:935
1020+
#, perl-brace-format
1021+
msgid ""
1022+
"Unable to locate {cli} client; set \"engine.{eng}.client\" via sqitch config"
1023+
msgstr ""
1024+
1025+
#: lib/App/Sqitch/Engine/clickhouse.pm:414
1026+
#: lib/App/Sqitch/Engine/firebird.pm:205 lib/App/Sqitch/Engine/sqlite.pm:153
1027+
#, perl-brace-format
1028+
msgid "Sqitch database {database} already initialized"
1029+
msgstr ""
1030+
10061031
#: lib/App/Sqitch/Engine/exasol.pm:317 lib/App/Sqitch/Engine/oracle.pm:456
10071032
msgid "Sqitch already initialized"
10081033
msgstr ""
@@ -1027,11 +1052,6 @@ msgstr ""
10271052
msgid "{command} unexpectedly failed; exit value = {exitval}"
10281053
msgstr ""
10291054

1030-
#: lib/App/Sqitch/Engine/firebird.pm:205 lib/App/Sqitch/Engine/sqlite.pm:153
1031-
#, perl-brace-format
1032-
msgid "Sqitch database {database} already initialized"
1033-
msgstr ""
1034-
10351055
#: lib/App/Sqitch/Engine/firebird.pm:224
10361056
#, perl-brace-format
10371057
msgid "Cannot create database {database}: {error}"
@@ -1042,39 +1062,28 @@ msgstr ""
10421062
msgid "Database name missing in URI {uri}"
10431063
msgstr ""
10441064

1045-
#: lib/App/Sqitch/Engine/firebird.pm:836 lib/App/Sqitch/Role/DBIEngine.pm:529
1065+
#: lib/App/Sqitch/Engine/firebird.pm:839 lib/App/Sqitch/Role/DBIEngine.pm:536
10461066
#, perl-brace-format
10471067
msgid "Cannot log change \"{change}\": The deploy script is not unique"
10481068
msgstr ""
10491069

1050-
#: lib/App/Sqitch/Engine/firebird.pm:900 lib/App/Sqitch/Engine/firebird.pm:918
1051-
#: lib/App/Sqitch/Engine/firebird.pm:929
1070+
#: lib/App/Sqitch/Engine/firebird.pm:903 lib/App/Sqitch/Engine/firebird.pm:921
1071+
#: lib/App/Sqitch/Engine/firebird.pm:932
10521072
#, perl-brace-format
10531073
msgid "Cannot dup STDERR: {error}"
10541074
msgstr ""
10551075

1056-
#: lib/App/Sqitch/Engine/firebird.pm:904
1076+
#: lib/App/Sqitch/Engine/firebird.pm:907
10571077
#, perl-brace-format
10581078
msgid "Cannot reirect STDERR: {error}"
10591079
msgstr ""
10601080

1061-
#: lib/App/Sqitch/Engine/firebird.pm:932
1062-
msgid ""
1063-
"Unable to locate Firebird ISQL; set \"engine.firebird.client\" via sqitch "
1064-
"config"
1065-
msgstr ""
1066-
10671081
#: lib/App/Sqitch/Engine/mysql.pm:113
10681082
#, perl-brace-format
10691083
msgid ""
10701084
"Sqitch requires {rdbms} {want_version} or higher; this is {have_version}"
10711085
msgstr ""
10721086

1073-
#: lib/App/Sqitch/Engine/mysql.pm:145
1074-
#, perl-brace-format
1075-
msgid "Database name missing in URI \"{uri}\""
1076-
msgstr ""
1077-
10781087
#: lib/App/Sqitch/Engine/mysql.pm:518
10791088
msgid "Insufficient permissions to create the checkit() function; skipping."
10801089
msgstr ""
@@ -1439,26 +1448,26 @@ msgid ""
14391448
" Use --chdir instead."
14401449
msgstr ""
14411450

1442-
#: lib/App/Sqitch/Role/DBIEngine.pm:367
1451+
#: lib/App/Sqitch/Role/DBIEngine.pm:374
14431452
#, perl-brace-format
14441453
msgid ""
14451454
"Cannot register \"{project}\" with URI {uri}: already exists with NULL URI"
14461455
msgstr ""
14471456

1448-
#: lib/App/Sqitch/Role/DBIEngine.pm:373
1457+
#: lib/App/Sqitch/Role/DBIEngine.pm:380
14491458
#, perl-brace-format
14501459
msgid ""
14511460
"Cannot register \"{project}\" without URI: already exists with URI {uri}"
14521461
msgstr ""
14531462

1454-
#: lib/App/Sqitch/Role/DBIEngine.pm:379
1463+
#: lib/App/Sqitch/Role/DBIEngine.pm:386
14551464
#, perl-brace-format
14561465
msgid ""
14571466
"Cannot register \"{project}\" with URI {uri}: already exists with URI "
14581467
"{reg_uri}"
14591468
msgstr ""
14601469

1461-
#: lib/App/Sqitch/Role/DBIEngine.pm:397
1470+
#: lib/App/Sqitch/Role/DBIEngine.pm:404
14621471
#, perl-brace-format
14631472
msgid ""
14641473
"Cannot register \"{project}\" with URI {uri}: project \"{reg_proj}\" already "

0 commit comments

Comments
 (0)