Skip to content

Commit

Permalink
Merge branch 'develop' for v1.1.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
theory committed May 17, 2020
2 parents 21fd119 + a01b197 commit 45520b8
Show file tree
Hide file tree
Showing 95 changed files with 1,867 additions and 631 deletions.
18 changes: 10 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: perl
stage: 🐪 Perl
perl:
- "5.30"
- "5.28"
- "5.26"
- "5.24"
Expand All @@ -27,6 +28,8 @@ jobs:
- cinst -y strawberryperl
- export "PATH=/c/Strawberry/perl/site/bin:/c/Strawberry/perl/bin:/c/Strawberry/c/bin:$PATH"
install:
# Last release doesn't depend on Test::MockObject::Extends
- cpanm --no-interactive --no-man-pages --notest Test::MockObject::Extends
# Can't use dzil to make a dist on windows, so depend on the previous
# release for dependencies.
- cpanm --no-interactive --no-man-pages --notest --installdeps App::Sqitch
Expand All @@ -35,7 +38,7 @@ jobs:
- ./dev/prove -lr t

- stage: 📈 Coverage
if: branch = develop
if: branch = master OR branch =~ /(?i:cover)/
services: docker
env: COVERAGE=1
before_install:
Expand All @@ -61,7 +64,7 @@ jobs:

- &postgres
stage: 🐘 Postgres
if: branch = develop
if: branch = master OR branch =~ /(?i:pgsql|postgre(?i:sql)?)/
env: POSTGRES=11
before_install:
- source dev/linux-postgres
Expand Down Expand Up @@ -90,7 +93,7 @@ jobs:
# https://sqlite.org/chronology.html
- &sqlite
stage: 💡 SQLite
if: branch = develop
if: branch = master OR branch =~ /(?i:sqlite)/
env: SQLITE=3.26.0
before_install:
- source dev/linux-sqlite
Expand Down Expand Up @@ -140,7 +143,7 @@ jobs:
# https://hub.docker.com/_/mariadb
- &mysql
stage: 🐬 MySQL
if: branch = develop
if: branch = master OR branch =~ /(?i:mysql)/
services: docker
env: MYSQL=mysql:8.0
before_install:
Expand Down Expand Up @@ -170,7 +173,7 @@ jobs:
# https://hub.docker.com/r/cjonesy/docker-vertica/tags
- &vertica
stage: 🔺 Vertica
if: branch = develop
if: branch = master OR branch =~ /(?i:vertica)/
env: VERTICA=9.1.1-0
before_install:
- source dev/linux-vertica
Expand All @@ -189,7 +192,7 @@ jobs:
# https://hub.docker.com/r/exasol/docker-db/tags
- &exasol
stage: ☀️ Exasol
if: branch = develop
if: branch = master OR branch =~ /(?i:exasol)/
env: EXASOL=6.1.1-d1
before_install:
- source dev/linux-exasol
Expand All @@ -202,7 +205,7 @@ jobs:
# https://hub.docker.com/r/jacobalberty/firebird/tags
- &firebird
stage: 🔥 Firebird
if: branch = develop
if: branch = master OR branch =~ /(?i:firebird)/
env: FIREBIRD=3.0
before_install:
- source dev/linux-firebird
Expand Down Expand Up @@ -240,6 +243,5 @@ jobs:

fast_finish: true
allow_failures:
- env: FIREBIRD=2.5-ss # https://github.com/jacobalberty/firebird-docker/issues/33
- stage: ❄️ Snowflake
- stage: 🔮 Oracle
32 changes: 32 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
Revision history for Perl extension App::Sqitch

