diff -Nru libsql-translator-perl-0.11024/AUTHORS libsql-translator-perl-1.60/AUTHORS --- libsql-translator-perl-0.11024/AUTHORS 2015-06-03 13:20:31.000000000 +0000 +++ libsql-translator-perl-1.60/AUTHORS 2019-04-28 11:33:51.000000000 +0000 @@ -34,6 +34,7 @@ - John Goulah - John Napiorkowski - Jonathan Yu +- Karen Etheridge - Ken Youens-Clark - Kevin McClellan - Lukas 'mauke' Mai diff -Nru libsql-translator-perl-0.11024/Changes libsql-translator-perl-1.60/Changes --- libsql-translator-perl-0.11024/Changes 2018-01-09 10:19:44.000000000 +0000 +++ libsql-translator-perl-1.60/Changes 2019-05-29 18:35:30.000000000 +0000 @@ -1,5 +1,15 @@ Changes for SQL::Translator +1.60 - 2019-05-29 + * No changes since 1.59_01 + +1.59_01 - 2019-04-28 + * Add support for parsing PostgreSQL dollar-quoted strings + * Add support for materialized views in Oracle producer + * switched JSON backend from JSON.pm to JSON::MaybeXS + * Port Makefile.PL from Module::Install to Distar + * Synchronise the version number across all modules + 0.11024 2018-01-09 * Remove temporary diagnostics added in 0.11023_01 diff -Nru libsql-translator-perl-0.11024/debian/changelog libsql-translator-perl-1.60/debian/changelog --- libsql-translator-perl-0.11024/debian/changelog 2018-01-12 17:32:50.000000000 +0000 +++ libsql-translator-perl-1.60/debian/changelog 2019-11-14 19:37:55.000000000 +0000 @@ -1,3 +1,25 @@ +libsql-translator-perl (1.60-1) unstable; urgency=medium + + [ Salvatore Bonaccorso ] + * Update Vcs-* headers for switch to salsa.debian.org + + [ Laurent Baillet ] + * fix lintian wrong-path-for-interpreter error + + [ gregor herrmann ] + * Import upstream version 1.60. + * Update (build) dependencies. + * Update debian/upstream/metadata. + * debian/coypright: drop information about removed files. + * Update years of packaging copyright. + * Annotate test-only build dependencies with . + * Declare compliance with Debian Policy 4.4.1. + * Drop unneeded version constraints from (build) dependencies. + * Bump debhelper-compat to 12. + * debian/watch: use uscan version 4. + + -- gregor herrmann Thu, 14 Nov 2019 20:37:55 +0100 + libsql-translator-perl (0.11024-1) unstable; urgency=medium * Import upstream version 0.11024. @@ -222,7 +244,7 @@ * New upstream version. (Closes: #544904) * debian/compat: Add, version 7. - * debian/control: + * debian/control: - Standards-Version to 3.8.3. - Drop cdbs and build depend on debhelper > 7. - Fix up dependencies. (Closes: #459583) @@ -245,13 +267,13 @@ - Bump Standards-Version to 3.8.1. - Add Build-Depends on libdigest-sha1-perl. * debian/compat: Remove, use the cdbs default. - + -- Eric Dorland Sat, 25 Apr 2009 22:02:16 -0400 sqlfairy (0.09000-1) unstable; urgency=low * New upstream release. - * debian/control: + * debian/control: - Add linebreaks to the Depends and Build-Depends fields. - Cleanup and sort the Depends and Build-Depends. - Fix Vcs-* headers. @@ -266,8 +288,8 @@ - Upgrade to Standards-Version to 3.7.2.2. - Add Homepage and XS-Vcs-* headers. - Use ${source:Version} instead of ${Source-Version} - * lib/SQL/Translator/Schema.pm, debian/control: Patch from Didrik Pinte to - fix sqlt-diagram failure. Add libgraph-perl to the depends and + * lib/SQL/Translator/Schema.pm, debian/control: Patch from Didrik Pinte to + fix sqlt-diagram failure. Add libgraph-perl to the depends and build-depends (Closes: #433156) * debian/watch: Update for new location on CPAN. @@ -295,9 +317,9 @@ sqlfairy (0.07-3) unstable; urgency=low - * debian/control: + * debian/control: - Upgrade Standards-Version to 3.7.2.0. - - Use Build-Depends instead of Build-Depends-Indep for things + - Use Build-Depends instead of Build-Depends-Indep for things that need to be there for the clean target. -- Eric Dorland Thu, 15 Jun 2006 22:41:38 -0400 @@ -305,9 +327,9 @@ sqlfairy (0.07-2) unstable; urgency=low * debian/watch: Add watch file. - * debian/control: + * debian/control: - Standards-Version to 3.7.1.0. - - Actually include proper Depends. Forgot dh_perl isn't as smart as + - Actually include proper Depends. Forgot dh_perl isn't as smart as I wish it was. (Closes: #365824, #365825, #365826) -- Eric Dorland Thu, 4 May 2006 00:24:16 -0400 diff -Nru libsql-translator-perl-0.11024/debian/compat libsql-translator-perl-1.60/debian/compat --- libsql-translator-perl-0.11024/debian/compat 2018-01-12 17:32:50.000000000 +0000 +++ libsql-translator-perl-1.60/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru libsql-translator-perl-0.11024/debian/control libsql-translator-perl-1.60/debian/control --- libsql-translator-perl-0.11024/debian/control 2018-01-12 17:32:50.000000000 +0000 +++ libsql-translator-perl-1.60/debian/control 2019-11-14 19:37:55.000000000 +0000 @@ -5,34 +5,35 @@ Section: perl Testsuite: autopkgtest-pkg-perl Priority: optional -Build-Depends: debhelper (>= 10) -Build-Depends-Indep: libcgi-pm-perl | perl (<< 5.19), +Build-Depends: debhelper-compat (= 12) +Build-Depends-Indep: libcgi-pm-perl , perl, - libcarp-clan-perl, - libclass-makemethods-perl, - libdbd-sqlite3-perl, - libdbi-perl, + libcarp-clan-perl , + libclass-makemethods-perl , + libdbd-sqlite3-perl , + libdbi-perl , libfile-sharedir-perl, - libgd-perl, - libgraph-perl, - libgraphviz-perl, - libjson-perl, - libmoo-perl (>= 1.000003), - libpackage-variant-perl, - libparse-recdescent-perl, - libspreadsheet-parseexcel-perl, - libtemplate-perl, - libtest-differences-perl, - libtest-exception-perl, - libtest-pod-perl, - libtext-recordparser-perl, - libtry-tiny-perl, - libxml-libxml-perl, - libxml-writer-perl, - libyaml-perl -Standards-Version: 4.1.3 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libsql-translator-perl.git -Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libsql-translator-perl.git + libfile-sharedir-install-perl, + libgd-perl , + libgraph-perl , + libgraphviz-perl , + libjson-maybexs-perl (>= 1.003003) , + libmoo-perl , + libpackage-variant-perl , + libparse-recdescent-perl , + libspreadsheet-parseexcel-perl , + libtemplate-perl , + libtest-differences-perl , + libtest-exception-perl , + libtest-pod-perl , + libtext-recordparser-perl , + libtry-tiny-perl , + libxml-libxml-perl , + libxml-writer-perl , + libyaml-perl +Standards-Version: 4.4.1 +Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libsql-translator-perl +Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libsql-translator-perl.git Homepage: http://sqlfairy.sourceforge.net/ Package: libsql-translator-perl @@ -43,15 +44,15 @@ libclass-makemethods-perl, libdbi-perl, libfile-sharedir-perl, - libmoo-perl (>= 1.000003), + libmoo-perl, libpackage-variant-perl, libparse-recdescent-perl, libtry-tiny-perl -Recommends: libcgi-pm-perl | perl (<< 5.19), +Recommends: libcgi-pm-perl, libgd-perl, libgraph-perl, libgraphviz-perl, - libjson-perl, + libjson-maybexs-perl (>= 1.003003), libspreadsheet-parseexcel-perl, libtemplate-perl, libtext-recordparser-perl, diff -Nru libsql-translator-perl-0.11024/debian/copyright libsql-translator-perl-1.60/debian/copyright --- libsql-translator-perl-0.11024/debian/copyright 2018-01-12 17:32:50.000000000 +0000 +++ libsql-translator-perl-1.60/debian/copyright 2019-11-14 19:37:55.000000000 +0000 @@ -43,17 +43,11 @@ 2002-2009, Amiri Barksdale License: GPL-2+ -Files: inc/Module/* -Copyright: 2002-2012, Adam Kennedy - 2002-2012, Audrey Tang - 2002-2012, Brian Ingerson -License: Artistic or GPL-1+ - Files: debian/* Copyright: 2006-2009, Eric Dorland 2009, Ryan Niebur 2009-2010, Jonathan Yu - 2011-2018, gregor herrmann + 2011-2019, gregor herrmann License: Artistic or GPL-1+ License: Artistic diff -Nru libsql-translator-perl-0.11024/debian/rules libsql-translator-perl-1.60/debian/rules --- libsql-translator-perl-0.11024/debian/rules 2018-01-12 17:32:50.000000000 +0000 +++ libsql-translator-perl-1.60/debian/rules 2019-11-14 19:37:55.000000000 +0000 @@ -1,4 +1,11 @@ #!/usr/bin/make -f +PACKAGE = $(shell dh_listpackages) +TMP = $(CURDIR)/debian/$(PACKAGE) + %: dh $@ + +override_dh_install: + dh_install + sed -i '1s|^#!/usr/bin/env perl|#!/usr/bin/perl|' $(TMP)/usr/bin/sqlt* diff -Nru libsql-translator-perl-0.11024/debian/upstream/metadata libsql-translator-perl-1.60/debian/upstream/metadata --- libsql-translator-perl-0.11024/debian/upstream/metadata 2018-01-12 17:32:50.000000000 +0000 +++ libsql-translator-perl-1.60/debian/upstream/metadata 2019-11-14 19:37:55.000000000 +0000 @@ -1,6 +1,6 @@ --- Archive: CPAN Bug-Database: https://rt.cpan.org/NoAuth/Bugs.html?Dist=SQL-Translator -Contact: irc://irc.perl.org/#dbic-cabal -Name: SQL-Translator -Repository: https://github.com/dbsrgits/sql-translator/ +Bug-Submit: bug-SQL-Translator@rt.cpan.org +Repository: https://github.com/dbsrgits/sql-translator.git +Repository-Browse: https://github.com/dbsrgits/sql-translator diff -Nru libsql-translator-perl-0.11024/debian/watch libsql-translator-perl-1.60/debian/watch --- libsql-translator-perl-0.11024/debian/watch 2018-01-12 17:32:50.000000000 +0000 +++ libsql-translator-perl-1.60/debian/watch 2019-11-14 19:37:55.000000000 +0000 @@ -1,3 +1,2 @@ -version=3 - -https://metacpan.org/release/SQL-Translator .*/SQL-Translator-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip) +version=4 +https://metacpan.org/release/SQL-Translator .*/SQL-Translator-v?@ANY_VERSION@@ARCHIVE_EXT@$ diff -Nru libsql-translator-perl-0.11024/inc/Module/AutoInstall.pm libsql-translator-perl-1.60/inc/Module/AutoInstall.pm --- libsql-translator-perl-0.11024/inc/Module/AutoInstall.pm 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/AutoInstall.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,934 +0,0 @@ -#line 1 -package Module::AutoInstall; - -use strict; -use Cwd (); -use File::Spec (); -use ExtUtils::MakeMaker (); - -use vars qw{$VERSION}; -BEGIN { - $VERSION = '1.18'; -} - -# special map on pre-defined feature sets -my %FeatureMap = ( - '' => 'Core Features', # XXX: deprecated - '-core' => 'Core Features', -); - -# various lexical flags -my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $InstallDepsTarget, $HasCPANPLUS ); -my ( - $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps, - $UpgradeDeps -); -my ( $PostambleActions, $PostambleActionsNoTest, $PostambleActionsUpgradeDeps, - $PostambleActionsUpgradeDepsNoTest, $PostambleActionsListDeps, - $PostambleActionsListAllDeps, $PostambleUsed, $NoTest); - -# See if it's a testing or non-interactive session -_accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN ); -_init(); - -sub _accept_default { - $AcceptDefault = shift; -} - -sub _installdeps_target { - $InstallDepsTarget = shift; -} - -sub missing_modules { - return @Missing; -} - -sub do_install { - __PACKAGE__->install( - [ - $Config - ? ( UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} ) - : () - ], - @Missing, - ); -} - -# initialize various flags, and/or perform install -sub _init { - foreach my $arg ( - @ARGV, - split( - /[\s\t]+/, - $ENV{PERL_AUTOINSTALL} || $ENV{PERL_EXTUTILS_AUTOINSTALL} || '' - ) - ) - { - if ( $arg =~ /^--config=(.*)$/ ) { - $Config = [ split( ',', $1 ) ]; - } - elsif ( $arg =~ /^--installdeps=(.*)$/ ) { - __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) ); - exit 0; - } - elsif ( $arg =~ /^--upgradedeps=(.*)$/ ) { - $UpgradeDeps = 1; - __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) ); - exit 0; - } - elsif ( $arg =~ /^--default(?:deps)?$/ ) { - $AcceptDefault = 1; - } - elsif ( $arg =~ /^--check(?:deps)?$/ ) { - $CheckOnly = 1; - } - elsif ( $arg =~ /^--skip(?:deps)?$/ ) { - $SkipInstall = 1; - } - elsif ( $arg =~ /^--test(?:only)?$/ ) { - $TestOnly = 1; - } - elsif ( $arg =~ /^--all(?:deps)?$/ ) { - $AllDeps = 1; - } - } -} - -# overrides MakeMaker's prompt() to automatically accept the default choice -sub _prompt { - goto &ExtUtils::MakeMaker::prompt unless $AcceptDefault; - - my ( $prompt, $default ) = @_; - my $y = ( $default =~ /^[Yy]/ ); - - print $prompt, ' [', ( $y ? 'Y' : 'y' ), '/', ( $y ? 'n' : 'N' ), '] '; - print "$default\n"; - return $default; -} - -# the workhorse -sub import { - my $class = shift; - my @args = @_ or return; - my $core_all; - - print "*** $class version " . $class->VERSION . "\n"; - print "*** Checking for Perl dependencies...\n"; - - my $cwd = Cwd::getcwd(); - - $Config = []; - - my $maxlen = length( - ( - sort { length($b) <=> length($a) } - grep { /^[^\-]/ } - map { - ref($_) - ? ( ( ref($_) eq 'HASH' ) ? keys(%$_) : @{$_} ) - : '' - } - map { +{@args}->{$_} } - grep { /^[^\-]/ or /^-core$/i } keys %{ +{@args} } - )[0] - ); - - # We want to know if we're under CPAN early to avoid prompting, but - # if we aren't going to try and install anything anyway then skip the - # check entirely since we don't want to have to load (and configure) - # an old CPAN just for a cosmetic message - - $UnderCPAN = _check_lock(1) unless $SkipInstall || $InstallDepsTarget; - - while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) { - my ( @required, @tests, @skiptests ); - my $default = 1; - my $conflict = 0; - - if ( $feature =~ m/^-(\w+)$/ ) { - my $option = lc($1); - - # check for a newer version of myself - _update_to( $modules, @_ ) and return if $option eq 'version'; - - # sets CPAN configuration options - $Config = $modules if $option eq 'config'; - - # promote every features to core status - $core_all = ( $modules =~ /^all$/i ) and next - if $option eq 'core'; - - next unless $option eq 'core'; - } - - print "[" . ( $FeatureMap{ lc($feature) } || $feature ) . "]\n"; - - $modules = [ %{$modules} ] if UNIVERSAL::isa( $modules, 'HASH' ); - - unshift @$modules, -default => &{ shift(@$modules) } - if ( ref( $modules->[0] ) eq 'CODE' ); # XXX: bugward compatibility - - while ( my ( $mod, $arg ) = splice( @$modules, 0, 2 ) ) { - if ( $mod =~ m/^-(\w+)$/ ) { - my $option = lc($1); - - $default = $arg if ( $option eq 'default' ); - $conflict = $arg if ( $option eq 'conflict' ); - @tests = @{$arg} if ( $option eq 'tests' ); - @skiptests = @{$arg} if ( $option eq 'skiptests' ); - - next; - } - - printf( "- %-${maxlen}s ...", $mod ); - - if ( $arg and $arg =~ /^\D/ ) { - unshift @$modules, $arg; - $arg = 0; - } - - # XXX: check for conflicts and uninstalls(!) them. - my $cur = _version_of($mod); - if (_version_cmp ($cur, $arg) >= 0) - { - print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n"; - push @Existing, $mod => $arg; - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - else { - if (not defined $cur) # indeed missing - { - print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n"; - } - else - { - # no need to check $arg as _version_cmp ($cur, undef) would satisfy >= above - print "too old. ($cur < $arg)\n"; - } - - push @required, $mod => $arg; - } - } - - next unless @required; - - my $mandatory = ( $feature eq '-core' or $core_all ); - - if ( - !$SkipInstall - and ( - $CheckOnly - or ($mandatory and $UnderCPAN) - or $AllDeps - or $InstallDepsTarget - or _prompt( - qq{==> Auto-install the } - . ( @required / 2 ) - . ( $mandatory ? ' mandatory' : ' optional' ) - . qq{ module(s) from CPAN?}, - $default ? 'y' : 'n', - ) =~ /^[Yy]/ - ) - ) - { - push( @Missing, @required ); - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - - elsif ( !$SkipInstall - and $default - and $mandatory - and - _prompt( qq{==> The module(s) are mandatory! Really skip?}, 'n', ) - =~ /^[Nn]/ ) - { - push( @Missing, @required ); - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - - else { - $DisabledTests{$_} = 1 for map { glob($_) } @tests; - } - } - - if ( @Missing and not( $CheckOnly or $UnderCPAN) ) { - require Config; - my $make = $Config::Config{make}; - if ($InstallDepsTarget) { - print -"*** To install dependencies type '$make installdeps' or '$make installdeps_notest'.\n"; - } - else { - print -"*** Dependencies will be installed the next time you type '$make'.\n"; - } - - # make an educated guess of whether we'll need root permission. - print " (You may need to do that as the 'root' user.)\n" - if eval '$>'; - } - print "*** $class configuration finished.\n"; - - chdir $cwd; - - # import to main:: - no strict 'refs'; - *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main'; - - return (@Existing, @Missing); -} - -sub _running_under { - my $thing = shift; - print <<"END_MESSAGE"; -*** Since we're running under ${thing}, I'll just let it take care - of the dependency's installation later. -END_MESSAGE - return 1; -} - -# Check to see if we are currently running under CPAN.pm and/or CPANPLUS; -# if we are, then we simply let it taking care of our dependencies -sub _check_lock { - return unless @Missing or @_; - - if ($ENV{PERL5_CPANM_IS_RUNNING}) { - return _running_under('cpanminus'); - } - - my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING}; - - if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) { - return _running_under($cpan_env ? 'CPAN' : 'CPANPLUS'); - } - - require CPAN; - - if ($CPAN::VERSION > '1.89') { - if ($cpan_env) { - return _running_under('CPAN'); - } - return; # CPAN.pm new enough, don't need to check further - } - - # last ditch attempt, this -will- configure CPAN, very sorry - - _load_cpan(1); # force initialize even though it's already loaded - - # Find the CPAN lock-file - my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" ); - return unless -f $lock; - - # Check the lock - local *LOCK; - return unless open(LOCK, $lock); - - if ( - ( $^O eq 'MSWin32' ? _under_cpan() : == getppid() ) - and ( $CPAN::Config->{prerequisites_policy} || '' ) ne 'ignore' - ) { - print <<'END_MESSAGE'; - -*** Since we're running under CPAN, I'll just let it take care - of the dependency's installation later. -END_MESSAGE - return 1; - } - - close LOCK; - return; -} - -sub install { - my $class = shift; - - my $i; # used below to strip leading '-' from config keys - my @config = ( map { s/^-// if ++$i; $_ } @{ +shift } ); - - my ( @modules, @installed, @modules_to_upgrade ); - while (my ($pkg, $ver) = splice(@_, 0, 2)) { - - # grep out those already installed - if (_version_cmp(_version_of($pkg), $ver) >= 0) { - push @installed, $pkg; - if ($UpgradeDeps) { - push @modules_to_upgrade, $pkg, $ver; - } - } - else { - push @modules, $pkg, $ver; - } - } - - if ($UpgradeDeps) { - push @modules, @modules_to_upgrade; - @installed = (); - @modules_to_upgrade = (); - } - - return @installed unless @modules; # nothing to do - return @installed if _check_lock(); # defer to the CPAN shell - - print "*** Installing dependencies...\n"; - - return unless _connected_to('cpan.org'); - - my %args = @config; - my %failed; - local *FAILED; - if ( $args{do_once} and open( FAILED, '.#autoinstall.failed' ) ) { - while () { chomp; $failed{$_}++ } - close FAILED; - - my @newmod; - while ( my ( $k, $v ) = splice( @modules, 0, 2 ) ) { - push @newmod, ( $k => $v ) unless $failed{$k}; - } - @modules = @newmod; - } - - if ( _has_cpanplus() and not $ENV{PERL_AUTOINSTALL_PREFER_CPAN} ) { - _install_cpanplus( \@modules, \@config ); - } else { - _install_cpan( \@modules, \@config ); - } - - print "*** $class installation finished.\n"; - - # see if we have successfully installed them - while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) { - if ( _version_cmp( _version_of($pkg), $ver ) >= 0 ) { - push @installed, $pkg; - } - elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) { - print FAILED "$pkg\n"; - } - } - - close FAILED if $args{do_once}; - - return @installed; -} - -sub _install_cpanplus { - my @modules = @{ +shift }; - my @config = _cpanplus_config( @{ +shift } ); - my $installed = 0; - - require CPANPLUS::Backend; - my $cp = CPANPLUS::Backend->new; - my $conf = $cp->configure_object; - - return unless $conf->can('conf') # 0.05x+ with "sudo" support - or _can_write($conf->_get_build('base')); # 0.04x - - # if we're root, set UNINST=1 to avoid trouble unless user asked for it. - my $makeflags = $conf->get_conf('makeflags') || ''; - if ( UNIVERSAL::isa( $makeflags, 'HASH' ) ) { - # 0.03+ uses a hashref here - $makeflags->{UNINST} = 1 unless exists $makeflags->{UNINST}; - - } else { - # 0.02 and below uses a scalar - $makeflags = join( ' ', split( ' ', $makeflags ), 'UNINST=1' ) - if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } ); - - } - $conf->set_conf( makeflags => $makeflags ); - $conf->set_conf( prereqs => 1 ); - - - - while ( my ( $key, $val ) = splice( @config, 0, 2 ) ) { - $conf->set_conf( $key, $val ); - } - - my $modtree = $cp->module_tree; - while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) { - print "*** Installing $pkg...\n"; - - MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall; - - my $success; - my $obj = $modtree->{$pkg}; - - if ( $obj and _version_cmp( $obj->{version}, $ver ) >= 0 ) { - my $pathname = $pkg; - $pathname =~ s/::/\\W/; - - foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) { - delete $INC{$inc}; - } - - my $rv = $cp->install( modules => [ $obj->{module} ] ); - - if ( $rv and ( $rv->{ $obj->{module} } or $rv->{ok} ) ) { - print "*** $pkg successfully installed.\n"; - $success = 1; - } else { - print "*** $pkg installation cancelled.\n"; - $success = 0; - } - - $installed += $success; - } else { - print << "."; -*** Could not find a version $ver or above for $pkg; skipping. -. - } - - MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall; - } - - return $installed; -} - -sub _cpanplus_config { - my @config = (); - while ( @_ ) { - my ($key, $value) = (shift(), shift()); - if ( $key eq 'prerequisites_policy' ) { - if ( $value eq 'follow' ) { - $value = CPANPLUS::Internals::Constants::PREREQ_INSTALL(); - } elsif ( $value eq 'ask' ) { - $value = CPANPLUS::Internals::Constants::PREREQ_ASK(); - } elsif ( $value eq 'ignore' ) { - $value = CPANPLUS::Internals::Constants::PREREQ_IGNORE(); - } else { - die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n"; - } - push @config, 'prereqs', $value; - } elsif ( $key eq 'force' ) { - push @config, $key, $value; - } elsif ( $key eq 'notest' ) { - push @config, 'skiptest', $value; - } else { - die "*** Cannot convert option $key to CPANPLUS version.\n"; - } - } - return @config; -} - -sub _install_cpan { - my @modules = @{ +shift }; - my @config = @{ +shift }; - my $installed = 0; - my %args; - - _load_cpan(); - require Config; - - if (CPAN->VERSION < 1.80) { - # no "sudo" support, probe for writableness - return unless _can_write( MM->catfile( $CPAN::Config->{cpan_home}, 'sources' ) ) - and _can_write( $Config::Config{sitelib} ); - } - - # if we're root, set UNINST=1 to avoid trouble unless user asked for it. - my $makeflags = $CPAN::Config->{make_install_arg} || ''; - $CPAN::Config->{make_install_arg} = - join( ' ', split( ' ', $makeflags ), 'UNINST=1' ) - if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } ); - - # don't show start-up info - $CPAN::Config->{inhibit_startup_message} = 1; - - # set additional options - while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) { - ( $args{$opt} = $arg, next ) - if $opt =~ /^(?:force|notest)$/; # pseudo-option - $CPAN::Config->{$opt} = $opt eq 'urllist' ? [$arg] : $arg; - } - - if ($args{notest} && (not CPAN::Shell->can('notest'))) { - die "Your version of CPAN is too old to support the 'notest' pragma"; - } - - local $CPAN::Config->{prerequisites_policy} = 'follow'; - - while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) { - MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall; - - print "*** Installing $pkg...\n"; - - my $obj = CPAN::Shell->expand( Module => $pkg ); - my $success = 0; - - if ( $obj and _version_cmp( $obj->cpan_version, $ver ) >= 0 ) { - my $pathname = $pkg; - $pathname =~ s/::/\\W/; - - foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) { - delete $INC{$inc}; - } - - my $rv = do { - if ($args{force}) { - CPAN::Shell->force( install => $pkg ) - } elsif ($args{notest}) { - CPAN::Shell->notest( install => $pkg ) - } else { - CPAN::Shell->install($pkg) - } - }; - - $rv ||= eval { - $CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, ) - ->{install} - if $CPAN::META; - }; - - if ( $rv eq 'YES' ) { - print "*** $pkg successfully installed.\n"; - $success = 1; - } - else { - print "*** $pkg installation failed.\n"; - $success = 0; - } - - $installed += $success; - } - else { - print << "."; -*** Could not find a version $ver or above for $pkg; skipping. -. - } - - MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall; - } - - return $installed; -} - -sub _has_cpanplus { - return ( - $HasCPANPLUS = ( - $INC{'CPANPLUS/Config.pm'} - or _load('CPANPLUS::Shell::Default') - ) - ); -} - -# make guesses on whether we're under the CPAN installation directory -sub _under_cpan { - require Cwd; - require File::Spec; - - my $cwd = File::Spec->canonpath( Cwd::getcwd() ); - my $cpan = File::Spec->canonpath( $CPAN::Config->{cpan_home} ); - - return ( index( $cwd, $cpan ) > -1 ); -} - -sub _update_to { - my $class = __PACKAGE__; - my $ver = shift; - - return - if _version_cmp( _version_of($class), $ver ) >= 0; # no need to upgrade - - if ( - _prompt( "==> A newer version of $class ($ver) is required. Install?", - 'y' ) =~ /^[Nn]/ - ) - { - die "*** Please install $class $ver manually.\n"; - } - - print << "."; -*** Trying to fetch it from CPAN... -. - - # install ourselves - _load($class) and return $class->import(@_) - if $class->install( [], $class, $ver ); - - print << '.'; exit 1; - -*** Cannot bootstrap myself. :-( Installation terminated. -. -} - -# check if we're connected to some host, using inet_aton -sub _connected_to { - my $site = shift; - - return ( - ( _load('Socket') and Socket::inet_aton($site) ) or _prompt( - qq( -*** Your host cannot resolve the domain name '$site', which - probably means the Internet connections are unavailable. -==> Should we try to install the required module(s) anyway?), 'n' - ) =~ /^[Yy]/ - ); -} - -# check if a directory is writable; may create it on demand -sub _can_write { - my $path = shift; - mkdir( $path, 0755 ) unless -e $path; - - return 1 if -w $path; - - print << "."; -*** You are not allowed to write to the directory '$path'; - the installation may fail due to insufficient permissions. -. - - if ( - eval '$>' and lc(`sudo -V`) =~ /version/ and _prompt( - qq( -==> Should we try to re-execute the autoinstall process with 'sudo'?), - ((-t STDIN) ? 'y' : 'n') - ) =~ /^[Yy]/ - ) - { - - # try to bootstrap ourselves from sudo - print << "."; -*** Trying to re-execute the autoinstall process with 'sudo'... -. - my $missing = join( ',', @Missing ); - my $config = join( ',', - UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} ) - if $Config; - - return - unless system( 'sudo', $^X, $0, "--config=$config", - "--installdeps=$missing" ); - - print << "."; -*** The 'sudo' command exited with error! Resuming... -. - } - - return _prompt( - qq( -==> Should we try to install the required module(s) anyway?), 'n' - ) =~ /^[Yy]/; -} - -# load a module and return the version it reports -sub _load { - my $mod = pop; # method/function doesn't matter - my $file = $mod; - $file =~ s|::|/|g; - $file .= '.pm'; - local $@; - return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 ); -} - -# report version without loading a module -sub _version_of { - my $mod = pop; # method/function doesn't matter - my $file = $mod; - $file =~ s|::|/|g; - $file .= '.pm'; - foreach my $dir ( @INC ) { - next if ref $dir; - my $path = File::Spec->catfile($dir, $file); - next unless -e $path; - require ExtUtils::MM_Unix; - return ExtUtils::MM_Unix->parse_version($path); - } - return undef; -} - -# Load CPAN.pm and it's configuration -sub _load_cpan { - return if $CPAN::VERSION and $CPAN::Config and not @_; - require CPAN; - - # CPAN-1.82+ adds CPAN::Config::AUTOLOAD to redirect to - # CPAN::HandleConfig->load. CPAN reports that the redirection - # is deprecated in a warning printed at the user. - - # CPAN-1.81 expects CPAN::HandleConfig->load, does not have - # $CPAN::HandleConfig::VERSION but cannot handle - # CPAN::Config->load - - # Which "versions expect CPAN::Config->load? - - if ( $CPAN::HandleConfig::VERSION - || CPAN::HandleConfig->can('load') - ) { - # Newer versions of CPAN have a HandleConfig module - CPAN::HandleConfig->load; - } else { - # Older versions had the load method in Config directly - CPAN::Config->load; - } -} - -# compare two versions, either use Sort::Versions or plain comparison -# return values same as <=> -sub _version_cmp { - my ( $cur, $min ) = @_; - return -1 unless defined $cur; # if 0 keep comparing - return 1 unless $min; - - $cur =~ s/\s+$//; - - # check for version numbers that are not in decimal format - if ( ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./ ) { - if ( ( $version::VERSION or defined( _load('version') )) and - version->can('new') - ) { - - # use version.pm if it is installed. - return version->new($cur) <=> version->new($min); - } - elsif ( $Sort::Versions::VERSION or defined( _load('Sort::Versions') ) ) - { - - # use Sort::Versions as the sorting algorithm for a.b.c versions - return Sort::Versions::versioncmp( $cur, $min ); - } - - warn "Cannot reliably compare non-decimal formatted versions.\n" - . "Please install version.pm or Sort::Versions.\n"; - } - - # plain comparison - local $^W = 0; # shuts off 'not numeric' bugs - return $cur <=> $min; -} - -# nothing; this usage is deprecated. -sub main::PREREQ_PM { return {}; } - -sub _make_args { - my %args = @_; - - $args{PREREQ_PM} = { %{ $args{PREREQ_PM} || {} }, @Existing, @Missing } - if $UnderCPAN or $TestOnly; - - if ( $args{EXE_FILES} and -e 'MANIFEST' ) { - require ExtUtils::Manifest; - my $manifest = ExtUtils::Manifest::maniread('MANIFEST'); - - $args{EXE_FILES} = - [ grep { exists $manifest->{$_} } @{ $args{EXE_FILES} } ]; - } - - $args{test}{TESTS} ||= 't/*.t'; - $args{test}{TESTS} = join( ' ', - grep { !exists( $DisabledTests{$_} ) } - map { glob($_) } split( /\s+/, $args{test}{TESTS} ) ); - - my $missing = join( ',', @Missing ); - my $config = - join( ',', UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} ) - if $Config; - - $PostambleActions = ( - ($missing and not $UnderCPAN) - ? "\$(PERL) $0 --config=$config --installdeps=$missing" - : "\$(NOECHO) \$(NOOP)" - ); - - my $deps_list = join( ',', @Missing, @Existing ); - - $PostambleActionsUpgradeDeps = - "\$(PERL) $0 --config=$config --upgradedeps=$deps_list"; - - my $config_notest = - join( ',', (UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config}), - 'notest', 1 ) - if $Config; - - $PostambleActionsNoTest = ( - ($missing and not $UnderCPAN) - ? "\$(PERL) $0 --config=$config_notest --installdeps=$missing" - : "\$(NOECHO) \$(NOOP)" - ); - - $PostambleActionsUpgradeDepsNoTest = - "\$(PERL) $0 --config=$config_notest --upgradedeps=$deps_list"; - - $PostambleActionsListDeps = - '@$(PERL) -le "print for @ARGV" ' - . join(' ', map $Missing[$_], grep $_ % 2 == 0, 0..$#Missing); - - my @all = (@Missing, @Existing); - - $PostambleActionsListAllDeps = - '@$(PERL) -le "print for @ARGV" ' - . join(' ', map $all[$_], grep $_ % 2 == 0, 0..$#all); - - return %args; -} - -# a wrapper to ExtUtils::MakeMaker::WriteMakefile -sub Write { - require Carp; - Carp::croak "WriteMakefile: Need even number of args" if @_ % 2; - - if ($CheckOnly) { - print << "."; -*** Makefile not written in check-only mode. -. - return; - } - - my %args = _make_args(@_); - - no strict 'refs'; - - $PostambleUsed = 0; - local *MY::postamble = \&postamble unless defined &MY::postamble; - ExtUtils::MakeMaker::WriteMakefile(%args); - - print << "." unless $PostambleUsed; -*** WARNING: Makefile written with customized MY::postamble() without - including contents from Module::AutoInstall::postamble() -- - auto installation features disabled. Please contact the author. -. - - return 1; -} - -sub postamble { - $PostambleUsed = 1; - my $fragment; - - $fragment .= <<"AUTO_INSTALL" if !$InstallDepsTarget; - -config :: installdeps -\t\$(NOECHO) \$(NOOP) -AUTO_INSTALL - - $fragment .= <<"END_MAKE"; - -checkdeps :: -\t\$(PERL) $0 --checkdeps - -installdeps :: -\t$PostambleActions - -installdeps_notest :: -\t$PostambleActionsNoTest - -upgradedeps :: -\t$PostambleActionsUpgradeDeps - -upgradedeps_notest :: -\t$PostambleActionsUpgradeDepsNoTest - -listdeps :: -\t$PostambleActionsListDeps - -listalldeps :: -\t$PostambleActionsListAllDeps - -END_MAKE - - return $fragment; -} - -1; - -__END__ - -#line 1197 diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/AuthorTests.pm libsql-translator-perl-1.60/inc/Module/Install/AuthorTests.pm --- libsql-translator-perl-0.11024/inc/Module/Install/AuthorTests.pm 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/AuthorTests.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -#line 1 -package Module::Install::AuthorTests; - -use 5.005; -use strict; -use Module::Install::Base; -use Carp (); - -#line 16 - -use vars qw{$VERSION $ISCORE @ISA}; -BEGIN { - $VERSION = '0.002'; - $ISCORE = 1; - @ISA = qw{Module::Install::Base}; -} - -#line 42 - -sub author_tests { - my ($self, @dirs) = @_; - _add_author_tests($self, \@dirs, 0); -} - -#line 56 - -sub recursive_author_tests { - my ($self, @dirs) = @_; - _add_author_tests($self, \@dirs, 1); -} - -sub _wanted { - my $href = shift; - sub { /\.t$/ and -f $_ and $href->{$File::Find::dir} = 1 } -} - -sub _add_author_tests { - my ($self, $dirs, $recurse) = @_; - return unless $Module::Install::AUTHOR; - - my @tests = $self->tests ? (split / /, $self->tests) : 't/*.t'; - - # XXX: pick a default, later -- rjbs, 2008-02-24 - my @dirs = @$dirs ? @$dirs : Carp::confess "no dirs given to author_tests"; - @dirs = grep { -d } @dirs; - - if ($recurse) { - require File::Find; - my %test_dir; - File::Find::find(_wanted(\%test_dir), @dirs); - $self->tests( join ' ', @tests, map { "$_/*.t" } sort keys %test_dir ); - } else { - $self->tests( join ' ', @tests, map { "$_/*.t" } sort @dirs ); - } -} - -#line 107 - -1; diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/AutoInstall.pm libsql-translator-perl-1.60/inc/Module/Install/AutoInstall.pm --- libsql-translator-perl-0.11024/inc/Module/Install/AutoInstall.pm 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/AutoInstall.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -#line 1 -package Module::Install::AutoInstall; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.18'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub AutoInstall { $_[0] } - -sub run { - my $self = shift; - $self->auto_install_now(@_); -} - -sub write { - my $self = shift; - $self->auto_install(@_); -} - -sub auto_install { - my $self = shift; - return if $self->{done}++; - - # Flatten array of arrays into a single array - my @core = map @$_, map @$_, grep ref, - $self->build_requires, $self->requires; - - my @config = @_; - - # We'll need Module::AutoInstall - $self->include('Module::AutoInstall'); - require Module::AutoInstall; - - my @features_require = Module::AutoInstall->import( - (@config ? (-config => \@config) : ()), - (@core ? (-core => \@core) : ()), - $self->features, - ); - - my %seen; - my @requires = map @$_, map @$_, grep ref, $self->requires; - while (my ($mod, $ver) = splice(@requires, 0, 2)) { - $seen{$mod}{$ver}++; - } - my @build_requires = map @$_, map @$_, grep ref, $self->build_requires; - while (my ($mod, $ver) = splice(@build_requires, 0, 2)) { - $seen{$mod}{$ver}++; - } - my @configure_requires = map @$_, map @$_, grep ref, $self->configure_requires; - while (my ($mod, $ver) = splice(@configure_requires, 0, 2)) { - $seen{$mod}{$ver}++; - } - - my @deduped; - while (my ($mod, $ver) = splice(@features_require, 0, 2)) { - push @deduped, $mod => $ver unless $seen{$mod}{$ver}++; - } - - $self->requires(@deduped); - - $self->makemaker_args( Module::AutoInstall::_make_args() ); - - my $class = ref($self); - $self->postamble( - "# --- $class section:\n" . - Module::AutoInstall::postamble() - ); -} - -sub installdeps_target { - my ($self, @args) = @_; - - $self->include('Module::AutoInstall'); - require Module::AutoInstall; - - Module::AutoInstall::_installdeps_target(1); - - $self->auto_install(@args); -} - -sub auto_install_now { - my $self = shift; - $self->auto_install(@_); - Module::AutoInstall::do_install(); -} - -1; diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/Base.pm libsql-translator-perl-1.60/inc/Module/Install/Base.pm --- libsql-translator-perl-0.11024/inc/Module/Install/Base.pm 2018-01-09 10:24:43.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/Base.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -#line 1 -package Module::Install::Base; - -use strict 'vars'; -use vars qw{$VERSION}; -BEGIN { - $VERSION = '1.18'; -} - -# Suspend handler for "redefined" warnings -BEGIN { - my $w = $SIG{__WARN__}; - $SIG{__WARN__} = sub { $w }; -} - -#line 42 - -sub new { - my $class = shift; - unless ( defined &{"${class}::call"} ) { - *{"${class}::call"} = sub { shift->_top->call(@_) }; - } - unless ( defined &{"${class}::load"} ) { - *{"${class}::load"} = sub { shift->_top->load(@_) }; - } - bless { @_ }, $class; -} - -#line 61 - -sub AUTOLOAD { - local $@; - my $func = eval { shift->_top->autoload } or return; - goto &$func; -} - -#line 75 - -sub _top { - $_[0]->{_top}; -} - -#line 90 - -sub admin { - $_[0]->_top->{admin} - or - Module::Install::Base::FakeAdmin->new; -} - -#line 106 - -sub is_admin { - ! $_[0]->admin->isa('Module::Install::Base::FakeAdmin'); -} - -sub DESTROY {} - -package Module::Install::Base::FakeAdmin; - -use vars qw{$VERSION}; -BEGIN { - $VERSION = $Module::Install::Base::VERSION; -} - -my $fake; - -sub new { - $fake ||= bless(\@_, $_[0]); -} - -sub AUTOLOAD {} - -sub DESTROY {} - -# Restore warning handler -BEGIN { - $SIG{__WARN__} = $SIG{__WARN__}->(); -} - -1; - -#line 159 diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/Can.pm libsql-translator-perl-1.60/inc/Module/Install/Can.pm --- libsql-translator-perl-0.11024/inc/Module/Install/Can.pm 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/Can.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -#line 1 -package Module::Install::Can; - -use strict; -use Config (); -use ExtUtils::MakeMaker (); -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.18'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# check if we can load some module -### Upgrade this to not have to load the module if possible -sub can_use { - my ($self, $mod, $ver) = @_; - $mod =~ s{::|\\}{/}g; - $mod .= '.pm' unless $mod =~ /\.pm$/i; - - my $pkg = $mod; - $pkg =~ s{/}{::}g; - $pkg =~ s{\.pm$}{}i; - - local $@; - eval { require $mod; $pkg->VERSION($ver || 0); 1 }; -} - -# Check if we can run some command -sub can_run { - my ($self, $cmd) = @_; - - my $_cmd = $cmd; - return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); - - for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { - next if $dir eq ''; - require File::Spec; - my $abs = File::Spec->catfile($dir, $cmd); - return $abs if (-x $abs or $abs = MM->maybe_command($abs)); - } - - return; -} - -# Can our C compiler environment build XS files -sub can_xs { - my $self = shift; - - # Ensure we have the CBuilder module - $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 ); - - # Do we have the configure_requires checker? - local $@; - eval "require ExtUtils::CBuilder;"; - if ( $@ ) { - # They don't obey configure_requires, so it is - # someone old and delicate. Try to avoid hurting - # them by falling back to an older simpler test. - return $self->can_cc(); - } - - # Do we have a working C compiler - my $builder = ExtUtils::CBuilder->new( - quiet => 1, - ); - unless ( $builder->have_compiler ) { - # No working C compiler - return 0; - } - - # Write a C file representative of what XS becomes - require File::Temp; - my ( $FH, $tmpfile ) = File::Temp::tempfile( - "compilexs-XXXXX", - SUFFIX => '.c', - ); - binmode $FH; - print $FH <<'END_C'; -#include "EXTERN.h" -#include "perl.h" -#include "XSUB.h" - -int main(int argc, char **argv) { - return 0; -} - -int boot_sanexs() { - return 1; -} - -END_C - close $FH; - - # Can the C compiler access the same headers XS does - my @libs = (); - my $object = undef; - eval { - local $^W = 0; - $object = $builder->compile( - source => $tmpfile, - ); - @libs = $builder->link( - objects => $object, - module_name => 'sanexs', - ); - }; - my $result = $@ ? 0 : 1; - - # Clean up all the build files - foreach ( $tmpfile, $object, @libs ) { - next unless defined $_; - 1 while unlink; - } - - return $result; -} - -# Can we locate a (the) C compiler -sub can_cc { - my $self = shift; - - if ($^O eq 'VMS') { - require ExtUtils::CBuilder; - my $builder = ExtUtils::CBuilder->new( - quiet => 1, - ); - return $builder->have_compiler; - } - - my @chunks = split(/ /, $Config::Config{cc}) or return; - - # $Config{cc} may contain args; try to find out the program part - while (@chunks) { - return $self->can_run("@chunks") || (pop(@chunks), next); - } - - return; -} - -# Fix Cygwin bug on maybe_command(); -if ( $^O eq 'cygwin' ) { - require ExtUtils::MM_Cygwin; - require ExtUtils::MM_Win32; - if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) { - *ExtUtils::MM_Cygwin::maybe_command = sub { - my ($self, $file) = @_; - if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) { - ExtUtils::MM_Win32->maybe_command($file); - } else { - ExtUtils::MM_Unix->maybe_command($file); - } - } - } -} - -1; - -__END__ - -#line 245 diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/Fetch.pm libsql-translator-perl-1.60/inc/Module/Install/Fetch.pm --- libsql-translator-perl-0.11024/inc/Module/Install/Fetch.pm 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/Fetch.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -#line 1 -package Module::Install::Fetch; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.18'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub get_file { - my ($self, %args) = @_; - my ($scheme, $host, $path, $file) = - $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - - if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) { - $args{url} = $args{ftp_url} - or (warn("LWP support unavailable!\n"), return); - ($scheme, $host, $path, $file) = - $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - } - - $|++; - print "Fetching '$file' from $host... "; - - unless (eval { require Socket; Socket::inet_aton($host) }) { - warn "'$host' resolve failed!\n"; - return; - } - - return unless $scheme eq 'ftp' or $scheme eq 'http'; - - require Cwd; - my $dir = Cwd::getcwd(); - chdir $args{local_dir} or return if exists $args{local_dir}; - - if (eval { require LWP::Simple; 1 }) { - LWP::Simple::mirror($args{url}, $file); - } - elsif (eval { require Net::FTP; 1 }) { eval { - # use Net::FTP to get past firewall - my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600); - $ftp->login("anonymous", 'anonymous@example.com'); - $ftp->cwd($path); - $ftp->binary; - $ftp->get($file) or (warn("$!\n"), return); - $ftp->quit; - } } - elsif (my $ftp = $self->can_run('ftp')) { eval { - # no Net::FTP, fallback to ftp.exe - require FileHandle; - my $fh = FileHandle->new; - - local $SIG{CHLD} = 'IGNORE'; - unless ($fh->open("|$ftp -n")) { - warn "Couldn't open ftp: $!\n"; - chdir $dir; return; - } - - my @dialog = split(/\n/, <<"END_FTP"); -open $host -user anonymous anonymous\@example.com -cd $path -binary -get $file $file -quit -END_FTP - foreach (@dialog) { $fh->print("$_\n") } - $fh->close; - } } - else { - warn "No working 'ftp' program available!\n"; - chdir $dir; return; - } - - unless (-f $file) { - warn "Fetching failed: $@\n"; - chdir $dir; return; - } - - return if exists $args{size} and -s $file != $args{size}; - system($args{run}) if exists $args{run}; - unlink($file) if $args{remove}; - - print(((!exists $args{check_for} or -e $args{check_for}) - ? "done!" : "failed! ($!)"), "\n"); - chdir $dir; return !$?; -} - -1; diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/Include.pm libsql-translator-perl-1.60/inc/Module/Install/Include.pm --- libsql-translator-perl-0.11024/inc/Module/Install/Include.pm 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/Include.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#line 1 -package Module::Install::Include; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.18'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub include { - shift()->admin->include(@_); -} - -sub include_deps { - shift()->admin->include_deps(@_); -} - -sub auto_include { - shift()->admin->auto_include(@_); -} - -sub auto_include_deps { - shift()->admin->auto_include_deps(@_); -} - -sub auto_include_dependent_dists { - shift()->admin->auto_include_dependent_dists(@_); -} - -1; diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/Makefile.pm libsql-translator-perl-1.60/inc/Module/Install/Makefile.pm --- libsql-translator-perl-0.11024/inc/Module/Install/Makefile.pm 2018-01-09 10:24:43.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/Makefile.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,418 +0,0 @@ -#line 1 -package Module::Install::Makefile; - -use strict 'vars'; -use ExtUtils::MakeMaker (); -use Module::Install::Base (); -use Fcntl qw/:flock :seek/; - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.18'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub Makefile { $_[0] } - -my %seen = (); - -sub prompt { - shift; - - # Infinite loop protection - my @c = caller(); - if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { - die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; - } - - # In automated testing or non-interactive session, always use defaults - if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) { - local $ENV{PERL_MM_USE_DEFAULT} = 1; - goto &ExtUtils::MakeMaker::prompt; - } else { - goto &ExtUtils::MakeMaker::prompt; - } -} - -# Store a cleaned up version of the MakeMaker version, -# since we need to behave differently in a variety of -# ways based on the MM version. -my $makemaker = eval $ExtUtils::MakeMaker::VERSION; - -# If we are passed a param, do a "newer than" comparison. -# Otherwise, just return the MakeMaker version. -sub makemaker { - ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0 -} - -# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified -# as we only need to know here whether the attribute is an array -# or a hash or something else (which may or may not be appendable). -my %makemaker_argtype = ( - C => 'ARRAY', - CONFIG => 'ARRAY', -# CONFIGURE => 'CODE', # ignore - DIR => 'ARRAY', - DL_FUNCS => 'HASH', - DL_VARS => 'ARRAY', - EXCLUDE_EXT => 'ARRAY', - EXE_FILES => 'ARRAY', - FUNCLIST => 'ARRAY', - H => 'ARRAY', - IMPORTS => 'HASH', - INCLUDE_EXT => 'ARRAY', - LIBS => 'ARRAY', # ignore '' - MAN1PODS => 'HASH', - MAN3PODS => 'HASH', - META_ADD => 'HASH', - META_MERGE => 'HASH', - PL_FILES => 'HASH', - PM => 'HASH', - PMLIBDIRS => 'ARRAY', - PMLIBPARENTDIRS => 'ARRAY', - PREREQ_PM => 'HASH', - CONFIGURE_REQUIRES => 'HASH', - SKIP => 'ARRAY', - TYPEMAPS => 'ARRAY', - XS => 'HASH', -# VERSION => ['version',''], # ignore -# _KEEP_AFTER_FLUSH => '', - - clean => 'HASH', - depend => 'HASH', - dist => 'HASH', - dynamic_lib=> 'HASH', - linkext => 'HASH', - macro => 'HASH', - postamble => 'HASH', - realclean => 'HASH', - test => 'HASH', - tool_autosplit => 'HASH', - - # special cases where you can use makemaker_append - CCFLAGS => 'APPENDABLE', - DEFINE => 'APPENDABLE', - INC => 'APPENDABLE', - LDDLFLAGS => 'APPENDABLE', - LDFROM => 'APPENDABLE', -); - -sub makemaker_args { - my ($self, %new_args) = @_; - my $args = ( $self->{makemaker_args} ||= {} ); - foreach my $key (keys %new_args) { - if ($makemaker_argtype{$key}) { - if ($makemaker_argtype{$key} eq 'ARRAY') { - $args->{$key} = [] unless defined $args->{$key}; - unless (ref $args->{$key} eq 'ARRAY') { - $args->{$key} = [$args->{$key}] - } - push @{$args->{$key}}, - ref $new_args{$key} eq 'ARRAY' - ? @{$new_args{$key}} - : $new_args{$key}; - } - elsif ($makemaker_argtype{$key} eq 'HASH') { - $args->{$key} = {} unless defined $args->{$key}; - foreach my $skey (keys %{ $new_args{$key} }) { - $args->{$key}{$skey} = $new_args{$key}{$skey}; - } - } - elsif ($makemaker_argtype{$key} eq 'APPENDABLE') { - $self->makemaker_append($key => $new_args{$key}); - } - } - else { - if (defined $args->{$key}) { - warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n}; - } - $args->{$key} = $new_args{$key}; - } - } - return $args; -} - -# For mm args that take multiple space-separated args, -# append an argument to the current list. -sub makemaker_append { - my $self = shift; - my $name = shift; - my $args = $self->makemaker_args; - $args->{$name} = defined $args->{$name} - ? join( ' ', $args->{$name}, @_ ) - : join( ' ', @_ ); -} - -sub build_subdirs { - my $self = shift; - my $subdirs = $self->makemaker_args->{DIR} ||= []; - for my $subdir (@_) { - push @$subdirs, $subdir; - } -} - -sub clean_files { - my $self = shift; - my $clean = $self->makemaker_args->{clean} ||= {}; - %$clean = ( - %$clean, - FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), - ); -} - -sub realclean_files { - my $self = shift; - my $realclean = $self->makemaker_args->{realclean} ||= {}; - %$realclean = ( - %$realclean, - FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), - ); -} - -sub libs { - my $self = shift; - my $libs = ref $_[0] ? shift : [ shift ]; - $self->makemaker_args( LIBS => $libs ); -} - -sub inc { - my $self = shift; - $self->makemaker_args( INC => shift ); -} - -sub _wanted_t { -} - -sub tests_recursive { - my $self = shift; - my $dir = shift || 't'; - unless ( -d $dir ) { - die "tests_recursive dir '$dir' does not exist"; - } - my %tests = map { $_ => 1 } split / /, ($self->tests || ''); - require File::Find; - File::Find::find( - sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 }, - $dir - ); - $self->tests( join ' ', sort keys %tests ); -} - -sub write { - my $self = shift; - die "&Makefile->write() takes no arguments\n" if @_; - - # Check the current Perl version - my $perl_version = $self->perl_version; - if ( $perl_version ) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, " - . "but we need version >= $perl_version"; - } - - # Make sure we have a new enough MakeMaker - require ExtUtils::MakeMaker; - - if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) { - # This previous attempted to inherit the version of - # ExtUtils::MakeMaker in use by the module author, but this - # was found to be untenable as some authors build releases - # using future dev versions of EU:MM that nobody else has. - # Instead, #toolchain suggests we use 6.59 which is the most - # stable version on CPAN at time of writing and is, to quote - # ribasushi, "not terminally fucked, > and tested enough". - # TODO: We will now need to maintain this over time to push - # the version up as new versions are released. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 ); - $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 ); - } else { - # Allow legacy-compatibility with 5.005 by depending on the - # most recent EU:MM that supported 5.005. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 ); - $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 ); - } - - # Generate the MakeMaker params - my $args = $self->makemaker_args; - $args->{DISTNAME} = $self->name; - $args->{NAME} = $self->module_name || $self->name; - $args->{NAME} =~ s/-/::/g; - $args->{VERSION} = $self->version or die <<'EOT'; -ERROR: Can't determine distribution version. Please specify it -explicitly via 'version' in Makefile.PL, or set a valid $VERSION -in a module, and provide its file path via 'version_from' (or -'all_from' if you prefer) in Makefile.PL. -EOT - - if ( $self->tests ) { - my @tests = split ' ', $self->tests; - my %seen; - $args->{test} = { - TESTS => (join ' ', grep {!$seen{$_}++} @tests), - }; - } elsif ( $Module::Install::ExtraTests::use_extratests ) { - # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness. - # So, just ignore our xt tests here. - } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) { - $args->{test} = { - TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ), - }; - } - if ( $] >= 5.005 ) { - $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = join ', ', @{$self->author || []}; - } - if ( $self->makemaker(6.10) ) { - $args->{NO_META} = 1; - #$args->{NO_MYMETA} = 1; - } - if ( $self->makemaker(6.17) and $self->sign ) { - $args->{SIGN} = 1; - } - unless ( $self->is_admin ) { - delete $args->{SIGN}; - } - if ( $self->makemaker(6.31) and $self->license ) { - $args->{LICENSE} = $self->license; - } - - my $prereq = ($args->{PREREQ_PM} ||= {}); - %$prereq = ( %$prereq, - map { @$_ } # flatten [module => version] - map { @$_ } - grep $_, - ($self->requires) - ); - - # Remove any reference to perl, PREREQ_PM doesn't support it - delete $args->{PREREQ_PM}->{perl}; - - # Merge both kinds of requires into BUILD_REQUIRES - my $build_prereq = ($args->{BUILD_REQUIRES} ||= {}); - %$build_prereq = ( %$build_prereq, - map { @$_ } # flatten [module => version] - map { @$_ } - grep $_, - ($self->configure_requires, $self->build_requires) - ); - - # Remove any reference to perl, BUILD_REQUIRES doesn't support it - delete $args->{BUILD_REQUIRES}->{perl}; - - # Delete bundled dists from prereq_pm, add it to Makefile DIR - my $subdirs = ($args->{DIR} || []); - if ($self->bundles) { - my %processed; - foreach my $bundle (@{ $self->bundles }) { - my ($mod_name, $dist_dir) = @$bundle; - delete $prereq->{$mod_name}; - $dist_dir = File::Basename::basename($dist_dir); # dir for building this module - if (not exists $processed{$dist_dir}) { - if (-d $dist_dir) { - # List as sub-directory to be processed by make - push @$subdirs, $dist_dir; - } - # Else do nothing: the module is already present on the system - $processed{$dist_dir} = undef; - } - } - } - - unless ( $self->makemaker('6.55_03') ) { - %$prereq = (%$prereq,%$build_prereq); - delete $args->{BUILD_REQUIRES}; - } - - if ( my $perl_version = $self->perl_version ) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, " - . "but we need version >= $perl_version"; - - if ( $self->makemaker(6.48) ) { - $args->{MIN_PERL_VERSION} = $perl_version; - } - } - - if ($self->installdirs) { - warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS}; - $args->{INSTALLDIRS} = $self->installdirs; - } - - my %args = map { - ( $_ => $args->{$_} ) } grep {defined($args->{$_} ) - } keys %$args; - - my $user_preop = delete $args{dist}->{PREOP}; - if ( my $preop = $self->admin->preop($user_preop) ) { - foreach my $key ( keys %$preop ) { - $args{dist}->{$key} = $preop->{$key}; - } - } - - my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); - $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); -} - -sub fix_up_makefile { - my $self = shift; - my $makefile_name = shift; - my $top_class = ref($self->_top) || ''; - my $top_version = $self->_top->VERSION || ''; - - my $preamble = $self->preamble - ? "# Preamble by $top_class $top_version\n" - . $self->preamble - : ''; - my $postamble = "# Postamble by $top_class $top_version\n" - . ($self->postamble || ''); - - local *MAKEFILE; - open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; - eval { flock MAKEFILE, LOCK_EX }; - my $makefile = do { local $/; }; - - $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; - $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; - $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; - $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; - $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; - - # Module::Install will never be used to build the Core Perl - # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks - # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist - $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; - #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; - - # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. - $makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g; - - # XXX - This is currently unused; not sure if it breaks other MM-users - # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; - - seek MAKEFILE, 0, SEEK_SET; - truncate MAKEFILE, 0; - print MAKEFILE "$preamble$makefile$postamble" or die $!; - close MAKEFILE or die $!; - - 1; -} - -sub preamble { - my ($self, $text) = @_; - $self->{preamble} = $text . $self->{preamble} if defined $text; - $self->{preamble}; -} - -sub postamble { - my ($self, $text) = @_; - $self->{postamble} ||= $self->admin->postamble; - $self->{postamble} .= $text if defined $text; - $self->{postamble} -} - -1; - -__END__ - -#line 544 diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/Metadata.pm libsql-translator-perl-1.60/inc/Module/Install/Metadata.pm --- libsql-translator-perl-0.11024/inc/Module/Install/Metadata.pm 2018-01-09 10:24:43.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/Metadata.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,722 +0,0 @@ -#line 1 -package Module::Install::Metadata; - -use strict 'vars'; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.18'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -my @boolean_keys = qw{ - sign -}; - -my @scalar_keys = qw{ - name - module_name - abstract - version - distribution_type - tests - installdirs -}; - -my @tuple_keys = qw{ - configure_requires - build_requires - requires - recommends - bundles - resources -}; - -my @resource_keys = qw{ - homepage - bugtracker - repository -}; - -my @array_keys = qw{ - keywords - author -}; - -*authors = \&author; - -sub Meta { shift } -sub Meta_BooleanKeys { @boolean_keys } -sub Meta_ScalarKeys { @scalar_keys } -sub Meta_TupleKeys { @tuple_keys } -sub Meta_ResourceKeys { @resource_keys } -sub Meta_ArrayKeys { @array_keys } - -foreach my $key ( @boolean_keys ) { - *$key = sub { - my $self = shift; - if ( defined wantarray and not @_ ) { - return $self->{values}->{$key}; - } - $self->{values}->{$key} = ( @_ ? $_[0] : 1 ); - return $self; - }; -} - -foreach my $key ( @scalar_keys ) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} if defined wantarray and !@_; - $self->{values}->{$key} = shift; - return $self; - }; -} - -foreach my $key ( @array_keys ) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} if defined wantarray and !@_; - $self->{values}->{$key} ||= []; - push @{$self->{values}->{$key}}, @_; - return $self; - }; -} - -foreach my $key ( @resource_keys ) { - *$key = sub { - my $self = shift; - unless ( @_ ) { - return () unless $self->{values}->{resources}; - return map { $_->[1] } - grep { $_->[0] eq $key } - @{ $self->{values}->{resources} }; - } - return $self->{values}->{resources}->{$key} unless @_; - my $uri = shift or die( - "Did not provide a value to $key()" - ); - $self->resources( $key => $uri ); - return 1; - }; -} - -foreach my $key ( grep { $_ ne "resources" } @tuple_keys) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} unless @_; - my @added; - while ( @_ ) { - my $module = shift or last; - my $version = shift || 0; - push @added, [ $module, $version ]; - } - push @{ $self->{values}->{$key} }, @added; - return map {@$_} @added; - }; -} - -# Resource handling -my %lc_resource = map { $_ => 1 } qw{ - homepage - license - bugtracker - repository -}; - -sub resources { - my $self = shift; - while ( @_ ) { - my $name = shift or last; - my $value = shift or next; - if ( $name eq lc $name and ! $lc_resource{$name} ) { - die("Unsupported reserved lowercase resource '$name'"); - } - $self->{values}->{resources} ||= []; - push @{ $self->{values}->{resources} }, [ $name, $value ]; - } - $self->{values}->{resources}; -} - -# Aliases for build_requires that will have alternative -# meanings in some future version of META.yml. -sub test_requires { shift->build_requires(@_) } -sub install_requires { shift->build_requires(@_) } - -# Aliases for installdirs options -sub install_as_core { $_[0]->installdirs('perl') } -sub install_as_cpan { $_[0]->installdirs('site') } -sub install_as_site { $_[0]->installdirs('site') } -sub install_as_vendor { $_[0]->installdirs('vendor') } - -sub dynamic_config { - my $self = shift; - my $value = @_ ? shift : 1; - if ( $self->{values}->{dynamic_config} ) { - # Once dynamic we never change to static, for safety - return 0; - } - $self->{values}->{dynamic_config} = $value ? 1 : 0; - return 1; -} - -# Convenience command -sub static_config { - shift->dynamic_config(0); -} - -sub perl_version { - my $self = shift; - return $self->{values}->{perl_version} unless @_; - my $version = shift or die( - "Did not provide a value to perl_version()" - ); - - # Normalize the version - $version = $self->_perl_version($version); - - # We don't support the really old versions - unless ( $version >= 5.005 ) { - die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; - } - - $self->{values}->{perl_version} = $version; -} - -sub all_from { - my ( $self, $file ) = @_; - - unless ( defined($file) ) { - my $name = $self->name or die( - "all_from called with no args without setting name() first" - ); - $file = join('/', 'lib', split(/-/, $name)) . '.pm'; - $file =~ s{.*/}{} unless -e $file; - unless ( -e $file ) { - die("all_from cannot find $file from $name"); - } - } - unless ( -f $file ) { - die("The path '$file' does not exist, or is not a file"); - } - - $self->{values}{all_from} = $file; - - # Some methods pull from POD instead of code. - # If there is a matching .pod, use that instead - my $pod = $file; - $pod =~ s/\.pm$/.pod/i; - $pod = $file unless -e $pod; - - # Pull the different values - $self->name_from($file) unless $self->name; - $self->version_from($file) unless $self->version; - $self->perl_version_from($file) unless $self->perl_version; - $self->author_from($pod) unless @{$self->author || []}; - $self->license_from($pod) unless $self->license; - $self->abstract_from($pod) unless $self->abstract; - - return 1; -} - -sub provides { - my $self = shift; - my $provides = ( $self->{values}->{provides} ||= {} ); - %$provides = (%$provides, @_) if @_; - return $provides; -} - -sub auto_provides { - my $self = shift; - return $self unless $self->is_admin; - unless (-e 'MANIFEST') { - warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; - return $self; - } - # Avoid spurious warnings as we are not checking manifest here. - local $SIG{__WARN__} = sub {1}; - require ExtUtils::Manifest; - local *ExtUtils::Manifest::manicheck = sub { return }; - - require Module::Build; - my $build = Module::Build->new( - dist_name => $self->name, - dist_version => $self->version, - license => $self->license, - ); - $self->provides( %{ $build->find_dist_packages || {} } ); -} - -sub feature { - my $self = shift; - my $name = shift; - my $features = ( $self->{values}->{features} ||= [] ); - my $mods; - - if ( @_ == 1 and ref( $_[0] ) ) { - # The user used ->feature like ->features by passing in the second - # argument as a reference. Accomodate for that. - $mods = $_[0]; - } else { - $mods = \@_; - } - - my $count = 0; - push @$features, ( - $name => [ - map { - ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_ - } @$mods - ] - ); - - return @$features; -} - -sub features { - my $self = shift; - while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { - $self->feature( $name, @$mods ); - } - return $self->{values}->{features} - ? @{ $self->{values}->{features} } - : (); -} - -sub no_index { - my $self = shift; - my $type = shift; - push @{ $self->{values}->{no_index}->{$type} }, @_ if $type; - return $self->{values}->{no_index}; -} - -sub read { - my $self = shift; - $self->include_deps( 'YAML::Tiny', 0 ); - - require YAML::Tiny; - my $data = YAML::Tiny::LoadFile('META.yml'); - - # Call methods explicitly in case user has already set some values. - while ( my ( $key, $value ) = each %$data ) { - next unless $self->can($key); - if ( ref $value eq 'HASH' ) { - while ( my ( $module, $version ) = each %$value ) { - $self->can($key)->($self, $module => $version ); - } - } else { - $self->can($key)->($self, $value); - } - } - return $self; -} - -sub write { - my $self = shift; - return $self unless $self->is_admin; - $self->admin->write_meta; - return $self; -} - -sub version_from { - require ExtUtils::MM_Unix; - my ( $self, $file ) = @_; - $self->version( ExtUtils::MM_Unix->parse_version($file) ); - - # for version integrity check - $self->makemaker_args( VERSION_FROM => $file ); -} - -sub abstract_from { - require ExtUtils::MM_Unix; - my ( $self, $file ) = @_; - $self->abstract( - bless( - { DISTNAME => $self->name }, - 'ExtUtils::MM_Unix' - )->parse_abstract($file) - ); -} - -# Add both distribution and module name -sub name_from { - my ($self, $file) = @_; - if ( - Module::Install::_read($file) =~ m/ - ^ \s* - package \s* - ([\w:]+) - [\s|;]* - /ixms - ) { - my ($name, $module_name) = ($1, $1); - $name =~ s{::}{-}g; - $self->name($name); - unless ( $self->module_name ) { - $self->module_name($module_name); - } - } else { - die("Cannot determine name from $file\n"); - } -} - -sub _extract_perl_version { - if ( - $_[0] =~ m/ - ^\s* - (?:use|require) \s* - v? - ([\d_\.]+) - \s* ; - /ixms - ) { - my $perl_version = $1; - $perl_version =~ s{_}{}g; - return $perl_version; - } else { - return; - } -} - -sub perl_version_from { - my $self = shift; - my $perl_version=_extract_perl_version(Module::Install::_read($_[0])); - if ($perl_version) { - $self->perl_version($perl_version); - } else { - warn "Cannot determine perl version info from $_[0]\n"; - return; - } -} - -sub author_from { - my $self = shift; - my $content = Module::Install::_read($_[0]); - if ($content =~ m/ - =head \d \s+ (?:authors?)\b \s* - ([^\n]*) - | - =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* - .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* - ([^\n]*) - /ixms) { - my $author = $1 || $2; - - # XXX: ugly but should work anyway... - if (eval "require Pod::Escapes; 1") { - # Pod::Escapes has a mapping table. - # It's in core of perl >= 5.9.3, and should be installed - # as one of the Pod::Simple's prereqs, which is a prereq - # of Pod::Text 3.x (see also below). - $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } - { - defined $2 - ? chr($2) - : defined $Pod::Escapes::Name2character_number{$1} - ? chr($Pod::Escapes::Name2character_number{$1}) - : do { - warn "Unknown escape: E<$1>"; - "E<$1>"; - }; - }gex; - } - elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) { - # Pod::Text < 3.0 has yet another mapping table, - # though the table name of 2.x and 1.x are different. - # (1.x is in core of Perl < 5.6, 2.x is in core of - # Perl < 5.9.3) - my $mapping = ($Pod::Text::VERSION < 2) - ? \%Pod::Text::HTML_Escapes - : \%Pod::Text::ESCAPES; - $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } - { - defined $2 - ? chr($2) - : defined $mapping->{$1} - ? $mapping->{$1} - : do { - warn "Unknown escape: E<$1>"; - "E<$1>"; - }; - }gex; - } - else { - $author =~ s{E}{<}g; - $author =~ s{E}{>}g; - } - $self->author($author); - } else { - warn "Cannot determine author info from $_[0]\n"; - } -} - -#Stolen from M::B -my %license_urls = ( - perl => 'http://dev.perl.org/licenses/', - apache => 'http://apache.org/licenses/LICENSE-2.0', - apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1', - artistic => 'http://opensource.org/licenses/artistic-license.php', - artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', - lgpl => 'http://opensource.org/licenses/lgpl-license.php', - lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', - lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', - bsd => 'http://opensource.org/licenses/bsd-license.php', - gpl => 'http://opensource.org/licenses/gpl-license.php', - gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', - gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', - mit => 'http://opensource.org/licenses/mit-license.php', - mozilla => 'http://opensource.org/licenses/mozilla1.1.php', - open_source => undef, - unrestricted => undef, - restrictive => undef, - unknown => undef, -); - -sub license { - my $self = shift; - return $self->{values}->{license} unless @_; - my $license = shift or die( - 'Did not provide a value to license()' - ); - $license = __extract_license($license) || lc $license; - $self->{values}->{license} = $license; - - # Automatically fill in license URLs - if ( $license_urls{$license} ) { - $self->resources( license => $license_urls{$license} ); - } - - return 1; -} - -sub _extract_license { - my $pod = shift; - my $matched; - return __extract_license( - ($matched) = $pod =~ m/ - (=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?) - (=head \d.*|=cut.*|)\z - /xms - ) || __extract_license( - ($matched) = $pod =~ m/ - (=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?) - (=head \d.*|=cut.*|)\z - /xms - ); -} - -sub __extract_license { - my $license_text = shift or return; - my @phrases = ( - '(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1, - '(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1, - 'Artistic and GPL' => 'perl', 1, - 'GNU general public license' => 'gpl', 1, - 'GNU public license' => 'gpl', 1, - 'GNU lesser general public license' => 'lgpl', 1, - 'GNU lesser public license' => 'lgpl', 1, - 'GNU library general public license' => 'lgpl', 1, - 'GNU library public license' => 'lgpl', 1, - 'GNU Free Documentation license' => 'unrestricted', 1, - 'GNU Affero General Public License' => 'open_source', 1, - '(?:Free)?BSD license' => 'bsd', 1, - 'Artistic license 2\.0' => 'artistic_2', 1, - 'Artistic license' => 'artistic', 1, - 'Apache (?:Software )?license' => 'apache', 1, - 'GPL' => 'gpl', 1, - 'LGPL' => 'lgpl', 1, - 'BSD' => 'bsd', 1, - 'Artistic' => 'artistic', 1, - 'MIT' => 'mit', 1, - 'Mozilla Public License' => 'mozilla', 1, - 'Q Public License' => 'open_source', 1, - 'OpenSSL License' => 'unrestricted', 1, - 'SSLeay License' => 'unrestricted', 1, - 'zlib License' => 'open_source', 1, - 'proprietary' => 'proprietary', 0, - ); - while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { - $pattern =~ s#\s+#\\s+#gs; - if ( $license_text =~ /\b$pattern\b/i ) { - return $license; - } - } - return ''; -} - -sub license_from { - my $self = shift; - if (my $license=_extract_license(Module::Install::_read($_[0]))) { - $self->license($license); - } else { - warn "Cannot determine license info from $_[0]\n"; - return 'unknown'; - } -} - -sub _extract_bugtracker { - my @links = $_[0] =~ m#L<( - https?\Q://rt.cpan.org/\E[^>]+| - https?\Q://github.com/\E[\w_]+/[\w_]+/issues| - https?\Q://code.google.com/p/\E[\w_\-]+/issues/list - )>#gx; - my %links; - @links{@links}=(); - @links=keys %links; - return @links; -} - -sub bugtracker_from { - my $self = shift; - my $content = Module::Install::_read($_[0]); - my @links = _extract_bugtracker($content); - unless ( @links ) { - warn "Cannot determine bugtracker info from $_[0]\n"; - return 0; - } - if ( @links > 1 ) { - warn "Found more than one bugtracker link in $_[0]\n"; - return 0; - } - - # Set the bugtracker - bugtracker( $links[0] ); - return 1; -} - -sub requires_from { - my $self = shift; - my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg; - while ( @requires ) { - my $module = shift @requires; - my $version = shift @requires; - $self->requires( $module => $version ); - } -} - -sub test_requires_from { - my $self = shift; - my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; - while ( @requires ) { - my $module = shift @requires; - my $version = shift @requires; - $self->test_requires( $module => $version ); - } -} - -# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to -# numbers (eg, 5.006001 or 5.008009). -# Also, convert double-part versions (eg, 5.8) -sub _perl_version { - my $v = $_[-1]; - $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e; - $v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e; - $v =~ s/(\.\d\d\d)000$/$1/; - $v =~ s/_.+$//; - if ( ref($v) ) { - # Numify - $v = $v + 0; - } - return $v; -} - -sub add_metadata { - my $self = shift; - my %hash = @_; - for my $key (keys %hash) { - warn "add_metadata: $key is not prefixed with 'x_'.\n" . - "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/; - $self->{values}->{$key} = $hash{$key}; - } -} - - -###################################################################### -# MYMETA Support - -sub WriteMyMeta { - die "WriteMyMeta has been deprecated"; -} - -sub write_mymeta_yaml { - my $self = shift; - - # We need YAML::Tiny to write the MYMETA.yml file - unless ( eval { require YAML::Tiny; 1; } ) { - return 1; - } - - # Generate the data - my $meta = $self->_write_mymeta_data or return 1; - - # Save as the MYMETA.yml file - print "Writing MYMETA.yml\n"; - YAML::Tiny::DumpFile('MYMETA.yml', $meta); -} - -sub write_mymeta_json { - my $self = shift; - - # We need JSON to write the MYMETA.json file - unless ( eval { require JSON; 1; } ) { - return 1; - } - - # Generate the data - my $meta = $self->_write_mymeta_data or return 1; - - # Save as the MYMETA.yml file - print "Writing MYMETA.json\n"; - Module::Install::_write( - 'MYMETA.json', - JSON->new->pretty(1)->canonical->encode($meta), - ); -} - -sub _write_mymeta_data { - my $self = shift; - - # If there's no existing META.yml there is nothing we can do - return undef unless -f 'META.yml'; - - # We need Parse::CPAN::Meta to load the file - unless ( eval { require Parse::CPAN::Meta; 1; } ) { - return undef; - } - - # Merge the perl version into the dependencies - my $val = $self->Meta->{values}; - my $perl = delete $val->{perl_version}; - if ( $perl ) { - $val->{requires} ||= []; - my $requires = $val->{requires}; - - # Canonize to three-dot version after Perl 5.6 - if ( $perl >= 5.006 ) { - $perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e - } - unshift @$requires, [ perl => $perl ]; - } - - # Load the advisory META.yml file - my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); - my $meta = $yaml[0]; - - # Overwrite the non-configure dependency hashes - delete $meta->{requires}; - delete $meta->{build_requires}; - delete $meta->{recommends}; - if ( exists $val->{requires} ) { - $meta->{requires} = { map { @$_ } @{ $val->{requires} } }; - } - if ( exists $val->{build_requires} ) { - $meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } }; - } - - return $meta; -} - -1; diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/ReadmeFromPod.pm libsql-translator-perl-1.60/inc/Module/Install/ReadmeFromPod.pm --- libsql-translator-perl-0.11024/inc/Module/Install/ReadmeFromPod.pm 2018-01-09 10:24:43.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/ReadmeFromPod.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,184 +0,0 @@ -#line 1 -package Module::Install::ReadmeFromPod; - -use 5.006; -use strict; -use warnings; -use base qw(Module::Install::Base); -use vars qw($VERSION); - -$VERSION = '0.30'; - -{ - - # these aren't defined until after _require_admin is run, so - # define them so prototypes are available during compilation. - sub io; - sub capture(&;@); - -#line 28 - - my $done = 0; - - sub _require_admin { - - # do this once to avoid redefinition warnings from IO::All - return if $done; - - require IO::All; - IO::All->import( '-binary' ); - - require Capture::Tiny; - Capture::Tiny->import ( 'capture' ); - - return; - } - -} - -sub readme_from { - my $self = shift; - return unless $self->is_admin; - - _require_admin; - - # Input file - my $in_file = shift || $self->_all_from - or die "Can't determine file to make readme_from"; - - # Get optional arguments - my ($clean, $format, $out_file, $options); - my $args = shift; - if ( ref $args ) { - # Arguments are in a hashref - if ( ref($args) ne 'HASH' ) { - die "Expected a hashref but got a ".ref($args)."\n"; - } else { - $clean = $args->{'clean'}; - $format = $args->{'format'}; - $out_file = $args->{'output_file'}; - $options = $args->{'options'}; - } - } else { - # Arguments are in a list - $clean = $args; - $format = shift; - $out_file = shift; - $options = \@_; - } - - # Default values; - $clean ||= 0; - $format ||= 'txt'; - - # Generate README - print "readme_from $in_file to $format\n"; - if ($format =~ m/te?xt/) { - $out_file = $self->_readme_txt($in_file, $out_file, $options); - } elsif ($format =~ m/html?/) { - $out_file = $self->_readme_htm($in_file, $out_file, $options); - } elsif ($format eq 'man') { - $out_file = $self->_readme_man($in_file, $out_file, $options); - } elsif ($format eq 'md') { - $out_file = $self->_readme_md($in_file, $out_file, $options); - } elsif ($format eq 'pdf') { - $out_file = $self->_readme_pdf($in_file, $out_file, $options); - } - - if ($clean) { - $self->clean_files($out_file); - } - - return 1; -} - - -sub _readme_txt { - my ($self, $in_file, $out_file, $options) = @_; - $out_file ||= 'README'; - require Pod::Text; - my $parser = Pod::Text->new( @$options ); - my $io = io->file($out_file)->open(">"); - my $out_fh = $io->io_handle; - $parser->output_fh( *$out_fh ); - $parser->parse_file( $in_file ); - return $out_file; -} - - -sub _readme_htm { - my ($self, $in_file, $out_file, $options) = @_; - $out_file ||= 'README.htm'; - require Pod::Html; - my ($o) = capture { - Pod::Html::pod2html( - "--infile=$in_file", - "--outfile=-", - @$options, - ); - }; - io->file($out_file)->print($o); - # Remove temporary files if needed - for my $file ('pod2htmd.tmp', 'pod2htmi.tmp') { - if (-e $file) { - unlink $file or warn "Warning: Could not remove file '$file'.\n$!\n"; - } - } - return $out_file; -} - - -sub _readme_man { - my ($self, $in_file, $out_file, $options) = @_; - $out_file ||= 'README.1'; - require Pod::Man; - my $parser = Pod::Man->new( @$options ); - my $io = io->file($out_file)->open(">"); - my $out_fh = $io->io_handle; - $parser->output_fh( *$out_fh ); - $parser->parse_file( $in_file ); - return $out_file; -} - - -sub _readme_pdf { - my ($self, $in_file, $out_file, $options) = @_; - $out_file ||= 'README.pdf'; - eval { require App::pod2pdf; } - or die "Could not generate $out_file because pod2pdf could not be found\n"; - my $parser = App::pod2pdf->new( @$options ); - $parser->parse_from_file($in_file); - my ($o) = capture { $parser->output }; - io->file($out_file)->print($o); - return $out_file; -} - -sub _readme_md { - my ($self, $in_file, $out_file, $options) = @_; - $out_file ||= 'README.md'; - require Pod::Markdown; - my $parser = Pod::Markdown->new( @$options ); - my $io = io->file($out_file)->open(">"); - my $out_fh = $io->io_handle; - $parser->output_fh( *$out_fh ); - $parser->parse_file( $in_file ); - return $out_file; -} - - -sub _all_from { - my $self = shift; - return unless $self->admin->{extensions}; - my ($metadata) = grep { - ref($_) eq 'Module::Install::Metadata'; - } @{$self->admin->{extensions}}; - return unless $metadata; - return $metadata->{values}{all_from} || ''; -} - -'Readme!'; - -__END__ - -#line 316 - diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/Scripts.pm libsql-translator-perl-1.60/inc/Module/Install/Scripts.pm --- libsql-translator-perl-0.11024/inc/Module/Install/Scripts.pm 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/Scripts.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -#line 1 -package Module::Install::Scripts; - -use strict 'vars'; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.18'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub install_script { - my $self = shift; - my $args = $self->makemaker_args; - my $exe = $args->{EXE_FILES} ||= []; - foreach ( @_ ) { - if ( -f $_ ) { - push @$exe, $_; - } elsif ( -d 'script' and -f "script/$_" ) { - push @$exe, "script/$_"; - } else { - die("Cannot find script '$_'"); - } - } -} - -1; diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/Share.pm libsql-translator-perl-1.60/inc/Module/Install/Share.pm --- libsql-translator-perl-0.11024/inc/Module/Install/Share.pm 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/Share.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -#line 1 -package Module::Install::Share; - -use strict; -use Module::Install::Base (); -use File::Find (); -use ExtUtils::Manifest (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.18'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub install_share { - my $self = shift; - my $dir = @_ ? pop : 'share'; - my $type = @_ ? shift : 'dist'; - unless ( defined $type and $type eq 'module' or $type eq 'dist' ) { - die "Illegal or invalid share dir type '$type'"; - } - unless ( defined $dir and -d $dir ) { - require Carp; - Carp::croak("Illegal or missing directory install_share param: '$dir'"); - } - - # Split by type - my $S = ($^O eq 'MSWin32') ? "\\" : "\/"; - - my $root; - if ( $type eq 'dist' ) { - die "Too many parameters to install_share" if @_; - - # Set up the install - $root = "\$(INST_LIB)${S}auto${S}share${S}dist${S}\$(DISTNAME)"; - } else { - my $module = Module::Install::_CLASS($_[0]); - unless ( defined $module ) { - die "Missing or invalid module name '$_[0]'"; - } - $module =~ s/::/-/g; - - $root = "\$(INST_LIB)${S}auto${S}share${S}module${S}$module"; - } - - my $manifest = -r 'MANIFEST' ? ExtUtils::Manifest::maniread() : undef; - my $skip_checker = $ExtUtils::Manifest::VERSION >= 1.54 - ? ExtUtils::Manifest::maniskip() - : ExtUtils::Manifest::_maniskip(); - my $postamble = ''; - my $perm_dir = eval($ExtUtils::MakeMaker::VERSION) >= 6.52 ? '$(PERM_DIR)' : 755; - File::Find::find({ - no_chdir => 1, - wanted => sub { - my $path = File::Spec->abs2rel($_, $dir); - if (-d $_) { - return if $skip_checker->($File::Find::name); - $postamble .=<<"END"; -\t\$(NOECHO) \$(MKPATH) "$root${S}$path" -\t\$(NOECHO) \$(CHMOD) $perm_dir "$root${S}$path" -END - } - else { - return if ref $manifest - && !exists $manifest->{$File::Find::name}; - return if $skip_checker->($File::Find::name); - $postamble .=<<"END"; -\t\$(NOECHO) \$(CP) "$dir${S}$path" "$root${S}$path" -END - } - }, - }, $dir); - - # Set up the install - $self->postamble(<<"END_MAKEFILE"); -config :: -$postamble - -END_MAKEFILE - - # The above appears to behave incorrectly when used with old versions - # of ExtUtils::Install (known-bad on RHEL 3, with 5.8.0) - # So when we need to install a share directory, make sure we add a - # dependency on a moderately new version of ExtUtils::MakeMaker. - $self->build_requires( 'ExtUtils::MakeMaker' => '6.11' ); - - # 99% of the time we don't want to index a shared dir - $self->no_index( directory => $dir ); -} - -1; - -__END__ - -#line 154 diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/Win32.pm libsql-translator-perl-1.60/inc/Module/Install/Win32.pm --- libsql-translator-perl-0.11024/inc/Module/Install/Win32.pm 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/Win32.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -#line 1 -package Module::Install::Win32; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.18'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# determine if the user needs nmake, and download it if needed -sub check_nmake { - my $self = shift; - $self->load('can_run'); - $self->load('get_file'); - - require Config; - return unless ( - $^O eq 'MSWin32' and - $Config::Config{make} and - $Config::Config{make} =~ /^nmake\b/i and - ! $self->can_run('nmake') - ); - - print "The required 'nmake' executable not found, fetching it...\n"; - - require File::Basename; - my $rv = $self->get_file( - url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe', - ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe', - local_dir => File::Basename::dirname($^X), - size => 51928, - run => 'Nmake15.exe /o > nul', - check_for => 'Nmake.exe', - remove => 1, - ); - - die <<'END_MESSAGE' unless $rv; - -------------------------------------------------------------------------------- - -Since you are using Microsoft Windows, you will need the 'nmake' utility -before installation. It's available at: - - http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe - or - ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe - -Please download the file manually, save it to a directory in %PATH% (e.g. -C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to -that directory, and run "Nmake15.exe" from there; that will create the -'nmake.exe' file needed by this module. - -You may then resume the installation process described in README. - -------------------------------------------------------------------------------- -END_MESSAGE - -} - -1; diff -Nru libsql-translator-perl-0.11024/inc/Module/Install/WriteAll.pm libsql-translator-perl-1.60/inc/Module/Install/WriteAll.pm --- libsql-translator-perl-0.11024/inc/Module/Install/WriteAll.pm 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install/WriteAll.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -#line 1 -package Module::Install::WriteAll; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.18'; - @ISA = qw{Module::Install::Base}; - $ISCORE = 1; -} - -sub WriteAll { - my $self = shift; - my %args = ( - meta => 1, - sign => 0, - inline => 0, - check_nmake => 1, - @_, - ); - - $self->sign(1) if $args{sign}; - $self->admin->WriteAll(%args) if $self->is_admin; - - $self->check_nmake if $args{check_nmake}; - unless ( $self->makemaker_args->{PL_FILES} ) { - # XXX: This still may be a bit over-defensive... - unless ($self->makemaker(6.25)) { - $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL'; - } - } - - # Until ExtUtils::MakeMaker support MYMETA.yml, make sure - # we clean it up properly ourself. - $self->realclean_files('MYMETA.yml'); - - if ( $args{inline} ) { - $self->Inline->write; - } else { - $self->Makefile->write; - } - - # The Makefile write process adds a couple of dependencies, - # so write the META.yml files after the Makefile. - if ( $args{meta} ) { - $self->Meta->write; - } - - # Experimental support for MYMETA - if ( $ENV{X_MYMETA} ) { - if ( $ENV{X_MYMETA} eq 'JSON' ) { - $self->Meta->write_mymeta_json; - } else { - $self->Meta->write_mymeta_yaml; - } - } - - return 1; -} - -1; diff -Nru libsql-translator-perl-0.11024/inc/Module/Install.pm libsql-translator-perl-1.60/inc/Module/Install.pm --- libsql-translator-perl-0.11024/inc/Module/Install.pm 2018-01-09 10:24:43.000000000 +0000 +++ libsql-translator-perl-1.60/inc/Module/Install.pm 1970-01-01 00:00:00.000000000 +0000 @@ -1,451 +0,0 @@ -#line 1 -package Module::Install; - -# For any maintainers: -# The load order for Module::Install is a bit magic. -# It goes something like this... -# -# IF ( host has Module::Install installed, creating author mode ) { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install -# 3. The installed version of inc::Module::Install loads -# 4. inc::Module::Install calls "require Module::Install" -# 5. The ./inc/ version of Module::Install loads -# } ELSE { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install -# 3. The ./inc/ version of Module::Install loads -# } - -use 5.006; -use strict 'vars'; -use Cwd (); -use File::Find (); -use File::Path (); - -use vars qw{$VERSION $MAIN}; -BEGIN { - # All Module::Install core packages now require synchronised versions. - # This will be used to ensure we don't accidentally load old or - # different versions of modules. - # This is not enforced yet, but will be some time in the next few - # releases once we can make sure it won't clash with custom - # Module::Install extensions. - $VERSION = '1.18'; - - # Storage for the pseudo-singleton - $MAIN = undef; - - *inc::Module::Install::VERSION = *VERSION; - @inc::Module::Install::ISA = __PACKAGE__; - -} - -sub import { - my $class = shift; - my $self = $class->new(@_); - my $who = $self->_caller; - - #------------------------------------------------------------- - # all of the following checks should be included in import(), - # to allow "eval 'require Module::Install; 1' to test - # installation of Module::Install. (RT #51267) - #------------------------------------------------------------- - - # Whether or not inc::Module::Install is actually loaded, the - # $INC{inc/Module/Install.pm} is what will still get set as long as - # the caller loaded module this in the documented manner. - # If not set, the caller may NOT have loaded the bundled version, and thus - # they may not have a MI version that works with the Makefile.PL. This would - # result in false errors or unexpected behaviour. And we don't want that. - my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; - unless ( $INC{$file} ) { die <<"END_DIE" } - -Please invoke ${\__PACKAGE__} with: - - use inc::${\__PACKAGE__}; - -not: - - use ${\__PACKAGE__}; - -END_DIE - - # This reportedly fixes a rare Win32 UTC file time issue, but - # as this is a non-cross-platform XS module not in the core, - # we shouldn't really depend on it. See RT #24194 for detail. - # (Also, this module only supports Perl 5.6 and above). - eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006; - - # If the script that is loading Module::Install is from the future, - # then make will detect this and cause it to re-run over and over - # again. This is bad. Rather than taking action to touch it (which - # is unreliable on some platforms and requires write permissions) - # for now we should catch this and refuse to run. - if ( -f $0 ) { - my $s = (stat($0))[9]; - - # If the modification time is only slightly in the future, - # sleep briefly to remove the problem. - my $a = $s - time; - if ( $a > 0 and $a < 5 ) { sleep 5 } - - # Too far in the future, throw an error. - my $t = time; - if ( $s > $t ) { die <<"END_DIE" } - -Your installer $0 has a modification time in the future ($s > $t). - -This is known to create infinite loops in make. - -Please correct this, then run $0 again. - -END_DIE - } - - - # Build.PL was formerly supported, but no longer is due to excessive - # difficulty in implementing every single feature twice. - if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } - -Module::Install no longer supports Build.PL. - -It was impossible to maintain duel backends, and has been deprecated. - -Please remove all Build.PL files and only use the Makefile.PL installer. - -END_DIE - - #------------------------------------------------------------- - - # To save some more typing in Module::Install installers, every... - # use inc::Module::Install - # ...also acts as an implicit use strict. - $^H |= strict::bits(qw(refs subs vars)); - - #------------------------------------------------------------- - - unless ( -f $self->{file} ) { - foreach my $key (keys %INC) { - delete $INC{$key} if $key =~ /Module\/Install/; - } - - local $^W; - require "$self->{path}/$self->{dispatch}.pm"; - File::Path::mkpath("$self->{prefix}/$self->{author}"); - $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); - $self->{admin}->init; - @_ = ($class, _self => $self); - goto &{"$self->{name}::import"}; - } - - local $^W; - *{"${who}::AUTOLOAD"} = $self->autoload; - $self->preload; - - # Unregister loader and worker packages so subdirs can use them again - delete $INC{'inc/Module/Install.pm'}; - delete $INC{'Module/Install.pm'}; - - # Save to the singleton - $MAIN = $self; - - return 1; -} - -sub autoload { - my $self = shift; - my $who = $self->_caller; - my $cwd = Cwd::getcwd(); - my $sym = "${who}::AUTOLOAD"; - $sym->{$cwd} = sub { - my $pwd = Cwd::getcwd(); - if ( my $code = $sym->{$pwd} ) { - # Delegate back to parent dirs - goto &$code unless $cwd eq $pwd; - } - unless ($$sym =~ s/([^:]+)$//) { - # XXX: it looks like we can't retrieve the missing function - # via $$sym (usually $main::AUTOLOAD) in this case. - # I'm still wondering if we should slurp Makefile.PL to - # get some context or not ... - my ($package, $file, $line) = caller; - die <<"EOT"; -Unknown function is found at $file line $line. -Execution of $file aborted due to runtime errors. - -If you're a contributor to a project, you may need to install -some Module::Install extensions from CPAN (or other repository). -If you're a user of a module, please contact the author. -EOT - } - my $method = $1; - if ( uc($method) eq $method ) { - # Do nothing - return; - } elsif ( $method =~ /^_/ and $self->can($method) ) { - # Dispatch to the root M:I class - return $self->$method(@_); - } - - # Dispatch to the appropriate plugin - unshift @_, ( $self, $1 ); - goto &{$self->can('call')}; - }; -} - -sub preload { - my $self = shift; - unless ( $self->{extensions} ) { - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ); - } - - my @exts = @{$self->{extensions}}; - unless ( @exts ) { - @exts = $self->{admin}->load_all_extensions; - } - - my %seen; - foreach my $obj ( @exts ) { - while (my ($method, $glob) = each %{ref($obj) . '::'}) { - next unless $obj->can($method); - next if $method =~ /^_/; - next if $method eq uc($method); - $seen{$method}++; - } - } - - my $who = $self->_caller; - foreach my $name ( sort keys %seen ) { - local $^W; - *{"${who}::$name"} = sub { - ${"${who}::AUTOLOAD"} = "${who}::$name"; - goto &{"${who}::AUTOLOAD"}; - }; - } -} - -sub new { - my ($class, %args) = @_; - - delete $INC{'FindBin.pm'}; - { - # to suppress the redefine warning - local $SIG{__WARN__} = sub {}; - require FindBin; - } - - # ignore the prefix on extension modules built from top level. - my $base_path = Cwd::abs_path($FindBin::Bin); - unless ( Cwd::abs_path(Cwd::getcwd()) eq $base_path ) { - delete $args{prefix}; - } - return $args{_self} if $args{_self}; - - $base_path = VMS::Filespec::unixify($base_path) if $^O eq 'VMS'; - - $args{dispatch} ||= 'Admin'; - $args{prefix} ||= 'inc'; - $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); - $args{bundle} ||= 'inc/BUNDLES'; - $args{base} ||= $base_path; - $class =~ s/^\Q$args{prefix}\E:://; - $args{name} ||= $class; - $args{version} ||= $class->VERSION; - unless ( $args{path} ) { - $args{path} = $args{name}; - $args{path} =~ s!::!/!g; - } - $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; - $args{wrote} = 0; - - bless( \%args, $class ); -} - -sub call { - my ($self, $method) = @_; - my $obj = $self->load($method) or return; - splice(@_, 0, 2, $obj); - goto &{$obj->can($method)}; -} - -sub load { - my ($self, $method) = @_; - - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ) unless $self->{extensions}; - - foreach my $obj (@{$self->{extensions}}) { - return $obj if $obj->can($method); - } - - my $admin = $self->{admin} or die <<"END_DIE"; -The '$method' method does not exist in the '$self->{prefix}' path! -Please remove the '$self->{prefix}' directory and run $0 again to load it. -END_DIE - - my $obj = $admin->load($method, 1); - push @{$self->{extensions}}, $obj; - - $obj; -} - -sub load_extensions { - my ($self, $path, $top) = @_; - - my $should_reload = 0; - unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { - unshift @INC, $self->{prefix}; - $should_reload = 1; - } - - foreach my $rv ( $self->find_extensions($path) ) { - my ($file, $pkg) = @{$rv}; - next if $self->{pathnames}{$pkg}; - - local $@; - my $new = eval { local $^W; require $file; $pkg->can('new') }; - unless ( $new ) { - warn $@ if $@; - next; - } - $self->{pathnames}{$pkg} = - $should_reload ? delete $INC{$file} : $INC{$file}; - push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); - } - - $self->{extensions} ||= []; -} - -sub find_extensions { - my ($self, $path) = @_; - - my @found; - File::Find::find( {no_chdir => 1, wanted => sub { - my $file = $File::Find::name; - return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; - my $subpath = $1; - return if lc($subpath) eq lc($self->{dispatch}); - - $file = "$self->{path}/$subpath.pm"; - my $pkg = "$self->{name}::$subpath"; - $pkg =~ s!/!::!g; - - # If we have a mixed-case package name, assume case has been preserved - # correctly. Otherwise, root through the file to locate the case-preserved - # version of the package name. - if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { - my $content = Module::Install::_read($File::Find::name); - my $in_pod = 0; - foreach ( split /\n/, $content ) { - $in_pod = 1 if /^=\w/; - $in_pod = 0 if /^=cut/; - next if ($in_pod || /^=cut/); # skip pod text - next if /^\s*#/; # and comments - if ( m/^\s*package\s+($pkg)\s*;/i ) { - $pkg = $1; - last; - } - } - } - - push @found, [ $file, $pkg ]; - }}, $path ) if -d $path; - - @found; -} - - - - - -##################################################################### -# Common Utility Functions - -sub _caller { - my $depth = 0; - my $call = caller($depth); - while ( $call eq __PACKAGE__ ) { - $depth++; - $call = caller($depth); - } - return $call; -} - -sub _read { - local *FH; - open( FH, '<', $_[0] ) or die "open($_[0]): $!"; - binmode FH; - my $string = do { local $/; }; - close FH or die "close($_[0]): $!"; - return $string; -} - -sub _readperl { - my $string = Module::Install::_read($_[0]); - $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; - $string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s; - $string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg; - return $string; -} - -sub _readpod { - my $string = Module::Install::_read($_[0]); - $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; - return $string if $_[0] =~ /\.pod\z/; - $string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg; - $string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg; - $string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg; - $string =~ s/^\n+//s; - return $string; -} - -sub _write { - local *FH; - open( FH, '>', $_[0] ) or die "open($_[0]): $!"; - binmode FH; - foreach ( 1 .. $#_ ) { - print FH $_[$_] or die "print($_[0]): $!"; - } - close FH or die "close($_[0]): $!"; -} - -# _version is for processing module versions (eg, 1.03_05) not -# Perl versions (eg, 5.8.1). -sub _version { - my $s = shift || 0; - my $d =()= $s =~ /(\.)/g; - if ( $d >= 2 ) { - # Normalise multipart versions - $s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg; - } - $s =~ s/^(\d+)\.?//; - my $l = $1 || 0; - my @v = map { - $_ . '0' x (3 - length $_) - } $s =~ /(\d{1,3})\D?/g; - $l = $l . '.' . join '', @v if @v; - return $l + 0; -} - -sub _cmp { - _version($_[1]) <=> _version($_[2]); -} - -# Cloned from Params::Util::_CLASS -sub _CLASS { - ( - defined $_[0] - and - ! ref $_[0] - and - $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s - ) ? $_[0] : undef; -} - -1; - -# Copyright 2008 - 2012 Adam Kennedy. diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Filter/DefaultExtra.pm libsql-translator-perl-1.60/lib/SQL/Translator/Filter/DefaultExtra.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Filter/DefaultExtra.pm 2015-06-29 09:00:28.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Filter/DefaultExtra.pm 2019-05-29 18:32:24.000000000 +0000 @@ -33,7 +33,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; sub filter { my $schema = shift; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Filter/Globals.pm libsql-translator-perl-1.60/lib/SQL/Translator/Filter/Globals.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Filter/Globals.pm 2015-06-25 10:42:02.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Filter/Globals.pm 2019-05-29 18:32:24.000000000 +0000 @@ -38,7 +38,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; sub filter { my $schema = shift; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Filter/Names.pm libsql-translator-perl-1.60/lib/SQL/Translator/Filter/Names.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Filter/Names.pm 2015-06-29 09:00:28.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Filter/Names.pm 2019-05-29 18:32:24.000000000 +0000 @@ -29,7 +29,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; sub filter { my $schema = shift; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/Access.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/Access.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/Access.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/Access.pm 2019-05-29 18:32:24.000000000 +0000 @@ -22,7 +22,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; our $DEBUG; $DEBUG = 0 unless defined $DEBUG; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/DB2.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/DB2.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/DB2.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/DB2.pm 2019-05-29 18:32:24.000000000 +0000 @@ -23,7 +23,7 @@ use SQL::Translator::Schema::Constants; our ($DEBUG, $VERSION, @EXPORT_OK ); -# $VERSION = '1.59'; +# $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; sub parse { diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/MySQL.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/MySQL.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/MySQL.pm 2014-10-22 15:45:14.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/MySQL.pm 2019-05-29 18:32:24.000000000 +0000 @@ -24,7 +24,7 @@ use SQL::Translator::Parser::MySQL; our ( $DEBUG, @EXPORT_OK ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; sub parse { diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/Oracle.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/Oracle.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/Oracle.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/Oracle.pm 2019-05-29 18:32:24.000000000 +0000 @@ -22,7 +22,7 @@ use SQL::Translator::Schema::Field; use SQL::Translator::Schema::Constraint; -our $VERSION = '1.59'; +our $VERSION = '1.60'; sub parse { my ( $tr, $dbh ) = @_; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/PostgreSQL.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/PostgreSQL.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/PostgreSQL.pm 2015-01-06 19:04:04.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/PostgreSQL.pm 2019-05-29 18:32:24.000000000 +0000 @@ -21,7 +21,7 @@ use SQL::Translator::Schema::Constants; our ( $DEBUG, @EXPORT_OK ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; my $actions = {c => 'cascade', diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/SQLite.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/SQLite.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/SQLite.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/SQLite.pm 2019-05-29 18:32:24.000000000 +0000 @@ -26,7 +26,7 @@ use Data::Dumper; our ( $DEBUG, @EXPORT_OK ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; sub parse { diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/SQLServer.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/SQLServer.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/SQLServer.pm 2013-10-31 14:12:07.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/SQLServer.pm 2019-05-29 18:32:24.000000000 +0000 @@ -21,7 +21,7 @@ use Data::Dumper; our ( $DEBUG, @EXPORT_OK ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; no strict 'refs'; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/Sybase.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/Sybase.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI/Sybase.pm 2016-03-14 15:50:07.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI/Sybase.pm 2019-05-29 18:32:24.000000000 +0000 @@ -21,7 +21,7 @@ use Data::Dumper; our ( $DEBUG, @EXPORT_OK ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; no strict 'refs'; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/DBI.pm 2017-03-22 11:25:28.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/DBI.pm 2019-05-29 18:32:24.000000000 +0000 @@ -102,7 +102,7 @@ use warnings; use DBI; our @EXPORT; -our $VERSION = '1.59'; +our $VERSION = '1.60'; use constant DRIVERS => { mysql => 'MySQL', diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/Excel.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/Excel.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/Excel.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/Excel.pm 2019-05-29 18:32:24.000000000 +0000 @@ -32,7 +32,7 @@ use warnings; our ($DEBUG, @EXPORT_OK); $DEBUG = 0 unless defined $DEBUG; -our $VERSION = '1.59'; +our $VERSION = '1.60'; use Spreadsheet::ParseExcel; use Exporter; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/JSON.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/JSON.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/JSON.pm 2013-10-31 14:12:07.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/JSON.pm 2019-05-29 18:32:24.000000000 +0000 @@ -2,12 +2,12 @@ use strict; use warnings; -our $VERSION = '1.00'; +our $VERSION = '1.60'; use SQL::Translator::Schema; use SQL::Translator::Utils qw(header_comment); use Data::Dumper; -use JSON; +use JSON::MaybeXS 'from_json'; sub parse { my ($translator, $data) = @_; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/MySQL.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/MySQL.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/MySQL.pm 2015-09-08 17:19:23.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/MySQL.pm 2019-05-29 18:32:24.000000000 +0000 @@ -132,7 +132,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; our $DEBUG; $DEBUG = 0 unless defined $DEBUG; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/Oracle.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/Oracle.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/Oracle.pm 2017-01-26 17:06:48.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/Oracle.pm 2019-05-29 18:32:24.000000000 +0000 @@ -78,7 +78,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; our $DEBUG; $DEBUG = 0 unless defined $DEBUG; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/PostgreSQL.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/PostgreSQL.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/PostgreSQL.pm 2017-05-04 15:04:31.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/PostgreSQL.pm 2019-05-29 18:32:24.000000000 +0000 @@ -89,7 +89,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; our $DEBUG; $DEBUG = 0 unless defined $DEBUG; @@ -1012,8 +1012,12 @@ SQSTRING : "'" /((?:[^']|'')*)/ "'" { ($return = $item[3]) =~ s/''/'/g } +DOLLARSTRING : /\$[^\$]*\$/ /.*?(?=\Q$item[1]\E)/s "$item[1]" + { $return = $item[3]; } + VALUE : /[-+]?\d*\.?\d+(?:[eE]\d+)?/ | SQSTRING + | DOLLARSTRING | /null/i { 'NULL' } diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/SQLite.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/SQLite.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/SQLite.pm 2017-04-03 10:19:36.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/SQLite.pm 2019-05-29 18:32:24.000000000 +0000 @@ -133,7 +133,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; our $DEBUG; $DEBUG = 0 unless defined $DEBUG; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/SQLServer.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/SQLServer.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/SQLServer.pm 2015-09-07 16:47:05.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/SQLServer.pm 2019-05-29 18:32:24.000000000 +0000 @@ -19,7 +19,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; our $DEBUG; $DEBUG = 0 unless defined $DEBUG; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/Storable.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/Storable.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/Storable.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/Storable.pm 2019-05-29 18:32:24.000000000 +0000 @@ -21,7 +21,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; our $DEBUG; $DEBUG = 0 unless defined $DEBUG; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/Sybase.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/Sybase.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/Sybase.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/Sybase.pm 2019-05-29 18:32:24.000000000 +0000 @@ -20,7 +20,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; our $DEBUG; $DEBUG = 0 unless defined $DEBUG; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/XML/SQLFairy.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/XML/SQLFairy.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/XML/SQLFairy.pm 2017-04-03 10:19:36.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/XML/SQLFairy.pm 2019-05-29 18:32:24.000000000 +0000 @@ -79,7 +79,7 @@ use warnings; our ( $DEBUG, @EXPORT_OK ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; use Data::Dumper; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/XML.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/XML.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/XML.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/XML.pm 2019-05-29 18:32:24.000000000 +0000 @@ -23,7 +23,7 @@ use strict; use warnings; our $DEBUG; -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 1 unless defined $DEBUG; use SQL::Translator::Parser::XML::SQLFairy; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/xSV.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/xSV.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/xSV.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/xSV.pm 2019-05-29 18:32:24.000000000 +0000 @@ -46,7 +46,7 @@ use strict; use warnings; our @EXPORT; -our $VERSION = '1.59'; +our $VERSION = '1.60'; use Exporter; use Text::ParseWords qw(quotewords); diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/YAML.pm libsql-translator-perl-1.60/lib/SQL/Translator/Parser/YAML.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Parser/YAML.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Parser/YAML.pm 2019-05-29 18:32:24.000000000 +0000 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; use SQL::Translator::Schema; use SQL::Translator::Utils qw(header_comment); diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/ClassDBI.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/ClassDBI.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/ClassDBI.pm 2013-09-26 16:12:49.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/ClassDBI.pm 2019-05-29 18:32:24.000000000 +0000 @@ -3,7 +3,7 @@ use strict; use warnings; our $DEBUG; -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 1 unless defined $DEBUG; use SQL::Translator::Schema::Constants; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/DB2.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/DB2.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/DB2.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/DB2.pm 2019-05-29 18:32:24.000000000 +0000 @@ -21,7 +21,7 @@ use strict; use warnings; our ( $DEBUG, $WARN ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; use SQL::Translator::Schema::Constants; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Diagram.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Diagram.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Diagram.pm 2015-06-25 10:42:02.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Diagram.pm 2019-05-29 18:32:24.000000000 +0000 @@ -47,7 +47,7 @@ use SQL::Translator::Utils qw(debug); our $DEBUG; -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; use constant VALID_FONT_SIZE => { diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/DiaUml.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/DiaUml.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/DiaUml.pm 2015-06-25 10:42:02.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/DiaUml.pm 2019-05-29 18:32:24.000000000 +0000 @@ -34,7 +34,7 @@ use warnings; our ( $DEBUG, @EXPORT_OK ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; use File::ShareDir qw/dist_dir/; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Dumper.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Dumper.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Dumper.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Dumper.pm 2019-05-29 18:32:24.000000000 +0000 @@ -41,7 +41,7 @@ use Data::Dumper; -our $VERSION = '1.59'; +our $VERSION = '1.60'; sub produce { my $t = shift; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/GraphViz.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/GraphViz.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/GraphViz.pm 2015-06-25 10:42:02.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/GraphViz.pm 2019-05-29 18:32:24.000000000 +0000 @@ -230,7 +230,7 @@ use Scalar::Util qw/openhandle/; our $DEBUG; -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; sub produce { diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/HTML.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/HTML.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/HTML.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/HTML.pm 2019-05-29 18:32:24.000000000 +0000 @@ -4,7 +4,7 @@ use warnings; use Data::Dumper; -our $VERSION = '1.59'; +our $VERSION = '1.60'; our $NAME = __PACKAGE__; our $NOWRAP = 0 unless defined $NOWRAP; our $NOLINKTABLE = 0 unless defined $NOLINKTABLE; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/JSON.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/JSON.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/JSON.pm 2017-04-03 10:19:36.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/JSON.pm 2019-05-29 18:32:24.000000000 +0000 @@ -18,9 +18,9 @@ use strict; use warnings; -our $VERSION = '1.00'; +our $VERSION = '1.60'; -use JSON; +use JSON::MaybeXS 'to_json'; sub produce { my $translator = shift; @@ -184,7 +184,7 @@ =head1 SEE ALSO -SQL::Translator, JSON, http://www.json.org/. +SQL::Translator, JSON::MaybeXS, http://www.json.org/. =head1 AUTHORS diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Latex.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Latex.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Latex.pm 2015-06-25 10:42:02.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Latex.pm 2019-05-29 18:32:24.000000000 +0000 @@ -34,7 +34,7 @@ use warnings; our @EXPORT_OK; -our $VERSION = '1.59'; +our $VERSION = '1.60'; use SQL::Translator::Utils 'debug'; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/MySQL.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/MySQL.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/MySQL.pm 2015-06-25 10:42:02.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/MySQL.pm 2019-05-29 18:32:24.000000000 +0000 @@ -82,7 +82,7 @@ use strict; use warnings; our ( $DEBUG, %used_names ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; # Maximum length for most identifiers is 64, according to: diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Oracle.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Oracle.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Oracle.pm 2017-03-22 11:25:28.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Oracle.pm 2019-05-29 18:32:24.000000000 +0000 @@ -90,7 +90,7 @@ use strict; use warnings; our ( $DEBUG, $WARN ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; use base 'SQL::Translator::Producer'; @@ -732,13 +732,23 @@ my ($view, $options) = @_; my $qt = $options->{quote_table_names}; my $view_name = quote($view->name,$qt); + my $extra = $view->extra; + + my $view_type = 'VIEW'; + my $view_options = ''; + if ( my $materialized = $extra->{materialized} ) { + $view_type = 'MATERIALIZED VIEW'; + $view_options .= ' '.$materialized; + } my @create; - push @create, qq[DROP VIEW $view_name] + push @create, qq[DROP $view_type $view_name] if $options->{add_drop_view}; - push @create, sprintf("CREATE VIEW %s AS\n%s", + push @create, sprintf("CREATE %s %s%s AS\n%s", + $view_type, $view_name, + $view_options, $view->sql); return \@create; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/POD.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/POD.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/POD.pm 2015-06-29 09:00:28.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/POD.pm 2019-05-29 18:32:24.000000000 +0000 @@ -22,7 +22,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; use SQL::Translator::Schema::Constants; use SQL::Translator::Utils qw(header_comment); diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/PostgreSQL.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/PostgreSQL.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/PostgreSQL.pm 2016-04-07 14:52:12.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/PostgreSQL.pm 2019-05-29 18:32:24.000000000 +0000 @@ -22,7 +22,7 @@ use strict; use warnings; our ( $DEBUG, $WARN ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; use base qw(SQL::Translator::Producer); diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/SQLite.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/SQLite.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/SQLite.pm 2015-06-25 10:42:02.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/SQLite.pm 2019-05-29 18:32:24.000000000 +0000 @@ -25,7 +25,7 @@ use SQL::Translator::Generator::DDL::SQLite; our ( $DEBUG, $WARN ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; $WARN = 0 unless defined $WARN; @@ -66,7 +66,8 @@ local $NO_QUOTES = 0 if $translator->quote_identifiers and $translator->quote_identifiers ne '0E0'; - my $head = (header_comment() . "\n") unless $no_comments; + my $head; + $head = (header_comment() . "\n") unless $no_comments; my @create = (); diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/SQLServer.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/SQLServer.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/SQLServer.pm 2014-06-30 10:24:39.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/SQLServer.pm 2019-05-29 18:32:24.000000000 +0000 @@ -3,7 +3,7 @@ use strict; use warnings; our ( $DEBUG, $WARN ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 1 unless defined $DEBUG; use SQL::Translator::Schema::Constants; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Storable.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Storable.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Storable.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Storable.pm 2019-05-29 18:32:24.000000000 +0000 @@ -25,7 +25,7 @@ use warnings; our ( $DEBUG, @EXPORT_OK ); $DEBUG = 0 unless defined $DEBUG; -our $VERSION = '1.59'; +our $VERSION = '1.60'; use Storable; use Exporter; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Sybase.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Sybase.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/Sybase.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/Sybase.pm 2019-05-29 18:32:24.000000000 +0000 @@ -20,7 +20,7 @@ use strict; use warnings; our ( $DEBUG, $WARN ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 1 unless defined $DEBUG; use Data::Dumper; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/TT/Base.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/TT/Base.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/TT/Base.pm 2014-09-25 12:19:45.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/TT/Base.pm 2019-05-29 18:32:24.000000000 +0000 @@ -13,7 +13,7 @@ use warnings; our @EXPORT_OK; -our $VERSION = '1.59'; +our $VERSION = '1.60'; use Template; use Data::Dumper; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/TT/Table.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/TT/Table.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/TT/Table.pm 2014-09-25 12:19:45.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/TT/Table.pm 2019-05-29 18:32:24.000000000 +0000 @@ -157,7 +157,7 @@ use warnings; our ( $DEBUG, @EXPORT_OK ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; use File::Path; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/TTSchema.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/TTSchema.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/TTSchema.pm 2015-06-25 10:42:02.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/TTSchema.pm 2019-05-29 18:32:24.000000000 +0000 @@ -110,7 +110,7 @@ use warnings; our ( $DEBUG, @EXPORT_OK ); -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; use Template; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/XML/SQLFairy.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/XML/SQLFairy.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/XML/SQLFairy.pm 2017-04-03 10:19:36.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/XML/SQLFairy.pm 2019-05-29 18:32:24.000000000 +0000 @@ -143,7 +143,7 @@ use strict; use warnings; our @EXPORT_OK; -our $VERSION = '1.59'; +our $VERSION = '1.60'; use Exporter; use base qw(Exporter); diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/XML.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/XML.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/XML.pm 2013-09-26 16:12:49.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/XML.pm 2019-05-29 18:32:24.000000000 +0000 @@ -25,7 +25,7 @@ use strict; use warnings; our $DEBUG; -our $VERSION = '1.59'; +our $VERSION = '1.60'; $DEBUG = 1 unless defined $DEBUG; use SQL::Translator::Producer::XML::SQLFairy; diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/YAML.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer/YAML.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer/YAML.pm 2017-04-03 10:19:36.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer/YAML.pm 2019-05-29 18:32:24.000000000 +0000 @@ -21,7 +21,7 @@ use strict; use warnings; -our $VERSION = '1.59'; +our $VERSION = '1.60'; use YAML qw(Dump); diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Producer.pm libsql-translator-perl-1.60/lib/SQL/Translator/Producer.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Producer.pm 2014-10-22 15:45:14.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Producer.pm 2019-05-29 18:32:24.000000000 +0000 @@ -3,7 +3,7 @@ use strict; use warnings; use Scalar::Util (); -our $VERSION = '1.59'; +our $VERSION = '1.60'; sub produce { "" } diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Constants.pm libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Constants.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Constants.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Constants.pm 2019-05-29 18:32:24.000000000 +0000 @@ -43,7 +43,7 @@ use warnings; use base qw( Exporter ); require Exporter; -our $VERSION = '1.59'; +our $VERSION = '1.60'; our @EXPORT = qw[ CHECK_C diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Constraint.pm libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Constraint.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Constraint.pm 2014-09-25 12:19:45.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Constraint.pm 2019-05-29 18:32:24.000000000 +0000 @@ -32,7 +32,7 @@ extends 'SQL::Translator::Schema::Object'; -our $VERSION = '1.59'; +our $VERSION = '1.60'; my %VALID_CONSTRAINT_TYPE = ( PRIMARY_KEY, 1, diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Field.pm libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Field.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Field.pm 2014-08-12 16:33:25.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Field.pm 2019-05-29 18:32:24.000000000 +0000 @@ -31,7 +31,7 @@ extends 'SQL::Translator::Schema::Object'; -our $VERSION = '1.59'; +our $VERSION = '1.60'; # Stringify to our name, being careful not to pass any args through so we don't # accidentally set it to undef. We also have to tweak bool so the object is diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Index.pm libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Index.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Index.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Index.pm 2019-05-29 18:32:24.000000000 +0000 @@ -34,7 +34,7 @@ extends 'SQL::Translator::Schema::Object'; -our $VERSION = '1.59'; +our $VERSION = '1.60'; my %VALID_INDEX_TYPE = ( UNIQUE => 1, diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Object.pm libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Object.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Object.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Object.pm 2019-05-29 18:32:24.000000000 +0000 @@ -41,7 +41,7 @@ use Moo 1.000003; # screw you PAUSE -our $VERSION = '1.59'; +our $VERSION = '1.60'; with qw( SQL::Translator::Role::Error diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Procedure.pm libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Procedure.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Procedure.pm 2013-06-28 14:02:53.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Procedure.pm 2019-05-29 18:32:24.000000000 +0000 @@ -35,7 +35,7 @@ extends 'SQL::Translator::Schema::Object'; -our $VERSION = '1.59'; +our $VERSION = '1.60'; =head2 new diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Table.pm libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Table.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Table.pm 2014-07-25 14:50:09.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Table.pm 2019-05-29 18:32:24.000000000 +0000 @@ -34,7 +34,7 @@ extends 'SQL::Translator::Schema::Object'; -our $VERSION = '1.59'; +our $VERSION = '1.60'; # Stringify to our name, being careful not to pass any args through so we don't # accidentally set it to undef. We also have to tweak bool so the object is diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Trigger.pm libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Trigger.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/Trigger.pm 2015-06-25 10:42:02.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Schema/Trigger.pm 2019-05-29 18:32:24.000000000 +0000 @@ -35,7 +35,7 @@ extends 'SQL::Translator::Schema::Object'; -our $VERSION = '1.59'; +our $VERSION = '1.60'; =head2 new diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/View.pm libsql-translator-perl-1.60/lib/SQL/Translator/Schema/View.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Schema/View.pm 2014-07-25 11:15:27.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Schema/View.pm 2019-05-29 18:32:24.000000000 +0000 @@ -31,7 +31,7 @@ extends 'SQL::Translator::Schema::Object'; -our $VERSION = '1.59'; +our $VERSION = '1.60'; =head2 new diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Schema.pm libsql-translator-perl-1.60/lib/SQL/Translator/Schema.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Schema.pm 2014-07-25 10:57:22.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Schema.pm 2019-05-29 18:32:24.000000000 +0000 @@ -39,7 +39,7 @@ extends 'SQL::Translator::Schema::Object'; -our $VERSION = '1.59'; +our $VERSION = '1.60'; has _order => (is => 'ro', default => quote_sub(q{ +{ map { $_ => 0 } qw/ @@ -89,7 +89,7 @@ =head2 add_table -Add a table object. Returns the new SQL::Translator::Schema::Table object. +Add a table object. Returns the new L object. The "name" parameter is required. If you try to create a table with the same name as an existing table, you will get an error and the table will not be created. @@ -138,7 +138,7 @@ Remove a table from the schema. Returns the table object if the table was found and removed, an error otherwise. The single parameter can be either a table -name or an C object. The "cascade" parameter +name or an L object. The "cascade" parameter can be set to 1 to also drop all triggers on the table, default is 0. $schema->drop_table('mytable'); @@ -182,7 +182,7 @@ =head2 add_procedure -Add a procedure object. Returns the new SQL::Translator::Schema::Procedure +Add a procedure object. Returns the new L object. The "name" parameter is required. If you try to create a procedure with the same name as an existing procedure, you will get an error and the procedure will not be created. @@ -232,7 +232,7 @@ Remove a procedure from the schema. Returns the procedure object if the procedure was found and removed, an error otherwise. The single parameter -can be either a procedure name or an C +can be either a procedure name or an L object. $schema->drop_procedure('myprocedure'); @@ -268,7 +268,7 @@ =head2 add_trigger -Add a trigger object. Returns the new SQL::Translator::Schema::Trigger object. +Add a trigger object. Returns the new L object. The "name" parameter is required. If you try to create a trigger with the same name as an existing trigger, you will get an error and the trigger will not be created. @@ -316,7 +316,7 @@ Remove a trigger from the schema. Returns the trigger object if the trigger was found and removed, an error otherwise. The single parameter can be either a -trigger name or an C object. +trigger name or an L object. $schema->drop_trigger('mytrigger'); @@ -351,7 +351,7 @@ =head2 add_view -Add a view object. Returns the new SQL::Translator::Schema::View object. +Add a view object. Returns the new L object. The "name" parameter is required. If you try to create a view with the same name as an existing view, you will get an error and the view will not be created. @@ -398,7 +398,7 @@ Remove a view from the schema. Returns the view object if the view was found and removed, an error otherwise. The single parameter can be either a view -name or an C object. +name or an L object. $schema->drop_view('myview'); diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator/Utils.pm libsql-translator-perl-1.60/lib/SQL/Translator/Utils.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator/Utils.pm 2015-06-25 10:42:02.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator/Utils.pm 2019-05-29 18:32:24.000000000 +0000 @@ -8,7 +8,7 @@ use Try::Tiny; use Carp qw(carp croak); -our $VERSION = '1.59'; +our $VERSION = '1.60'; our $DEFAULT_COMMENT = '-- '; use base qw(Exporter); diff -Nru libsql-translator-perl-0.11024/lib/SQL/Translator.pm libsql-translator-perl-1.60/lib/SQL/Translator.pm --- libsql-translator-perl-0.11024/lib/SQL/Translator.pm 2018-01-09 10:23:50.000000000 +0000 +++ libsql-translator-perl-1.60/lib/SQL/Translator.pm 2019-05-29 18:32:24.000000000 +0000 @@ -3,7 +3,7 @@ use Moo; our ( $DEFAULT_SUB, $DEBUG, $ERROR ); -our $VERSION = '0.11024'; +our $VERSION = '1.60'; $VERSION =~ tr/_//d; $DEBUG = 0 unless defined $DEBUG; $ERROR = ""; diff -Nru libsql-translator-perl-0.11024/lib/Test/SQL/Translator.pm libsql-translator-perl-1.60/lib/Test/SQL/Translator.pm --- libsql-translator-perl-0.11024/lib/Test/SQL/Translator.pm 2017-12-11 12:13:15.000000000 +0000 +++ libsql-translator-perl-1.60/lib/Test/SQL/Translator.pm 2019-05-29 18:32:24.000000000 +0000 @@ -15,7 +15,7 @@ use base qw(Exporter); our @EXPORT_OK; -our $VERSION = '1.59'; +our $VERSION = '1.60'; our @EXPORT = qw( schema_ok table_ok diff -Nru libsql-translator-perl-0.11024/maint/Makefile.PL.include libsql-translator-perl-1.60/maint/Makefile.PL.include --- libsql-translator-perl-0.11024/maint/Makefile.PL.include 1970-01-01 00:00:00.000000000 +0000 +++ libsql-translator-perl-1.60/maint/Makefile.PL.include 2019-04-28 14:13:16.000000000 +0000 @@ -0,0 +1,122 @@ +BEGIN { -e 'Distar' or system("git clone git://git.shadowcat.co.uk/p5sagit/Distar.git") } +use lib 'Distar/lib'; +use Distar 0.001; + +author 'Ken Youens-Clark '; +manifest_include 'script' => qr/.+/; +manifest_include 't/data' => qr/.+/; +manifest_include 'share' => qr/.+/; +manifest_include '' => qr/\A(?:AUTHORS)\z/; + +# eval so can generate deps for cpanm --installdeps . +eval { + _recompile_grammars(); + _recreate_rt_source(); +}; +print "Got errors:\n\n$@" if $@; + +sub _recompile_grammars { + return; # disabled until RT#74593 is resolved + + require File::Spec; + + my $compiled_parser_dir = File::Spec->catdir(qw/ + share PrecompiledParsers Parse RecDescent DDL SQLT + /); + + # Currently consider only single-name parsers containing a grammar marker + # This is somewhat fragile, but better than loading all kinds of parsers + # to some of which we may not even have the deps + my $parser_libdir = 'lib/SQL/Translator/Parser'; + for my $parser_fn (glob "$parser_libdir/*.pm") { + die "$parser_fn does not look like a readable file\n" + unless ( -f $parser_fn and -r $parser_fn ); + + my ($type) = $parser_fn =~ /^\Q$parser_libdir\E\/(.+)\.pm$/i + or die "$parser_fn not named in expected format\n"; + + my $parser_source = do { local (@ARGV, $/) = $parser_fn; <> }; + next unless $parser_source =~ /\$GRAMMAR.+?END_OF_GRAMMAR/s; + + + my $precomp_parser_fn = File::Spec->catfile($compiled_parser_dir, "$type.pm"); + + next if ( + -f $precomp_parser_fn + and + (stat($parser_fn))[9] <= (stat($precomp_parser_fn))[9] + ); + + + print "Precompiling parser for $type\n"; + + require $parser_fn; + require Parse::RecDescent; + + Parse::RecDescent->Precompile( + do { + no strict 'refs'; + ${"SQL::Translator::Parser::${type}::GRAMMAR"} + || die "No \$GRAMMAR global found in SQL::Translator::Parser::$type ($parser_fn)\n" + }, + "Parse::RecDescent::DDL::SQLT::$type" + ); + + rename( "$type.pm", $precomp_parser_fn ) + or die "Unable to move $type.pm to $compiled_parser_dir: $!\n"; + } + +} + +sub _recreate_rt_source { + my $base_xml = "t/data/roundtrip.xml"; + my $autogen_yaml = "t/data/roundtrip_autogen.yaml"; + + print "Updating $autogen_yaml\n"; + + unlink $autogen_yaml; + + eval { + + use lib 'lib'; + + require SQL::Translator; + require SQL::Translator::Parser::XML; + + open (my $fh, '>', $autogen_yaml) or die "$autogen_yaml: $!\n"; + + my $tr = SQL::Translator->new; + my $yaml = $tr->translate ( + parser => 'XML', + file => $base_xml, + producer => 'YAML', + ) or die sprintf ("Unable to translate %s to YAML: %s\n", + $base_xml, + $tr->error || 'error unknown' + ); + + print $fh $yaml; + close $fh; + }; + + if ($@) { + die < '6.54'; - -perl_version '5.008001'; - -my $deps = { - requires => { +use ExtUtils::MakeMaker; +use File::ShareDir::Install; +do './maint/Makefile.PL.include' or die $@ + unless -f 'META.yml'; +my $eumm_version = eval $ExtUtils::MakeMaker::VERSION; + +my %eumm_args = ( + NAME => 'SQL::Translator', + ABSTRACT => 'SQL DDL transformations and more', + VERSION_FROM => 'lib/SQL/Translator.pm', + LICENSE => 'perl', + MIN_PERL_VERSION => '5.008001', + CONFIGURE_REQUIRES => { + 'ExtUtils::MakeMaker' => '6.54', # to deal with x.y.z versions properly + 'File::ShareDir::Install' => '0', + }, + TEST_REQUIRES => { + 'JSON::MaybeXS' => '1.003003', + 'YAML' => '0.66', + 'XML::Writer' => '0.500', + 'Test::More' => '0.88', + 'Test::Differences' => '0', + 'Test::Exception' => '0.31', + 'Text::ParseWords' => '0', + }, + PREREQ_PM => { 'Digest::SHA' => '0', 'Carp::Clan' => '0', 'Parse::RecDescent' => '1.967009', @@ -21,191 +37,87 @@ 'Try::Tiny' => '0.04', 'Scalar::Util' => '0', }, - recommends => { - 'Template' => '2.20', - 'GD' => '0', - 'GraphViz' => '0', - 'Graph::Directed' => '0', - 'Spreadsheet::ParseExcel' => '0.41', - 'Text::RecordParser' => '0.02', - 'XML::LibXML' => '1.69', - }, - test_requires => { - 'JSON' => '2.0', - 'YAML' => '0.66', - 'XML::Writer' => '0.500', - 'Test::More' => '0.88', - 'Test::Differences' => '0', - 'Test::Exception' => '0.31', - 'Text::ParseWords' => '0', + realclean => { + FILES => 't/data/roundtrip_autogen.yaml' }, -}; - - -name 'SQL-Translator'; -author 'Ken Youens-Clark '; -abstract 'SQL DDL transformations and more'; -license 'perl'; - -resources repository => 'https://github.com/dbsrgits/sql-translator/'; -resources bugtracker => 'https://rt.cpan.org/NoAuth/Bugs.html?Dist=SQL-Translator'; -resources Ratings => 'http://cpanratings.perl.org/d/SQL-Translator'; -resources IRC => 'irc://irc.perl.org/#sql-translator'; - -Meta->{values}{x_authority} = 'cpan:JROBINSON'; - -all_from 'lib/SQL/Translator.pm'; -readme_from 'lib/SQL/Translator.pm'; - -for my $type (qw/requires recommends test_requires/) { - no strict qw/refs/; - my $f = \&$type; - for my $mod (sort keys %{$deps->{$type} || {} }) { - $f->($mod, $deps->{$type}{$mod}); - } -} - -install_script (qw| - script/sqlt-diagram - script/sqlt-diff - script/sqlt-diff-old - script/sqlt-dumper - script/sqlt-graph - script/sqlt -|); - -install_share(); - -tests_recursive (); - - -# temporary(?) until I get around to fix M::I wrt xt/ -# needs Module::Install::AuthorTests -eval { - # this should not be necessary since the autoloader is supposed - # to work, but there were reports of it failing - require Module::Install::AuthorTests; - recursive_author_tests (qw/xt/); - 1; -} || do { - if ($Module::Install::AUTHOR) { - my $err = $@; - - # better error message in case of missing dep - eval { require Module::Install::AuthorTests } - || die "\nYou need Module::Install::AuthorTests installed to run this Makefile.PL in author mode:\n\n$@\n"; - - die $err; - } -}; - -auto_install(); - -if ($Module::Install::AUTHOR) { - _recompile_grammars(); - _recreate_rt_source(); -} - -WriteAll(); - -sub _recompile_grammars { - return; # disabled until RT#74593 is resolved - - require File::Spec; - - my $compiled_parser_dir = File::Spec->catdir(qw/ - share PrecompiledParsers Parse RecDescent DDL SQLT - /); - - # Currently consider only single-name parsers containing a grammar marker - # This is somewhat fragile, but better than loading all kinds of parsers - # to some of which we may not even have the deps - my $parser_libdir = 'lib/SQL/Translator/Parser'; - for my $parser_fn (glob "$parser_libdir/*.pm") { - die "$parser_fn does not look like a readable file\n" - unless ( -f $parser_fn and -r $parser_fn ); - - my ($type) = $parser_fn =~ /^\Q$parser_libdir\E\/(.+)\.pm$/i - or die "$parser_fn not named in expected format\n"; - - my $parser_source = do { local (@ARGV, $/) = $parser_fn; <> }; - next unless $parser_source =~ /\$GRAMMAR.+?END_OF_GRAMMAR/s; - - - my $precomp_parser_fn = File::Spec->catfile($compiled_parser_dir, "$type.pm"); - - next if ( - -f $precomp_parser_fn - and - (stat($parser_fn))[9] <= (stat($precomp_parser_fn))[9] - ); - - - print "Precompiling parser for $type\n"; - - require $parser_fn; - require Parse::RecDescent; - - Parse::RecDescent->Precompile( - do { - no strict 'refs'; - ${"SQL::Translator::Parser::${type}::GRAMMAR"} - || die "No \$GRAMMAR global found in SQL::Translator::Parser::$type ($parser_fn)\n" + EXE_FILES => [ qw| + script/sqlt-diagram + script/sqlt-diff + script/sqlt-diff-old + script/sqlt-dumper + script/sqlt-graph + script/sqlt + | ], + META_MERGE => { + "meta-spec" => { version => 2 }, + dynamic_config => 0, + resources => { + bugtracker => { + web => 'https://rt.cpan.org/NoAuth/Bugs.html?Dist=SQL-Translator', + mailto => 'bug-SQL-Translator@rt.cpan.org', }, - "Parse::RecDescent::DDL::SQLT::$type" - ); - - rename( "$type.pm", $precomp_parser_fn ) - or die "Unable to move $type.pm to $compiled_parser_dir: $!\n"; - } - -} - -sub _recreate_rt_source { - my $base_xml = "t/data/roundtrip.xml"; - my $autogen_yaml = "t/data/roundtrip_autogen.yaml"; - - print "Updating $autogen_yaml\n"; - - unlink $autogen_yaml; - - eval { - - use lib 'lib'; - - require SQL::Translator; - require SQL::Translator::Parser::XML; - - open (my $fh, '>', $autogen_yaml) or die "$autogen_yaml: $!\n"; + repository => { + type => 'git', + url => 'git@github.com/dbsrgits/sql-translator.git', + web => 'https://github.com/dbsrgits/sql-translator/', + }, + license => [ 'http://dev.perl.org/licenses/' ], + x_IRC => 'irc://irc.perl.org/#sql-translator', + x_Ratings => 'http://cpanratings.perl.org/d/SQL-Translator', + }, + x_authority => 'cpan:JROBINSON', + no_index => { + directory => [qw(maint share xt)], + }, + prereqs => { + runtime => { + recommends => { + 'Template' => '2.20', + 'GD' => '0', + 'GraphViz' => '0', + 'Graph::Directed' => '0', + 'Spreadsheet::ParseExcel' => '0.41', + 'Text::RecordParser' => '0.02', + 'XML::LibXML' => '1.69', + }, + }, + develop => { + requires => { + 'Template' => '2.20', + 'GD' => '0', + 'GraphViz' => '0', + 'Graph::Directed' => '0', + 'Spreadsheet::ParseExcel' => '0.41', + 'Text::RecordParser' => '0.02', + 'XML::LibXML' => '1.69', + 'Test::EOL' => '1.1', + 'Test::NoTabs' => '1.1', + 'Software::LicenseUtils' => '0', # for Distar + }, + }, + }, + }, +); - my $tr = SQL::Translator->new; - my $yaml = $tr->translate ( - parser => 'XML', - file => $base_xml, - producer => 'YAML', - ) or die sprintf ("Unable to translate %s to YAML: %s\n", - $base_xml, - $tr->error || 'error unknown' - ); +install_share 'share'; - print $fh $yaml; - close $fh; +sub _move_to { + my ($hash, $fromkey, $tokey) = @_; + $hash->{$tokey} = { + %{ $hash->{$tokey} || {} }, + %{ delete($hash->{$fromkey}) || {} }, }; - - if ($@) { - die <= 6.57_02 and $eumm_version < 6.57_07; +WriteMakefile(%eumm_args); + +package MY; +use File::ShareDir::Install qw(postamble); diff -Nru libsql-translator-perl-0.11024/MANIFEST libsql-translator-perl-1.60/MANIFEST --- libsql-translator-perl-0.11024/MANIFEST 2018-01-09 10:24:51.000000000 +0000 +++ libsql-translator-perl-1.60/MANIFEST 2019-05-29 19:35:23.000000000 +0000 @@ -1,20 +1,5 @@ AUTHORS Changes -inc/Module/AutoInstall.pm -inc/Module/Install.pm -inc/Module/Install/AuthorTests.pm -inc/Module/Install/AutoInstall.pm -inc/Module/Install/Base.pm -inc/Module/Install/Can.pm -inc/Module/Install/Fetch.pm -inc/Module/Install/Include.pm -inc/Module/Install/Makefile.pm -inc/Module/Install/Metadata.pm -inc/Module/Install/ReadmeFromPod.pm -inc/Module/Install/Scripts.pm -inc/Module/Install/Share.pm -inc/Module/Install/Win32.pm -inc/Module/Install/WriteAll.pm lib/SQL/Translator.pm lib/SQL/Translator/Diff.pm lib/SQL/Translator/Filter/DefaultExtra.pm @@ -95,10 +80,9 @@ lib/SQL/Translator/Types.pm lib/SQL/Translator/Utils.pm lib/Test/SQL/Translator.pm +maint/Makefile.PL.include Makefile.PL MANIFEST This list of files -META.yml -README script/sqlt script/sqlt-diagram script/sqlt-diff @@ -226,3 +210,7 @@ xt/eol.t xt/notabs.t xt/pod.t +META.yml Module YAML meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) +README README file (added by Distar) +LICENSE LICENSE file (added by Distar) diff -Nru libsql-translator-perl-0.11024/META.json libsql-translator-perl-1.60/META.json --- libsql-translator-perl-0.11024/META.json 1970-01-01 00:00:00.000000000 +0000 +++ libsql-translator-perl-1.60/META.json 2019-05-29 19:35:23.000000000 +0000 @@ -0,0 +1,106 @@ +{ + "abstract" : "SQL DDL transformations and more", + "author" : [ + "Ken Youens-Clark " + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 7.36, CPAN::Meta::Converter version 2.150010", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : 2 + }, + "name" : "SQL-Translator", + "no_index" : { + "directory" : [ + "t", + "inc", + "maint", + "share", + "xt" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.54", + "File::ShareDir::Install" : "0" + } + }, + "develop" : { + "requires" : { + "GD" : "0", + "Graph::Directed" : "0", + "GraphViz" : "0", + "Software::LicenseUtils" : "0", + "Spreadsheet::ParseExcel" : "0.41", + "Template" : "2.20", + "Test::EOL" : "1.1", + "Test::NoTabs" : "1.1", + "Text::RecordParser" : "0.02", + "XML::LibXML" : "1.69" + } + }, + "runtime" : { + "recommends" : { + "GD" : "0", + "Graph::Directed" : "0", + "GraphViz" : "0", + "Spreadsheet::ParseExcel" : "0.41", + "Template" : "2.20", + "Text::RecordParser" : "0.02", + "XML::LibXML" : "1.69" + }, + "requires" : { + "Carp::Clan" : "0", + "DBI" : "1.54", + "Digest::SHA" : "0", + "File::ShareDir" : "1.0", + "Moo" : "1.000003", + "Package::Variant" : "1.001001", + "Parse::RecDescent" : "1.967009", + "Scalar::Util" : "0", + "Sub::Quote" : "0", + "Try::Tiny" : "0.04", + "perl" : "5.008001" + } + }, + "test" : { + "requires" : { + "JSON::MaybeXS" : "1.003003", + "Test::Differences" : "0", + "Test::Exception" : "0.31", + "Test::More" : "0.88", + "Text::ParseWords" : "0", + "XML::Writer" : "0.500", + "YAML" : "0.66" + } + } + }, + "release_status" : "stable", + "resources" : { + "bugtracker" : { + "mailto" : "bug-SQL-Translator@rt.cpan.org", + "web" : "https://rt.cpan.org/NoAuth/Bugs.html?Dist=SQL-Translator" + }, + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "type" : "git", + "web" : "https://github.com/dbsrgits/sql-translator/" + }, + "x_IRC" : "irc://irc.perl.org/#sql-translator", + "x_Ratings" : "http://cpanratings.perl.org/d/SQL-Translator" + }, + "version" : "1.60", + "x_authority" : "cpan:JROBINSON", + "x_serialization_backend" : "JSON::PP version 4.02" +} diff -Nru libsql-translator-perl-0.11024/META.yml libsql-translator-perl-1.60/META.yml --- libsql-translator-perl-0.11024/META.yml 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/META.yml 2019-05-29 19:35:22.000000000 +0000 @@ -3,55 +3,57 @@ author: - 'Ken Youens-Clark ' build_requires: - ExtUtils::MakeMaker: 6.59 - JSON: '2.0' - Test::Differences: 0 + ExtUtils::MakeMaker: '0' + JSON::MaybeXS: '1.003003' + Test::Differences: '0' Test::Exception: '0.31' Test::More: '0.88' - Text::ParseWords: 0 + Text::ParseWords: '0' XML::Writer: '0.500' YAML: '0.66' configure_requires: - ExtUtils::MakeMaker: 6.59 -distribution_type: module -dynamic_config: 1 -generated_by: 'Module::Install version 1.18' + ExtUtils::MakeMaker: '6.54' + File::ShareDir::Install: '0' +dynamic_config: 0 +generated_by: 'ExtUtils::MakeMaker version 7.36, CPAN::Meta::Converter version 2.150010' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: SQL-Translator no_index: directory: + - t - inc + - maint - share - - t - xt recommends: - GD: 0 - Graph::Directed: 0 - GraphViz: 0 + GD: '0' + Graph::Directed: '0' + GraphViz: '0' Spreadsheet::ParseExcel: '0.41' Template: '2.20' Text::RecordParser: '0.02' XML::LibXML: '1.69' requires: - Carp::Clan: 0 + Carp::Clan: '0' DBI: '1.54' - Digest::SHA: 0 + Digest::SHA: '0' File::ShareDir: '1.0' Moo: '1.000003' Package::Variant: '1.001001' Parse::RecDescent: '1.967009' - Scalar::Util: 0 - Sub::Quote: 0 + Scalar::Util: '0' + Sub::Quote: '0' Try::Tiny: '0.04' - perl: 5.8.1 + perl: '5.008001' resources: IRC: irc://irc.perl.org/#sql-translator Ratings: http://cpanratings.perl.org/d/SQL-Translator bugtracker: https://rt.cpan.org/NoAuth/Bugs.html?Dist=SQL-Translator license: http://dev.perl.org/licenses/ repository: https://github.com/dbsrgits/sql-translator/ -version: '0.11024' +version: '1.60' x_authority: cpan:JROBINSON +x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -Nru libsql-translator-perl-0.11024/script/sqlt libsql-translator-perl-1.60/script/sqlt --- libsql-translator-perl-0.11024/script/sqlt 2014-11-24 18:25:46.000000000 +0000 +++ libsql-translator-perl-1.60/script/sqlt 2019-05-29 18:32:24.000000000 +0000 @@ -153,7 +153,7 @@ use SQL::Translator; use vars qw( $VERSION ); -$VERSION = '1.59'; +$VERSION = '1.60'; my $from; # the original database my $to; # the destination database diff -Nru libsql-translator-perl-0.11024/script/sqlt.cgi libsql-translator-perl-1.60/script/sqlt.cgi --- libsql-translator-perl-0.11024/script/sqlt.cgi 2014-11-24 18:28:09.000000000 +0000 +++ libsql-translator-perl-1.60/script/sqlt.cgi 2019-05-29 18:32:24.000000000 +0000 @@ -38,7 +38,7 @@ use SQL::Translator; use vars '$VERSION'; -$VERSION = '1.59'; +$VERSION = '1.60'; my $q = CGI->new; diff -Nru libsql-translator-perl-0.11024/script/sqlt-diagram libsql-translator-perl-1.60/script/sqlt-diagram --- libsql-translator-perl-0.11024/script/sqlt-diagram 2014-11-24 18:25:59.000000000 +0000 +++ libsql-translator-perl-1.60/script/sqlt-diagram 2019-05-29 18:32:24.000000000 +0000 @@ -77,7 +77,7 @@ use SQL::Translator; use vars '$VERSION'; -$VERSION = '1.59'; +$VERSION = '1.60'; # # Get arguments. diff -Nru libsql-translator-perl-0.11024/script/sqlt-diff libsql-translator-perl-1.60/script/sqlt-diff --- libsql-translator-perl-0.11024/script/sqlt-diff 2014-11-24 18:27:00.000000000 +0000 +++ libsql-translator-perl-1.60/script/sqlt-diff 2019-05-29 18:32:24.000000000 +0000 @@ -114,7 +114,7 @@ use SQL::Translator::Schema::Constants; use vars qw( $VERSION ); -$VERSION = '1.59'; +$VERSION = '1.60'; my ( @input, $list, $help, $debug, $trace, $caseopt, $ignore_index_names, $ignore_constraint_names, $output_db, $mysql_parser_version, diff -Nru libsql-translator-perl-0.11024/script/sqlt-diff-old libsql-translator-perl-1.60/script/sqlt-diff-old --- libsql-translator-perl-0.11024/script/sqlt-diff-old 2014-11-24 18:27:10.000000000 +0000 +++ libsql-translator-perl-1.60/script/sqlt-diff-old 2019-05-29 18:32:24.000000000 +0000 @@ -96,7 +96,7 @@ use SQL::Translator::Schema::Constants; use vars qw( $VERSION ); -$VERSION = '1.59'; +$VERSION = '1.60'; my ( @input, $list, $help, $debug ); for my $arg ( @ARGV ) { diff -Nru libsql-translator-perl-0.11024/script/sqlt-dumper libsql-translator-perl-1.60/script/sqlt-dumper --- libsql-translator-perl-0.11024/script/sqlt-dumper 2014-11-24 18:24:20.000000000 +0000 +++ libsql-translator-perl-1.60/script/sqlt-dumper 2019-05-29 18:32:24.000000000 +0000 @@ -63,7 +63,7 @@ use File::Basename qw(basename); use vars '$VERSION'; -$VERSION = '1.59'; +$VERSION = '1.60'; my ( $help, $db, $skip, $skiplike, $db_user, $db_pass, $dsn ); GetOptions( diff -Nru libsql-translator-perl-0.11024/script/sqlt-graph libsql-translator-perl-1.60/script/sqlt-graph --- libsql-translator-perl-0.11024/script/sqlt-graph 2014-11-24 18:27:40.000000000 +0000 +++ libsql-translator-perl-1.60/script/sqlt-graph 2019-05-29 18:32:24.000000000 +0000 @@ -108,7 +108,7 @@ use SQL::Translator; use vars '$VERSION'; -$VERSION = '1.59'; +$VERSION = '1.60'; # # Get arguments. diff -Nru libsql-translator-perl-0.11024/t/14postgres-parser.t libsql-translator-perl-1.60/t/14postgres-parser.t --- libsql-translator-perl-0.11024/t/14postgres-parser.t 2017-04-03 10:19:36.000000000 +0000 +++ libsql-translator-perl-1.60/t/14postgres-parser.t 2018-01-27 22:03:21.000000000 +0000 @@ -25,7 +25,9 @@ f_bool boolean, f_bin bytea, f_tz timestamp default '1970-01-01 00:00:00'::TIMESTAMP, - f_text text, + f_text text default $foo$ foo +$bar$ +baz $foo$, f_fk1 integer not null references t_test2 (f_id), f_dropped text, f_timestamp timestamp(0) with time zone, @@ -35,7 +37,9 @@ f_numarray numeric(7,2) [ ], f_uuid uuid, f_time time(0) with time zone, - f_time2 time without time zone + f_time2 time without time zone, + f_text2 text default $$$$, + f_text3 text default $$$ $$ ); create table t_test2 ( @@ -127,7 +131,7 @@ is( $t1->comments, 'comment on t_test1', 'Table comment exists' ); my @t1_fields = $t1->get_fields; -is( scalar @t1_fields, 19, '19 fields in t_test1' ); +is( scalar @t1_fields, 21, '21 fields in t_test1' ); my $f1 = shift @t1_fields; is( $f1->name, 'f_serial', 'First field is "f_serial"' ); @@ -201,7 +205,7 @@ is( $f9->data_type, 'text', 'Field is text' ); is( $f9->is_nullable, 1, 'Field can be null' ); is( $f9->size, 64000, 'Size is "64,000"' ); -is( $f9->default_value, undef, 'Default value is undefined' ); +is( $f9->default_value, " foo\n\$bar\$\nbaz ", 'Dollar-quoted default value is " foo\n$bar$\nbaz "' ); is( $f9->is_primary_key, 0, 'Field is not PK' ); my $f10 = shift @t1_fields; @@ -288,6 +292,22 @@ is( $f18->is_primary_key, 0, 'Field is not PK' ); is( $f18->is_foreign_key, 0, 'Field is not FK' ); +my $f19 = shift @t1_fields; +is( $f19->name, 'f_text2', '19th field is "f_text2"' ); +is( $f19->data_type, 'text', 'Field is text' ); +is( $f19->is_nullable, 1, 'Field can be null' ); +is( $f19->size, 64000, 'Size is "64,000"' ); +is( $f19->default_value, '', 'Dollar-quoted default value is empty' ); +is( $f19->is_primary_key, 0, 'Field is not PK' ); + +my $f20 = shift @t1_fields; +is( $f20->name, 'f_text3', '20th field is "f_text3"' ); +is( $f20->data_type, 'text', 'Field is text' ); +is( $f20->is_nullable, 1, 'Field can be null' ); +is( $f20->size, 64000, 'Size is "64,000"' ); +is( $f20->default_value, '$ ', 'Dollar-quoted default value is "$ "' ); +is( $f20->is_primary_key, 0, 'Field is not PK' ); + # my $fk_ref2 = $f11->foreign_key_reference; # isa_ok( $fk_ref2, 'SQL::Translator::Schema::Constraint', 'FK' ); # is( $fk_ref2->reference_table, 't_test2', 'FK is to "t_test2" table' ); diff -Nru libsql-translator-perl-0.11024/t/23json.t libsql-translator-perl-1.60/t/23json.t --- libsql-translator-perl-0.11024/t/23json.t 2017-09-06 15:03:33.000000000 +0000 +++ libsql-translator-perl-1.60/t/23json.t 2019-04-28 11:33:51.000000000 +0000 @@ -15,7 +15,7 @@ } my $sqlt_version = $SQL::Translator::VERSION; -use JSON; +use JSON::MaybeXS 'from_json'; my $json = from_json(<new( + name => 'matview', + sql => 'SELECT id, name FROM table3', + fields => 'id, name', + extra => { + materialized => + 'REFRESH START WITH SYSDATE NEXT SYSDATE + 5/1440 FORCE WITH ROWID' + } + ); + + my ($materialized_view_def) = SQL::Translator::Producer::Oracle::create_view($materialized_view); + is_deeply( + $materialized_view_def, + [ "CREATE MATERIALIZED VIEW matview REFRESH START WITH SYSDATE NEXT SYSDATE + 5/1440 FORCE WITH ROWID AS\nSELECT id, name FROM table3" + ], + 'correct "CREATE MATERIALZED VIEW" SQL' + ); + } done_testing(); diff -Nru libsql-translator-perl-0.11024/t/data/roundtrip_autogen.yaml libsql-translator-perl-1.60/t/data/roundtrip_autogen.yaml --- libsql-translator-perl-0.11024/t/data/roundtrip_autogen.yaml 2018-01-09 10:24:44.000000000 +0000 +++ libsql-translator-perl-1.60/t/data/roundtrip_autogen.yaml 2019-05-29 19:33:30.000000000 +0000 @@ -336,4 +336,4 @@ producer_type: SQL::Translator::Producer::YAML show_warnings: 0 trace: 0 - version: 0.11024 + version: 1.60