Skip to content

Commit 45520b8

Browse files
committed
Merge branch 'develop' for v1.1.0.
2 parents 21fd119 + a01b197 commit 45520b8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1867
-631
lines changed

.travis.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: perl
22
stage: 🐪 Perl
33
perl:
4+
- "5.30"
45
- "5.28"
56
- "5.26"
67
- "5.24"
@@ -27,6 +28,8 @@ jobs:
2728
- cinst -y strawberryperl
2829
- export "PATH=/c/Strawberry/perl/site/bin:/c/Strawberry/perl/bin:/c/Strawberry/c/bin:$PATH"
2930
install:
31+
# Last release doesn't depend on Test::MockObject::Extends
32+
- cpanm --no-interactive --no-man-pages --notest Test::MockObject::Extends
3033
# Can't use dzil to make a dist on windows, so depend on the previous
3134
# release for dependencies.
3235
- cpanm --no-interactive --no-man-pages --notest --installdeps App::Sqitch
@@ -35,7 +38,7 @@ jobs:
3538
- ./dev/prove -lr t
3639

3740
- stage: 📈 Coverage
38-
if: branch = develop
41+
if: branch = master OR branch =~ /(?i:cover)/
3942
services: docker
4043
env: COVERAGE=1
4144
before_install:
@@ -61,7 +64,7 @@ jobs:
6164

6265
- &postgres
6366
stage: 🐘 Postgres
64-
if: branch = develop
67+
if: branch = master OR branch =~ /(?i:pgsql|postgre(?i:sql)?)/
6568
env: POSTGRES=11
6669
before_install:
6770
- source dev/linux-postgres
@@ -90,7 +93,7 @@ jobs:
9093
# https://sqlite.org/chronology.html
9194
- &sqlite
9295
stage: 💡 SQLite
93-
if: branch = develop
96+
if: branch = master OR branch =~ /(?i:sqlite)/
9497
env: SQLITE=3.26.0
9598
before_install:
9699
- source dev/linux-sqlite
@@ -140,7 +143,7 @@ jobs:
140143
# https://hub.docker.com/_/mariadb
141144
- &mysql
142145
stage: 🐬 MySQL
143-
if: branch = develop
146+
if: branch = master OR branch =~ /(?i:mysql)/
144147
services: docker
145148
env: MYSQL=mysql:8.0
146149
before_install:
@@ -170,7 +173,7 @@ jobs:
170173
# https://hub.docker.com/r/cjonesy/docker-vertica/tags
171174
- &vertica
172175
stage: 🔺 Vertica
173-
if: branch = develop
176+
if: branch = master OR branch =~ /(?i:vertica)/
174177
env: VERTICA=9.1.1-0
175178
before_install:
176179
- source dev/linux-vertica
@@ -189,7 +192,7 @@ jobs:
189192
# https://hub.docker.com/r/exasol/docker-db/tags
190193
- &exasol
191194
stage: ☀️ Exasol
192-
if: branch = develop
195+
if: branch = master OR branch =~ /(?i:exasol)/
193196
env: EXASOL=6.1.1-d1
194197
before_install:
195198
- source dev/linux-exasol
@@ -202,7 +205,7 @@ jobs:
202205
# https://hub.docker.com/r/jacobalberty/firebird/tags
203206
- &firebird
204207
stage: 🔥 Firebird
205-
if: branch = develop
208+
if: branch = master OR branch =~ /(?i:firebird)/
206209
env: FIREBIRD=3.0
207210
before_install:
208211
- source dev/linux-firebird
@@ -240,6 +243,5 @@ jobs:
240243

241244
fast_finish: true
242245
allow_failures:
243-
- env: FIREBIRD=2.5-ss # https://github.com/jacobalberty/firebird-docker/issues/33
244246
- stage: ❄️ Snowflake
245247
- stage: 🔮 Oracle

Changes

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