1.1.0 2020-05-17T16:20:07Z
- Fixed Perl Pod errors, thanks to a pull request from Mohammad S Anwar
(#470).
- Fixed test failures when running with the localization set to German
or Italian. Thanks to Slaven Rezić for the report (#472).
- Fixed an issue when the full name of the current user is not set, so
that it properly falls back on the username. Thanks to Slaven Rezić and
Matthieu Foucault for the report and testing various fixes (#473).
- Eliminated an error when using the `-t` option to specify a target, due
to a missing dependency declaration in the Target class. Thanks to
Clinton Adams for the fix (#509)!
- Updated the IPC::System::Simple Win32 workaround added in 0.9999 to
properly support released versions of IPC::System::Simple. This fixes
errors running the database command-line clients on Windows (#503).
- Sqitch now only passes the `--password` option to the MySQL client if
it was not read from the `.my.cnf` file, as it's more secure to let
the client use `.my.cnf`, and it eliminates a warning from recent
versions of the client. Thanks to Kiel R Stirling for the fix (#484)!
- Added a note to the tutorials to skip setting the `engine.$engine.client`
config when using the Docker image.
- Added the new `check` command, which compares the SHA1 hashes of the
deploy scripts to the database, and reports if any have been modified
since they were deployed. Thanks to Matthieu Foucault for the pull
request and diligent work on this feature (#477)!
- Added the `--modified` option to the `rebase` and `revert` commands, to
revert to the earliest change with a modified deploy script. Handy for
rapid rebasing during iterative development cycles. Thanks to Matthieu
Foucault for this feature (#477)!
- Fixed an issue where the Snowflake engine would complain about not
finding the account name even for commands that don't need them, such
as `init`. Thanks to Stack Overflow user vbp13 for the report (#502).

1.0.0 2019-06-04T12:56:22Z
- Fixed test failure due to a hard-coded system error that may be
localized on non-en-US hosts. Thanks to Slaven Rezić for the catch
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

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

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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
App/Sqitch version 0.9999
App/Sqitch version v1.1.0
=========================

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

Copyright © 2012-2018 iovation Inc.
Copyright © 2012-2020 iovation Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions dev/linux-firebird
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ docker run --rm -d -e ISC_PASSWORD=nix -e FIREBIRD_DATABASE=sqitchtest.db -p 305
sudo add-apt-repository -y ppa:mapopa/firebird3.0
sudo apt-get update -qq
sudo apt-get install -qq firebird-dev firebird3.0-utils
export FIREBIRD_HOME=/usr
export FIREBIRD_URI=db:firebird://sysdba:nix@localhost//firebird/data/sqitchtest.db
3 changes: 2 additions & 1 deletion dist.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = App-Sqitch
license = MIT
copyright_holder = "iovation Inc."
version = v1.0.0
version = v1.1.0

[GatherDir]
[PruneCruft]
Expand Down Expand Up @@ -63,6 +63,7 @@ Template = 0
Test::Pod = 1.41
Test::Pod::Coverage = 1.08
Test::Spelling = 0
Test::MockObject::Extends = 1.20180705
DBD::SQLite = 1.37
DBD::Pg = 2.0
DBD::mysql = 4.018
Expand Down
7 changes: 6 additions & 1 deletion dist/sqitch.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: sqitch
Version: 1.0.0
Version: 1.1.0
Release: 1%{?dist}
Summary: Sensible database change management
License: MIT
Expand Down Expand Up @@ -67,6 +67,7 @@ BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::File)
BuildRequires: perl(Test::File::Contents) >= 0.20
BuildRequires: perl(Test::MockModule) >= 0.17
BuildRequires: perl(Test::MockObject::Extends) >= 1.20180705
BuildRequires: perl(Test::More) >= 0.94
BuildRequires: perl(Test::NoWarnings) >= 0.083
BuildRequires: perl(Test::Warn)
Expand Down Expand Up @@ -305,6 +306,10 @@ also be installed.
# No additional files required.

%changelog
* Sun May 17 2020 David E. Wheeler <david.wheeler@iovation.com> 1.1.0-1
- Upgrade to v1.1.0.
- Added the Test::MockObject::Extends build requirement.

* Tue Jun 4 2019 David E. Wheeler <david.wheeler@iovation.com> 1.0.0-1
- Upgrade to v1.0.0.
- Config::GitLike now requires v1.15.
Expand Down
7 changes: 4 additions & 3 deletions lib/App/Sqitch.pm
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ has user_name => (
}
require User::pwent;
my $name = User::pwent::getpwnam($sysname) || return $sysname;
$name = ($name->gecos)[0] || return $sysname;
require Encode::Locale;
return Encode::decode( locale => ($name->gecos)[0] );
return Encode::decode( locale => $name );
};
}
);
Expand Down Expand Up @@ -331,7 +332,7 @@ sub run {
( my $msg = shift ) =~ s/\s+at\s+.+/\n/ms;
die $msg;
};
if (ISWIN && IPC::System::Simple->VERSION <= 1.25) {
if (ISWIN && IPC::System::Simple->VERSION < 1.28) {
runx ( shift, $self->quote_shell(@_) );
return $self;
}
Expand Down Expand Up @@ -904,7 +905,7 @@ David E. Wheeler <david@justatheory.com>
=head1 License
Copyright (c) 2012-2018 iovation Inc.
Copyright (c) 2012-2020 iovation Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion lib/App/Sqitch/Command.pm
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ David E. Wheeler <david@justatheory.com>
=head1 License
Copyright (c) 2012-2018 iovation Inc.
Copyright (c) 2012-2020 iovation Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion lib/App/Sqitch/Command/add.pm
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ David E. Wheeler <david@justatheory.com>
=head1 License
Copyright (c) 2012-2018 iovation Inc.
Copyright (c) 2012-2020 iovation Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion lib/App/Sqitch/Command/bundle.pm
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ David E. Wheeler <david@justatheory.com>
=head1 License
Copyright (c) 2012-2018 iovation Inc.
Copyright (c) 2012-2020 iovation Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down

0 comments on commit 45520b8

Please sign in to comment.