diff -Nru libsql-statement-perl-1.412/Changes libsql-statement-perl-1.414/Changes --- libsql-statement-perl-1.412/Changes 2017-04-06 12:13:43.000000000 +0000 +++ libsql-statement-perl-1.414/Changes 2020-10-21 12:20:42.000000000 +0000 @@ -1,5 +1,19 @@ Changes log for Perl extension SQL::Statement +1.414 2020-10-21 + * re-release 1.413_001 without further changes + +1.413_001 2020-09-28 + * Spell check + * Be specific in which files to skip from the distribution + * Author fixes + * Makefile.PL: port WriteMakefile1 from Hash::Merge + * .travis.yml: update for Xenial VMs + * cleanup MANIFEST.SKIP + * bump copyright year + * SQL::Parser correctly parse VALUES and SET clauses containing function invocations with several arguments + patch provided by Edgar J. Holleis + 1.412 2017-04-06 * Release 1.411_001 without further changes as 1.412 diff -Nru libsql-statement-perl-1.412/debian/changelog libsql-statement-perl-1.414/debian/changelog --- libsql-statement-perl-1.412/debian/changelog 2017-10-25 21:04:27.000000000 +0000 +++ libsql-statement-perl-1.414/debian/changelog 2020-10-23 22:53:39.000000000 +0000 @@ -1,3 +1,26 @@ +libsql-statement-perl (1.414-1) unstable; urgency=medium + + [ Damyan Ivanov ] + * declare conformance with Policy 4.1.3 (no changes needed) + + [ Salvatore Bonaccorso ] + * Update Vcs-* headers for switch to salsa.debian.org + + [ Xavier Guimard ] + * Email change: Xavier Guimard -> yadd@debian.org + + [ gregor herrmann ] + * debian/watch: use uscan version 4. + * Import upstream version 1.414. + * Update years of upstream and packaging copyright. + * Declare compliance with Debian Policy 4.5.0. + * Set Rules-Requires-Root: no. + * Drop unneeded alternative build dependencies. + * Annotate test-only build dependencies with . + * Bump debhelper-compat to 13. + + -- gregor herrmann Sat, 24 Oct 2020 00:53:39 +0200 + libsql-statement-perl (1.412-1) unstable; urgency=medium [ gregor herrmann ] @@ -209,7 +232,7 @@ * debian/control: + wrap long lines + add myself to uploaders - + add libdbd-csv-perl to B-D-I + + add libdbd-csv-perl to B-D-I * debian/rules; updated using dh-make-perl * debhelper and debian/compat set to 7 * libsql-statement-perl.doc; keep README @@ -317,7 +340,7 @@ (Closes: #279802) * Bumped up standards-version to 3.6.1 * New version is a pure-perl version, bison/yylex no longer used. - Please read /usr/share/doc/libsql-statement-perl/README.update.Debian + Please read /usr/share/doc/libsql-statement-perl/README.update.Debian on any possible problems regarding older versions. (Closes: #166549, #167060, #162167) @@ -425,6 +448,3 @@ * Initial Release. -- Craig Sanders Wed, 30 Sep 1998 08:38:41 +1000 - - - diff -Nru libsql-statement-perl-1.412/debian/compat libsql-statement-perl-1.414/debian/compat --- libsql-statement-perl-1.412/debian/compat 2017-10-25 21:04:27.000000000 +0000 +++ libsql-statement-perl-1.414/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru libsql-statement-perl-1.412/debian/control libsql-statement-perl-1.414/debian/control --- libsql-statement-perl-1.412/debian/control 2017-10-25 21:04:27.000000000 +0000 +++ libsql-statement-perl-1.414/debian/control 2020-10-23 22:53:39.000000000 +0000 @@ -2,25 +2,26 @@ Maintainer: Debian Perl Group Uploaders: gregor herrmann , Ansgar Burchardt , - Xavier Guimard + Xavier Guimard Section: perl Testsuite: autopkgtest-pkg-perl Priority: optional -Build-Depends: debhelper (>= 9) -Build-Depends-Indep: libclone-perl, - libdbi-perl, - libmath-base-convert-perl, - libmodule-runtime-perl, - libparams-util-perl, - libtest-deep-perl, - libtest-pod-coverage-perl, - libtest-pod-perl, - libtext-soundex-perl | perl (<< 5.17.9), +Build-Depends: debhelper-compat (= 13) +Build-Depends-Indep: libclone-perl , + libdbi-perl , + libmath-base-convert-perl , + libmodule-runtime-perl , + libparams-util-perl , + libtest-deep-perl , + libtest-pod-coverage-perl , + libtest-pod-perl , + libtext-soundex-perl , perl -Standards-Version: 4.1.1 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libsql-statement-perl.git -Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libsql-statement-perl.git +Standards-Version: 4.5.0 +Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libsql-statement-perl +Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libsql-statement-perl.git Homepage: https://metacpan.org/release/SQL-Statement +Rules-Requires-Root: no Package: libsql-statement-perl Architecture: all @@ -31,7 +32,7 @@ libparams-util-perl Recommends: libdbi-perl, libmath-base-convert-perl, - libtext-soundex-perl | perl (<< 5.17.9), + libtext-soundex-perl Description: module for parsing and processing SQL statements SQL::Statement is a Perl module that implements a small, abstract SQL engine. This module is not useful itself, but as a base class for deriving concrete diff -Nru libsql-statement-perl-1.412/debian/copyright libsql-statement-perl-1.414/debian/copyright --- libsql-statement-perl-1.412/debian/copyright 2017-10-25 21:04:27.000000000 +0000 +++ libsql-statement-perl-1.414/debian/copyright 2020-10-23 22:53:39.000000000 +0000 @@ -5,7 +5,7 @@ Files: * Copyright: 2001-2005, Jeff Zucker - 2007-2017, Jens Rehsack + 2007-2020, Jens Rehsack Portions Copyright 1998, Jochen Wiedmann License: Artistic or GPL-1+ @@ -18,11 +18,11 @@ 2004, Jaldhar H. Vyas 2004-2006, Gunnar Wolf 2006, Krzysztof Krzyzaniak (eloy) - 2006-2016, gregor herrmann + 2006-2020, gregor herrmann 2009-2010, Jonathan Yu 2010, Ansgar Burchardt 2010, Nathan Handler - 2013-2017, Xavier Guimard + 2013-2017, Xavier Guimard License: Artistic or GPL-1+ License: Artistic diff -Nru libsql-statement-perl-1.412/debian/upstream/metadata libsql-statement-perl-1.414/debian/upstream/metadata --- libsql-statement-perl-1.412/debian/upstream/metadata 2017-10-25 21:04:27.000000000 +0000 +++ libsql-statement-perl-1.414/debian/upstream/metadata 2020-10-23 22:53:39.000000000 +0000 @@ -2,7 +2,5 @@ Archive: CPAN Bug-Database: https://rt.cpan.org/Public/Dist/Display.html?Name=SQL-Statement Bug-Submit: sql-statement@rt.cpan.org -Contact: Jeff Zucker , Jens Rehsack -Name: SQL-Statement Repository: https://github.com/perl5-dbi/SQL-Statement.git Repository-Browse: https://github.com/perl5-dbi/SQL-Statement diff -Nru libsql-statement-perl-1.412/debian/watch libsql-statement-perl-1.414/debian/watch --- libsql-statement-perl-1.412/debian/watch 2017-10-25 21:04:27.000000000 +0000 +++ libsql-statement-perl-1.414/debian/watch 2020-10-23 22:53:39.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 -https://metacpan.org/release/SQL-Statement .*/SQL-Statement-v?(\d[\d.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip) +version=4 +https://metacpan.org/release/SQL-Statement .*/SQL-Statement-v?@ANY_VERSION@@ARCHIVE_EXT@$ diff -Nru libsql-statement-perl-1.412/lib/SQL/Dialects/ANSI.pm libsql-statement-perl-1.414/lib/SQL/Dialects/ANSI.pm --- libsql-statement-perl-1.412/lib/SQL/Dialects/ANSI.pm 2017-04-06 12:12:09.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Dialects/ANSI.pm 2020-10-21 12:18:10.000000000 +0000 @@ -3,7 +3,7 @@ ######################################################################### # # This module is copyright (c), 2001,2005 by Jeff Zucker. -# This module is copyright (c), 2007-2017 by Jens Rehsack. +# This module is copyright (c), 2007-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -15,7 +15,7 @@ use warnings FATAL => "all"; use vars qw($VERSION); -$VERSION = '1.412'; +$VERSION = '1.414'; use SQL::Dialects::Role; @@ -354,7 +354,7 @@ This module is copyright (c) 2001,2005 by Jeff Zucker and - copyright (c) 2007-2017 by Jens Rehsack. + copyright (c) 2007-2020 by Jens Rehsack. All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Dialects/AnyData.pm libsql-statement-perl-1.414/lib/SQL/Dialects/AnyData.pm --- libsql-statement-perl-1.412/lib/SQL/Dialects/AnyData.pm 2017-04-06 12:12:09.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Dialects/AnyData.pm 2020-10-21 12:18:10.000000000 +0000 @@ -3,7 +3,7 @@ ######################################################################### # # This module is copyright (c), 2001,2005 by Jeff Zucker. -# This module is copyright (c), 2007-2017 by Jens Rehsack. +# This module is copyright (c), 2007-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -15,7 +15,7 @@ use warnings FATAL => "all"; use vars qw($VERSION); -$VERSION = '1.412'; +$VERSION = '1.414'; use SQL::Dialects::Role; @@ -148,7 +148,7 @@ This module is copyright (c) 2001,2005 by Jeff Zucker and - copyright (c) 2007-2017 by Jens Rehsack. + copyright (c) 2007-2020 by Jens Rehsack. All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Dialects/CSV.pm libsql-statement-perl-1.414/lib/SQL/Dialects/CSV.pm --- libsql-statement-perl-1.412/lib/SQL/Dialects/CSV.pm 2017-04-06 12:12:09.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Dialects/CSV.pm 2020-10-21 12:18:10.000000000 +0000 @@ -3,7 +3,7 @@ ######################################################################### # # This module is copyright (c), 2001,2005 by Jeff Zucker. -# This module is copyright (c), 2007-2017 by Jens Rehsack. +# This module is copyright (c), 2007-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -15,7 +15,7 @@ use warnings FATAL => "all"; use vars qw($VERSION); -$VERSION = '1.412'; +$VERSION = '1.414'; use SQL::Dialects::Role; @@ -139,7 +139,7 @@ This module is copyright (c) 2001,2005 by Jeff Zucker and - copyright (c) 2007-2017 by Jens Rehsack. + copyright (c) 2007-2020 by Jens Rehsack. All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Dialects/Role.pm libsql-statement-perl-1.414/lib/SQL/Dialects/Role.pm --- libsql-statement-perl-1.412/lib/SQL/Dialects/Role.pm 2017-04-06 12:12:09.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Dialects/Role.pm 2020-10-21 12:18:10.000000000 +0000 @@ -3,7 +3,7 @@ ######################################################################### # # This module is copyright (c), 2009 by Michael G. Schwern -# This module is copyright (c), 2009-2017 by Jens Rehsack. +# This module is copyright (c), 2009-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -16,7 +16,7 @@ use base qw(Exporter); our @EXPORT = qw(get_config_as_hash); -our $VERSION = '1.412'; +our $VERSION = '1.414'; sub get_config_as_hash { @@ -112,7 +112,7 @@ This module is copyright (c), 2009 by Michael G. Schwern - copyright (c), 2009-2017 by Jens Rehsack. + copyright (c), 2009-2020 by Jens Rehsack. All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Eval.pm libsql-statement-perl-1.414/lib/SQL/Eval.pm --- libsql-statement-perl-1.412/lib/SQL/Eval.pm 2017-04-06 12:12:08.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Eval.pm 2020-10-21 12:18:08.000000000 +0000 @@ -3,7 +3,7 @@ ######################################################################### # # This module is copyright (c), 2001,2005 by Jeff Zucker. -# This module is copyright (c), 2007-2017 by Jens Rehsack. +# This module is copyright (c), 2007-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -16,7 +16,7 @@ use warnings FATAL => "all"; use vars qw($VERSION); -$VERSION = '1.412'; +$VERSION = '1.414'; use Carp qw(croak); @@ -278,7 +278,7 @@ =item _gen_access_fastpath Return a subroutine reference for fast accessing columns for read-only -access. When the instantiated object doesn't provide own methods for +access. When the instantiated object does not provide own methods for C and C a subroutine reference is returned which directly access the internal data structures. For all other cases a subroutine directly calling C<< $self->column($_[0]) >> is returned. @@ -512,7 +512,7 @@ =head1 MULTITHREADING All methods are working with instance-local data only, thus the module -is reentrant and thread safe, if you either don't share handles between +is reentrant and thread safe, if you either do not share handles between threads or grant serialized use. =head1 BUGS diff -Nru libsql-statement-perl-1.412/lib/SQL/Parser.pm libsql-statement-perl-1.414/lib/SQL/Parser.pm --- libsql-statement-perl-1.412/lib/SQL/Parser.pm 2017-04-06 12:12:09.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Parser.pm 2020-10-21 12:18:09.000000000 +0000 @@ -3,7 +3,7 @@ ###################################################################### # # This module is copyright (c), 2001,2005 by Jeff Zucker. -# This module is copyright (c), 2007-2017 by Jens Rehsack. +# This module is copyright (c), 2007-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -20,9 +20,9 @@ use Carp qw(carp croak); use Params::Util qw(_ARRAY0 _ARRAY _HASH); use Scalar::Util qw(looks_like_number); -use Text::Balanced qw(extract_bracketed); +use Text::Balanced qw(extract_bracketed extract_multiple); -$VERSION = '1.412'; +$VERSION = '1.414'; BEGIN { @@ -1181,7 +1181,10 @@ sub SET_CLAUSE_LIST { my ( $self, $set_string ) = @_; - my @sets = split( /,/, $set_string ); + my @sets = extract_multiple($set_string, [ + sub { my ($m, $r, $p) = extract_bracketed($_[0], "()", qr/[^,(]*/); (($p||'').($m||''), $r, ''); }, + qr/([^,(]+)/, + ], undef, 1); my ( @cols, @vals ); for my $set (@sets) { @@ -1878,7 +1881,10 @@ sub LITERAL_LIST { my ( $self, $str ) = @_; - my @tokens = split /,/, $str; + my @tokens = extract_multiple($str, [ + sub { my ($m, $r, $p) = extract_bracketed($_[0], "()", qr/[^,(]*/); (($p||'').($m||''), $r, ''); }, + qr/([^,(]+)/, + ], undef, 1); my @values; for my $tok (@tokens) { @@ -3435,7 +3441,7 @@ This module is copyright (c) 2001,2005 by Jeff Zucker and - copyright (c) 2007-2017 by Jens Rehsack. + copyright (c) 2007-2020 by Jens Rehsack. All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/Embed.pod libsql-statement-perl-1.414/lib/SQL/Statement/Embed.pod --- libsql-statement-perl-1.412/lib/SQL/Statement/Embed.pod 2014-12-02 08:33:35.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/Embed.pod 2020-09-25 12:26:18.000000000 +0000 @@ -314,7 +314,7 @@ =head1 AUTHOR & COPYRIGHT Copyright (c) 2005, Jeff Zucker , all rights reserved. - Copyright (c) 2010, Jens Rehsack , all rights reserved. + Copyright (c) 2010-2020, Jens Rehsack , all rights reserved. This document may be freely modified and distributed under the same terms as Perl itself. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/Function.pm libsql-statement-perl-1.414/lib/SQL/Statement/Function.pm --- libsql-statement-perl-1.412/lib/SQL/Statement/Function.pm 2017-04-06 12:12:09.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/Function.pm 2020-10-21 12:18:09.000000000 +0000 @@ -2,7 +2,7 @@ ###################################################################### # -# This module is copyright (c), 2009-2017 by Jens Rehsack. +# This module is copyright (c), 2009-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -17,7 +17,7 @@ use SQL::Statement::Term (); @ISA = qw(SQL::Statement::Term); -$VERSION = '1.412'; +$VERSION = '1.414'; =pod @@ -27,7 +27,7 @@ =head1 SYNOPSIS - # this class doesn't have a common constructor, because all derived classes + # this class does not have a common constructor, because all derived classes # have their special requirements =head1 DESCRIPTION @@ -287,7 +287,7 @@ =item I<\@params> -Expected to be an array with exact 1 element (more aren't evaluated). +Expected to be an array with exact 1 element (more are not evaluated). =back @@ -381,7 +381,7 @@ =item I<\@params> -Expected to be an array with exact 1 element (more aren't evaluated). +Expected to be an array with exact 1 element (more are not evaluated). =back @@ -479,7 +479,7 @@ =head1 AUTHOR AND COPYRIGHT -Copyright (c) 2009-2017 by Jens Rehsack: rehsackATcpan.org +Copyright (c) 2009-2020 by Jens Rehsack: rehsackATcpan.org All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/Functions.pm libsql-statement-perl-1.414/lib/SQL/Statement/Functions.pm --- libsql-statement-perl-1.412/lib/SQL/Statement/Functions.pm 2017-04-06 12:12:10.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/Functions.pm 2020-10-21 12:18:09.000000000 +0000 @@ -4,7 +4,7 @@ # # This module is copyright (c), 2001,2005 by Jeff Zucker. # This module is copyright (c), 2011,2012 by Brendan Byrd. -# This module is copyright (c), 2009-2017 by Jens Rehsack. +# This module is copyright (c), 2009-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -235,7 +235,7 @@ =cut use vars qw($VERSION); -$VERSION = '1.412'; +$VERSION = '1.414'; =pod @@ -1297,7 +1297,7 @@ =head1 AUTHOR & COPYRIGHT Copyright (c) 2005 by Jeff Zucker: jzuckerATcpan.org -Copyright (c) 2009-2017 by Jens Rehsack: rehsackATcpan.org +Copyright (c) 2009-2020 by Jens Rehsack: rehsackATcpan.org All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/GetInfo.pm libsql-statement-perl-1.414/lib/SQL/Statement/GetInfo.pm --- libsql-statement-perl-1.412/lib/SQL/Statement/GetInfo.pm 2017-04-06 12:12:10.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/GetInfo.pm 2020-10-21 12:18:09.000000000 +0000 @@ -3,7 +3,7 @@ ###################################################################### # # This module is copyright (c), 2001,2005 by Jeff Zucker. -# This module is copyright (c), 2007-2017 by Jens Rehsack. +# This module is copyright (c), 2007-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -15,7 +15,7 @@ use warnings FATAL => "all"; use vars qw($VERSION %info); -$VERSION = '1.412'; +$VERSION = '1.414'; use SQL::Statement(); @@ -580,7 +580,7 @@ This module is copyright (c) 2001,2005 by Jeff Zucker and - copyright (c) 2007-2017 by Jens Rehsack. + copyright (c) 2007-2020 by Jens Rehsack. All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/Operation.pm libsql-statement-perl-1.414/lib/SQL/Statement/Operation.pm --- libsql-statement-perl-1.412/lib/SQL/Statement/Operation.pm 2017-04-06 12:12:10.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/Operation.pm 2020-10-21 12:18:10.000000000 +0000 @@ -2,7 +2,7 @@ ###################################################################### # -# This module is copyright (c), 2009-2017 by Jens Rehsack. +# This module is copyright (c), 2009-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -18,7 +18,7 @@ use SQL::Statement::Term (); -our $VERSION = '1.412'; +our $VERSION = '1.414'; @ISA = qw(SQL::Statement::Term); @@ -1057,7 +1057,7 @@ =head1 AUTHOR AND COPYRIGHT -Copyright (c) 2009,2017 by Jens Rehsack: rehsackATcpan.org +Copyright (c) 2009-2020 by Jens Rehsack: rehsackATcpan.org All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/Placeholder.pm libsql-statement-perl-1.414/lib/SQL/Statement/Placeholder.pm --- libsql-statement-perl-1.412/lib/SQL/Statement/Placeholder.pm 2017-04-06 12:12:10.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/Placeholder.pm 2020-10-21 12:18:09.000000000 +0000 @@ -2,7 +2,7 @@ ###################################################################### # -# This module is copyright (c), 2009-2017 by Jens Rehsack. +# This module is copyright (c), 2009-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -18,7 +18,7 @@ use SQL::Statement::Term (); -our $VERSION = '1.412'; +our $VERSION = '1.414'; @ISA = qw(SQL::Statement::Term); @@ -85,7 +85,7 @@ =head1 AUTHOR AND COPYRIGHT -Copyright (c) 2009-2017 by Jens Rehsack: rehsackATcpan.org +Copyright (c) 2009-2020 by Jens Rehsack: rehsackATcpan.org All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/RAM.pm libsql-statement-perl-1.414/lib/SQL/Statement/RAM.pm --- libsql-statement-perl-1.412/lib/SQL/Statement/RAM.pm 2017-04-06 12:12:10.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/RAM.pm 2020-10-21 12:18:09.000000000 +0000 @@ -5,7 +5,7 @@ ###################################################################### # # This module is copyright (c), 2001,2005 by Jeff Zucker. -# This module is copyright (c), 2007-2017 by Jens Rehsack. +# This module is copyright (c), 2007-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -17,7 +17,7 @@ use warnings FATAL => "all"; use vars qw($VERSION); -$VERSION = '1.412'; +$VERSION = '1.414'; #################################### package SQL::Statement::RAM::Table; @@ -292,7 +292,7 @@ =head1 AUTHOR AND COPYRIGHT Copyright (c) 2001,2005 by Jeff Zucker: jzuckerATcpan.org -Copyright (c) 2007-2017 by Jens Rehsack: rehsackATcpan.org +Copyright (c) 2007-2020 by Jens Rehsack: rehsackATcpan.org All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/Roadmap.pod libsql-statement-perl-1.414/lib/SQL/Statement/Roadmap.pod --- libsql-statement-perl-1.412/lib/SQL/Statement/Roadmap.pod 2014-12-02 08:33:35.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/Roadmap.pod 2020-09-25 12:26:18.000000000 +0000 @@ -22,7 +22,7 @@ =head3 CREATE and DROP of FUNCTION, KEYWORD, OPERATOR, TYPE SQL::Statement is missing some functions, types, operators etc. It's -supported to add missing functionality - but the implementation wasn't +supported to add missing functionality - but the implementation was not picked up during the modernizing of column evaluation. See RT#52397 for some more information. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/Structure.pod libsql-statement-perl-1.414/lib/SQL/Statement/Structure.pod --- libsql-statement-perl-1.412/lib/SQL/Statement/Structure.pod 2014-12-02 08:33:35.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/Structure.pod 2020-09-25 12:26:18.000000000 +0000 @@ -305,7 +305,7 @@ =head2 execute When called from a DBD or other subclass of SQL::Statement, the execute() -method will be executed against whatever datasource (persistent storage) is +method will be executed against whatever data-source (persistent storage) is supplied by the DBD or the subclass (e.g. CSV files for L, or BerkeleyDB for L). If you are using L directly rather than as a subclass, you can call the execute() method and the @@ -361,7 +361,7 @@ =head1 AUTHOR & COPYRIGHT Copyright (c) 2005, Jeff Zucker , all rights reserved. -Copyright (c) 2009, Jens Rehsack , all rights reserved. +Copyright (c) 2009-2020, Jens Rehsack , all rights reserved. This document may be freely modified and distributed under the same terms as Perl itself. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/Syntax.pod libsql-statement-perl-1.414/lib/SQL/Statement/Syntax.pod --- libsql-statement-perl-1.412/lib/SQL/Statement/Syntax.pod 2014-12-02 08:33:35.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/Syntax.pod 2020-09-25 12:26:18.000000000 +0000 @@ -283,7 +283,7 @@ case SENSITIVE so column "foo", "fOo", "FOO" each refer to different columns. A delimited identifier is *never* equal to a regular identifier (so "foo" and -foo are two different columns). But don't do that :-). +foo are two different columns). But do not do that :-). Remember thought that, in L if table names are used directly as file names, the case sensitivity depends on the OS e.g. on Windows files named foo, @@ -373,7 +373,7 @@ my $sth = $dbh->prepare(" SELECT * FROM RUN( 'query.sql' ) "); If the file contains a statement with placeholders, the values for the -placehoders can be passed in the call to $sth->execute() as normal. If the +placeholders can be passed in the call to $sth->execute() as normal. If the query.sql file contains "SELECT id,name FROM x WHERE id=?", then these two are the same: @@ -402,7 +402,7 @@ Surrounded by either single quotes; some characters need to be escaped with a backslash, in particular the backslash itself (\\), -the NUL byte (\0), Line feeds (\n), Carriage return (\r), and the +the NULL byte (\0), Line feeds (\n), Carriage return (\r), and the quotes (\'). B Quoting "Strings" using double quotes are recognized as @@ -461,7 +461,7 @@ parsing the statement. In the reverse situation, suppose you want to parse some SQL that defines a -column as type BIG_BLOB. Since 'BIG_BLOB' isn't a recognized ANSI data type, +column as type BIG_BLOB. Since 'BIG_BLOB' is not a recognized ANSI data type, an error will be produced by default. To make the parser treat it as a valid data type, you do this: @@ -532,7 +532,7 @@ =head1 AUTHOR & COPYRIGHT Copyright (c) 2005, Jeff Zucker , all rights reserved. -Copyright (c) 2009, Jens Rehsack , all rights reserved. +Copyright (c) 2009-2020, Jens Rehsack , all rights reserved. This document may be freely modified and distributed under the same terms as Perl itself. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/TermFactory.pm libsql-statement-perl-1.414/lib/SQL/Statement/TermFactory.pm --- libsql-statement-perl-1.412/lib/SQL/Statement/TermFactory.pm 2017-04-06 12:12:10.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/TermFactory.pm 2020-10-21 12:18:10.000000000 +0000 @@ -2,7 +2,7 @@ ###################################################################### # -# This module is copyright (c), 2009-2017 by Jens Rehsack. +# This module is copyright (c), 2009-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -22,7 +22,7 @@ use Params::Util qw(_HASH _ARRAY0 _INSTANCE); use Scalar::Util qw(blessed weaken); -our $VERSION = '1.412'; +our $VERSION = '1.414'; my %oplist = ( '=' => 'Equal', @@ -218,7 +218,7 @@ =head1 AUTHOR AND COPYRIGHT Copyright (c) 2001,2005 by Jeff Zucker: jzuckerATcpan.org -Copyright (c) 2009-2017 by Jens Rehsack: rehsackATcpan.org +Copyright (c) 2009-2020 by Jens Rehsack: rehsackATcpan.org All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/Term.pm libsql-statement-perl-1.414/lib/SQL/Statement/Term.pm --- libsql-statement-perl-1.412/lib/SQL/Statement/Term.pm 2017-04-06 12:12:10.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/Term.pm 2020-10-21 12:18:09.000000000 +0000 @@ -2,7 +2,7 @@ ###################################################################### # -# This module is copyright (c), 2009-2017 by Jens Rehsack. +# This module is copyright (c), 2009-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -13,7 +13,7 @@ use strict; use warnings FATAL => "all"; -our $VERSION = '1.412'; +our $VERSION = '1.414'; use Scalar::Util qw(weaken); use Carp (); @@ -236,7 +236,7 @@ =head1 AUTHOR AND COPYRIGHT -Copyright (c) 2009-2017 by Jens Rehsack: rehsackATcpan.org +Copyright (c) 2009-2020 by Jens Rehsack: rehsackATcpan.org All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement/Util.pm libsql-statement-perl-1.414/lib/SQL/Statement/Util.pm --- libsql-statement-perl-1.412/lib/SQL/Statement/Util.pm 2017-04-06 12:12:10.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement/Util.pm 2020-10-21 12:18:09.000000000 +0000 @@ -3,7 +3,7 @@ ###################################################################### # # This module is copyright (c), 2001,2005 by Jeff Zucker. -# This module is copyright (c), 2007-2017 by Jens Rehsack. +# This module is copyright (c), 2007-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -15,7 +15,7 @@ use warnings FATAL => "all"; use vars qw($VERSION); -$VERSION = '1.412'; +$VERSION = '1.414'; sub type { @@ -168,7 +168,7 @@ This module is copyright (c) 2001,2005 by Jeff Zucker and - copyright (c) 2007-2017 by Jens Rehsack. + copyright (c) 2007-2020 by Jens Rehsack. All rights reserved. diff -Nru libsql-statement-perl-1.412/lib/SQL/Statement.pm libsql-statement-perl-1.414/lib/SQL/Statement.pm --- libsql-statement-perl-1.412/lib/SQL/Statement.pm 2017-04-06 12:12:09.000000000 +0000 +++ libsql-statement-perl-1.414/lib/SQL/Statement.pm 2020-10-21 12:18:09.000000000 +0000 @@ -3,7 +3,7 @@ ######################################################################### # # This module is copyright (c), 2001,2005 by Jeff Zucker. -# This module is copyright (c), 2007-2017 by Jens Rehsack. +# This module is copyright (c), 2007-2020 by Jens Rehsack. # All rights reserved. # # It may be freely distributed under the same terms as Perl itself. @@ -32,7 +32,7 @@ #use locale; -$VERSION = '1.412'; +$VERSION = '1.414'; sub new { @@ -1537,7 +1537,7 @@ } # the following should be probably conditioned on an option, - # but I don't know which --BW + # but I do not know which --BW elsif ( 'USING' eq $join->{clause} ) { my @keys = @{ $join->{keycols} }; @@ -2750,12 +2750,14 @@ Rehsack is the maintainer. Copyright (c) 2001,2005 by Jeff Zucker: jzuckerATcpan.org -Copyright (c) 2007-2017 by Jens Rehsack: rehsackATcpan.org +Copyright (c) 2007-2020 by Jens Rehsack: rehsackATcpan.org Portions Copyright (C) 1998 by Jochen Wiedmann: jwiedATcpan.org All rights reserved. +=head1 LICENSE + You may distribute this module under the terms of either the GNU General Public License or the Artistic License, as specified in the Perl README file. diff -Nru libsql-statement-perl-1.412/Makefile.PL libsql-statement-perl-1.414/Makefile.PL --- libsql-statement-perl-1.412/Makefile.PL 2017-03-30 08:04:38.000000000 +0000 +++ libsql-statement-perl-1.414/Makefile.PL 2020-09-25 12:26:18.000000000 +0000 @@ -59,7 +59,7 @@ WriteMakefile1( MIN_PERL_VERSION => '5.008', META_MERGE => { - 'meta-spec' => { version => 2 }, + 'meta-spec' => {version => 2}, resources => { homepage => 'https://metacpan.org/release/SQL-Statement', x_IRC => "irc://irc.perl.org/#dbi", @@ -123,26 +123,26 @@ TEST_REQUIRES => \%TEST_DEPS, LICENSE => 'perl', AUTHOR => 'Jeff Zucker , Jens Rehsack ', - test => { TESTS => 't/*.t xt/*.t' }, + test => {TESTS => 't/*.t xt/*.t'}, ); sub CheckConflicts { my %params = @_; - my %conflicts = %{ $params{CONFLICTS} }; + my %conflicts = %{$params{CONFLICTS}}; my $found = 0; - while ( my ( $module, $version ) = each(%conflicts) ) + while (my ($module, $version) = each(%conflicts)) { undef $@; eval "require $module"; next if $@; my $installed = eval "\$" . $module . "::VERSION"; - if ( $installed le $version ) + if ($installed le $version) { ++$found; - my $msg = $module eq $params{NAME} ? $selfConflictMsg : $conflictMsg; - my $warning = sprintf( $msg, $module, $installed ); + my $msg = $module eq $params{NAME} ? $selfConflictMsg : $conflictMsg; + my $warning = sprintf($msg, $module, $installed); warn $warning; } } @@ -151,41 +151,44 @@ } sub WriteMakefile1 -{ #Written by Alexandr Ciornii, version 0.21. Added by eumm-upgrade. +{ # originally written by Alexandr Ciornii, version 0.21. Added by eumm-upgrade. my %params = @_; my $eumm_version = $ExtUtils::MakeMaker::VERSION; $eumm_version = eval $eumm_version; - die "EXTRA_META is deprecated" if ( exists( $params{EXTRA_META} ) ); - die "License not specified" if ( !exists( $params{LICENSE} ) ); + die "EXTRA_META is deprecated" if (exists($params{EXTRA_META})); + die "License not specified" if (!exists($params{LICENSE})); $params{TEST_REQUIRES} and $eumm_version < 6.6303 - and $params{BUILD_REQUIRES} = { %{ $params{BUILD_REQUIRES} || {} }, %{ delete $params{TEST_REQUIRES} } }; + and $params{BUILD_REQUIRES} = {%{$params{BUILD_REQUIRES} || {}}, %{delete $params{TEST_REQUIRES}}}; #EUMM 6.5502 has problems with BUILD_REQUIRES $params{BUILD_REQUIRES} and $eumm_version < 6.5503 - and $params{PREREQ_PM} = { %{ $params{PREREQ_PM} || {} }, %{ delete $params{BUILD_REQUIRES} } }; + and $params{PREREQ_PM} = {%{$params{PREREQ_PM} || {}}, %{delete $params{BUILD_REQUIRES}}}; ref $params{AUTHOR} and "ARRAY" eq ref $params{AUTHOR} and $eumm_version < 6.5702 - and $params{AUTHOR} = join( ", ", @{ $params{AUTHOR} } ); - delete $params{CONFIGURE_REQUIRES} if ( $eumm_version < 6.52 ); - delete $params{MIN_PERL_VERSION} if ( $eumm_version < 6.48 ); - delete $params{META_MERGE} if ( $eumm_version < 6.46 ); - delete $params{META_ADD}{prereqs} if ( $eumm_version < 6.58 ); - delete $params{META_ADD}{'meta-spec'} if ( $eumm_version < 6.58 ); - delete $params{META_ADD} if ( $eumm_version < 6.46 ); - delete $params{LICENSE} if ( $eumm_version < 6.31 ); - delete $params{AUTHOR} if ( $] < 5.005 ); - delete $params{ABSTRACT_FROM} if ( $] < 5.005 ); - delete $params{BINARY_LOCATION} if ( $] < 5.005 ); + and $params{AUTHOR} = join(", ", @{$params{AUTHOR}}); + delete $params{CONFIGURE_REQUIRES} if ($eumm_version < 6.52); + delete $params{MIN_PERL_VERSION} if ($eumm_version < 6.48); + delete $params{META_MERGE} if ($eumm_version < 6.46); + delete $params{META_ADD}{prereqs} if ($eumm_version < 6.58); + delete $params{META_ADD}{'meta-spec'} if ($eumm_version < 6.58); + delete $params{META_ADD} if ($eumm_version < 6.46); + delete $params{LICENSE} if ($eumm_version < 6.31); + delete $params{AUTHOR} if ($] < 5.005); + delete $params{ABSTRACT_FROM} if ($] < 5.005); + delete $params{BINARY_LOCATION} if ($] < 5.005); # more or less taken from Moose' Makefile.PL - if ( $params{CONFLICTS} ) + if ($params{CONFLICTS}) { my $ok = CheckConflicts(%params); - exit(0) if ( $params{PREREQ_FATAL} and not $ok ); - my $cpan_smoker = grep { $_ =~ m/(?:CR_SMOKER|CPAN_REPORTER|AUTOMATED_TESTING)/ } keys %ENV; - unless ( $cpan_smoker || $ENV{PERL_MM_USE_DEFAULT} || $ENV{SQL_STATEMENT_WARN_UPDATE} ) + exit(0) if ($params{PREREQ_FATAL} and not $ok); + my $cpan_smoker = grep { $_ =~ m/(?:CR_SMOKER|CPAN_REPORTER|AUTOMATED_TESTING)/ } + keys %ENV; + unless ($cpan_smoker + || $ENV{PERL_MM_USE_DEFAULT} + || $ENV{SQL_STATEMENT_WARN_UPDATE}) { sleep 4 unless ($ok); } diff -Nru libsql-statement-perl-1.412/MANIFEST.SKIP libsql-statement-perl-1.414/MANIFEST.SKIP --- libsql-statement-perl-1.412/MANIFEST.SKIP 2015-05-20 18:40:59.000000000 +0000 +++ libsql-statement-perl-1.414/MANIFEST.SKIP 2020-09-28 15:23:26.000000000 +0000 @@ -26,10 +26,12 @@ ~$ .*\.planner \bxt -^MYMETA\.json$ -^MYMETA\..*$ +^MYMETA\. bugsql nytprof* .*\.csv -^\..* +\.aspell\.local\.pws +.*\.lock +\.travis\.yml SQL-Statement-.* +cover_db/ diff -Nru libsql-statement-perl-1.412/META.json libsql-statement-perl-1.414/META.json --- libsql-statement-perl-1.412/META.json 2017-04-06 12:47:47.000000000 +0000 +++ libsql-statement-perl-1.414/META.json 2020-10-21 14:42:51.000000000 +0000 @@ -4,13 +4,13 @@ "Jeff Zucker , Jens Rehsack " ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010", + "generated_by" : "ExtUtils::MakeMaker version 7.46, CPAN::Meta::Converter version 2.150010", "license" : [ "perl_5" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" + "version" : 2 }, "name" : "SQL-Statement", "no_index" : { @@ -97,6 +97,6 @@ "x_IRC" : "irc://irc.perl.org/#dbi", "x_MailingList" : "mailto:dbi-dev@perl.org'" }, - "version" : "1.412", - "x_serialization_backend" : "JSON::PP version 2.27400_02" + "version" : "1.414", + "x_serialization_backend" : "JSON::PP version 4.05" } diff -Nru libsql-statement-perl-1.412/META.yml libsql-statement-perl-1.414/META.yml --- libsql-statement-perl-1.412/META.yml 2017-04-06 12:47:47.000000000 +0000 +++ libsql-statement-perl-1.414/META.yml 2020-10-21 14:42:51.000000000 +0000 @@ -16,7 +16,7 @@ DBI: '1.611' SQL::Statement: '1.20' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010' +generated_by: 'ExtUtils::MakeMaker version 7.46, CPAN::Meta::Converter version 2.150010' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -46,5 +46,5 @@ homepage: https://metacpan.org/release/SQL-Statement license: http://dev.perl.org/licenses/ repository: https://github.com/perl5-dbi/SQL-Statement.git -version: '1.412' +version: '1.414' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -Nru libsql-statement-perl-1.412/t/16parse.t libsql-statement-perl-1.414/t/16parse.t --- libsql-statement-perl-1.412/t/16parse.t 2017-03-30 08:02:25.000000000 +0000 +++ libsql-statement-perl-1.414/t/16parse.t 2020-09-25 12:26:18.000000000 +0000 @@ -11,6 +11,8 @@ my($stmt,$cache)=(undef,{}); my $p = SQL::Parser->new(); +$p->{RaiseError}=1; + my $sql1 = 'SELECT * FROM x JOIN y ON x.a = y.b AND x.c = y.d'; ok(cmp_parse($sql1,$sql1), 'JOIN with AND'); @@ -26,6 +28,12 @@ my $sql5 = 'SELECT * FROM x JOIN y ON (x.a = y.b AND x.a > 12 AND x.a < 20) OR (x.c = y.d OR x.e = y.f)'; ok(cmp_parse($sql5,$sql5), 'JOIN with lt"<" and gt">"'); +my $sql6 = "INSERT INTO asdf (col1, col2) VALUES ('asdf', CONCAT('x', 'y', 'z'))"; +ok(cmp_parse($sql6,$sql6), 'FUNCTION in VALUES'); + +my $sql7 = "UPDATE asdf SET (col1 = 'asdf', col2 = CONCAT('x', 'y', 'z'))"; +ok(cmp_parse($sql7,$sql7), 'FUNCTION in SET CLAUSE'); + done_testing(); sub cmp_parse {