3+
1.1.0 2020-05-17T16:20:07Z
4+
- Fixed Perl Pod errors, thanks to a pull request from Mohammad S Anwar
5+
(#470).
6+
- Fixed test failures when running with the localization set to German
7+
or Italian. Thanks to Slaven Rezić for the report (#472).
8+
- Fixed an issue when the full name of the current user is not set, so
9+
that it properly falls back on the username. Thanks to Slaven Rezić and
10+
Matthieu Foucault for the report and testing various fixes (#473).
11+
- Eliminated an error when using the `-t` option to specify a target, due
12+
to a missing dependency declaration in the Target class. Thanks to
13+
Clinton Adams for the fix (#509)!
14+
- Updated the IPC::System::Simple Win32 workaround added in 0.9999 to
15+
properly support released versions of IPC::System::Simple. This fixes
16+
errors running the database command-line clients on Windows (#503).
17+
- Sqitch now only passes the `--password` option to the MySQL client if
18+
it was not read from the `.my.cnf` file, as it's more secure to let
19+
the client use `.my.cnf`, and it eliminates a warning from recent
20+
versions of the client. Thanks to Kiel R Stirling for the fix (#484)!
21+
- Added a note to the tutorials to skip setting the `engine.$engine.client`
22+
config when using the Docker image.
23+
- Added the new `check` command, which compares the SHA1 hashes of the
24+
deploy scripts to the database, and reports if any have been modified
25+
since they were deployed. Thanks to Matthieu Foucault for the pull
26+
request and diligent work on this feature (#477)!
27+
- Added the `--modified` option to the `rebase` and `revert` commands, to
28+
revert to the earliest change with a modified deploy script. Handy for
29+
rapid rebasing during iterative development cycles. Thanks to Matthieu
30+
Foucault for this feature (#477)!
31+
- Fixed an issue where the Snowflake engine would complain about not
32+
finding the account name even for commands that don't need them, such
33+
as `init`. Thanks to Stack Overflow user vbp13 for the report (#502).
34+
335
1.0.0 2019-06-04T12:56:22Z
436
- Fixed test failure due to a hard-coded system error that may be
537
localized on non-en-US hosts. Thanks to Slaven Rezić for the catch

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2012-2018 iovation, Inc.
3+
Copyright (c) 2012-2020 iovation, Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
App/Sqitch version 0.9999
1+
App/Sqitch version v1.1.0
22
=========================
33

44
[![CPAN version](https://badge.fury.io/pl/App-Sqitch.svg)](https://badge.fury.io/pl/App-Sqitch)
@@ -139,7 +139,7 @@ Linux distributions and Windows, see the
139139
Licence
140140
-------
141141

142-
Copyright © 2012-2018 iovation Inc.
142+
Copyright © 2012-2020 iovation Inc.
143143

144144
Permission is hereby granted, free of charge, to any person obtaining a copy
145145
of this software and associated documentation files (the "Software"), to deal

dev/linux-firebird

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ docker run --rm -d -e ISC_PASSWORD=nix -e FIREBIRD_DATABASE=sqitchtest.db -p 305
66
sudo add-apt-repository -y ppa:mapopa/firebird3.0
77
sudo apt-get update -qq
88
sudo apt-get install -qq firebird-dev firebird3.0-utils
9+
export FIREBIRD_HOME=/usr
910
export FIREBIRD_URI=db:firebird://sysdba:nix@localhost//firebird/data/sqitchtest.db

dist.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = App-Sqitch
22
license = MIT
33
copyright_holder = "iovation Inc."
4-
version = v1.0.0
4+
version = v1.1.0
55

66
[GatherDir]
77
[PruneCruft]
@@ -63,6 +63,7 @@ Template = 0
6363
Test::Pod = 1.41
6464
Test::Pod::Coverage = 1.08
6565
Test::Spelling = 0
66+
Test::MockObject::Extends = 1.20180705
6667
DBD::SQLite = 1.37
6768
DBD::Pg = 2.0
6869
DBD::mysql = 4.018

dist/sqitch.spec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: sqitch
2-
Version: 1.0.0
2+
Version: 1.1.0
33
Release: 1%{?dist}
44
Summary: Sensible database change management
55
License: MIT
@@ -67,6 +67,7 @@ BuildRequires: perl(Test::Exception)
6767
BuildRequires: perl(Test::File)
6868
BuildRequires: perl(Test::File::Contents) >= 0.20
6969
BuildRequires: perl(Test::MockModule) >= 0.17
70+
BuildRequires: perl(Test::MockObject::Extends) >= 1.20180705
7071
BuildRequires: perl(Test::More) >= 0.94
7172
BuildRequires: perl(Test::NoWarnings) >= 0.083
7273
BuildRequires: perl(Test::Warn)
@@ -305,6 +306,10 @@ also be installed.
305306
# No additional files required.
306307

307308
%changelog
309+
* Sun May 17 2020 David E. Wheeler <[email protected]> 1.1.0-1
310+
- Upgrade to v1.1.0.
311+
- Added the Test::MockObject::Extends build requirement.
312+
308313
* Tue Jun 4 2019 David E. Wheeler <[email protected]> 1.0.0-1
309314
- Upgrade to v1.0.0.
310315
- Config::GitLike now requires v1.15.

lib/App/Sqitch.pm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ has user_name => (
9494
}
9595
require User::pwent;
9696
my $name = User::pwent::getpwnam($sysname) || return $sysname;
97+
$name = ($name->gecos)[0] || return $sysname;
9798
require Encode::Locale;
98-
return Encode::decode( locale => ($name->gecos)[0] );
99+
return Encode::decode( locale => $name );
99100
};
100101
}
101102
);
@@ -331,7 +332,7 @@ sub run {
331332
( my $msg = shift ) =~ s/\s+at\s+.+/\n/ms;
332333
die $msg;
333334
};
334-
if (ISWIN && IPC::System::Simple->VERSION <= 1.25) {
335+
if (ISWIN && IPC::System::Simple->VERSION < 1.28) {
335336
runx ( shift, $self->quote_shell(@_) );
336337
return $self;
337338
}
@@ -904,7 +905,7 @@ David E. Wheeler <[email protected]>
904905
905906
=head1 License
906907
907-
Copyright (c) 2012-2018 iovation Inc.
908+
Copyright (c) 2012-2020 iovation Inc.
908909
909910
Permission is hereby granted, free of charge, to any person obtaining a copy
910911
of this software and associated documentation files (the "Software"), to deal

lib/App/Sqitch/Command.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ David E. Wheeler <[email protected]>
751751
752752
=head1 License
753753
754-
Copyright (c) 2012-2018 iovation Inc.
754+
Copyright (c) 2012-2020 iovation Inc.
755755
756756
Permission is hereby granted, free of charge, to any person obtaining a copy
757757
of this software and associated documentation files (the "Software"), to deal

lib/App/Sqitch/Command/add.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ David E. Wheeler <[email protected]>
542542
543543
=head1 License
544544
545-
Copyright (c) 2012-2018 iovation Inc.
545+
Copyright (c) 2012-2020 iovation Inc.
546546
547547
Permission is hereby granted, free of charge, to any person obtaining a copy
548548
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)