r35560 - in /trunk/libsql-abstract-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/SQL/ t/
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Sun May 17 10:07:25 UTC 2009
Author: ansgar-guest
Date: Sun May 17 10:07:20 2009
New Revision: 35560
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=35560
Log:
* New upstream release.
* Build-depend on libclone-perl (>= 0.31).
* Add myself to Uploaders.
Modified:
trunk/libsql-abstract-perl/Changes
trunk/libsql-abstract-perl/META.yml
trunk/libsql-abstract-perl/Makefile.PL
trunk/libsql-abstract-perl/debian/changelog
trunk/libsql-abstract-perl/debian/control
trunk/libsql-abstract-perl/debian/copyright
trunk/libsql-abstract-perl/inc/Module/Install.pm
trunk/libsql-abstract-perl/inc/Module/Install/Base.pm
trunk/libsql-abstract-perl/inc/Module/Install/Can.pm
trunk/libsql-abstract-perl/inc/Module/Install/Fetch.pm
trunk/libsql-abstract-perl/inc/Module/Install/Makefile.pm
trunk/libsql-abstract-perl/inc/Module/Install/Metadata.pm
trunk/libsql-abstract-perl/inc/Module/Install/Win32.pm
trunk/libsql-abstract-perl/inc/Module/Install/WriteAll.pm
trunk/libsql-abstract-perl/lib/SQL/Abstract.pm
trunk/libsql-abstract-perl/t/04modifiers.t
Modified: trunk/libsql-abstract-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/Changes?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/Changes (original)
+++ trunk/libsql-abstract-perl/Changes Sun May 17 10:07:20 2009
@@ -1,4 +1,9 @@
Revision history for SQL::Abstract
+
+revision 1.55 2009-05-17 22:54 (UTC)
+----------------------------
+ - make sure that sql generation does not mutate the supplied
+ where condition structure
revision 1.54 2009-05-07 17:23 (UTC)
----------------------------
Modified: trunk/libsql-abstract-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/META.yml?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/META.yml (original)
+++ trunk/libsql-abstract-perl/META.yml Sun May 17 10:07:20 2009
@@ -3,6 +3,7 @@
author:
- 'Nathan Wiger <nate at wiger.org>'
build_requires:
+ Clone: 0.31
ExtUtils::MakeMaker: 6.42
Test::Builder: 0
Test::Deep: 0
@@ -12,7 +13,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.86'
+generated_by: 'Module::Install version 0.88'
license: gpl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -28,4 +29,4 @@
perl: 5.6.1
resources:
license: http://opensource.org/licenses/gpl-license.php
-version: 1.54
+version: 1.55
Modified: trunk/libsql-abstract-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/Makefile.PL?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/Makefile.PL (original)
+++ trunk/libsql-abstract-perl/Makefile.PL Sun May 17 10:07:20 2009
@@ -18,6 +18,7 @@
test_requires "Test::More" => 0;
test_requires "Test::Exception" => 0;
test_requires "Test::Warn" => 0;
+test_requires "Clone" => 0.31;
tests_recursive 't';
Modified: trunk/libsql-abstract-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/debian/changelog?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/debian/changelog (original)
+++ trunk/libsql-abstract-perl/debian/changelog Sun May 17 10:07:20 2009
@@ -1,3 +1,11 @@
+libsql-abstract-perl (1.55-1) unstable; urgency=low
+
+ * New upstream release.
+ * Build-depend on libclone-perl (>= 0.31).
+ * Add myself to Uploaders.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Sun, 17 May 2009 12:06:01 +0200
+
libsql-abstract-perl (1.54-1) unstable; urgency=low
[ Krzysztof Krzyżaniak (eloy) ]
Modified: trunk/libsql-abstract-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/debian/control?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/debian/control (original)
+++ trunk/libsql-abstract-perl/debian/control Sun May 17 10:07:20 2009
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
- gregor herrmann <gregoa at debian.org>
+ gregor herrmann <gregoa at debian.org>, Ansgar Burchardt <ansgar at 43-1.org>
Build-Depends: debhelper (>= 7)
Build-Depends-Indep: perl (>= 5.6.0-16), libtest-deep-perl,
- libtest-exception-perl, libtest-warn-perl
+ libtest-exception-perl, libtest-warn-perl, libclone-perl (>=0.31)
Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libsql-abstract-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libsql-abstract-perl/
Modified: trunk/libsql-abstract-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/debian/copyright?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/debian/copyright (original)
+++ trunk/libsql-abstract-perl/debian/copyright Sun May 17 10:07:20 2009
@@ -10,7 +10,7 @@
License-Alias: Perl
License: GPL-1+ | Artistic
-Files: inc/*:
+Files: inc/*
Copyright: © 2008 - 2009 Adam Kennedy
License-Alias: Perl
License: GPL-1+ | Artistic
Modified: trunk/libsql-abstract-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/inc/Module/Install.pm?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/inc/Module/Install.pm (original)
+++ trunk/libsql-abstract-perl/inc/Module/Install.pm Sun May 17 10:07:20 2009
@@ -28,7 +28,7 @@
# 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 = '0.86';
+ $VERSION = '0.88';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -353,7 +353,7 @@
if ( $] >= 5.006 ) {
open( FH, '<', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "< $_[0]" ) or die "open($_[0]): $!";
}
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
@@ -384,7 +384,7 @@
if ( $] >= 5.006 ) {
open( FH, '>', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "> $_[0]" ) or die "open($_[0]): $!";
}
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
Modified: trunk/libsql-abstract-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/inc/Module/Install/Base.pm?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libsql-abstract-perl/inc/Module/Install/Base.pm Sun May 17 10:07:20 2009
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.86';
+ $VERSION = '0.88';
}
# Suspend handler for "redefined" warnings
Modified: trunk/libsql-abstract-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/inc/Module/Install/Can.pm?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libsql-abstract-perl/inc/Module/Install/Can.pm Sun May 17 10:07:20 2009
@@ -9,7 +9,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.86';
+ $VERSION = '0.88';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libsql-abstract-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/inc/Module/Install/Fetch.pm?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libsql-abstract-perl/inc/Module/Install/Fetch.pm Sun May 17 10:07:20 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.86';
+ $VERSION = '0.88';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libsql-abstract-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/inc/Module/Install/Makefile.pm?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libsql-abstract-perl/inc/Module/Install/Makefile.pm Sun May 17 10:07:20 2009
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.86';
+ $VERSION = '0.88';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libsql-abstract-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/inc/Module/Install/Metadata.pm?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libsql-abstract-perl/inc/Module/Install/Metadata.pm Sun May 17 10:07:20 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.86';
+ $VERSION = '0.88';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
@@ -511,7 +511,7 @@
# 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?)$/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/_.+$//;
@@ -534,7 +534,7 @@
sub write_mymeta {
my $self = shift;
-
+
# If there's no existing META.yml there is nothing we can do
return unless -f 'META.yml';
@@ -574,7 +574,7 @@
# Save as the MYMETA.yml file
print "Writing MYMETA.yml\n";
- YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+ YAML::Tiny::DumpFile('MYMETA.yml', $meta);
}
1;
Modified: trunk/libsql-abstract-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/inc/Module/Install/Win32.pm?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libsql-abstract-perl/inc/Module/Install/Win32.pm Sun May 17 10:07:20 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.86';
+ $VERSION = '0.88';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libsql-abstract-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/inc/Module/Install/WriteAll.pm?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libsql-abstract-perl/inc/Module/Install/WriteAll.pm Sun May 17 10:07:20 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.86';
+ $VERSION = '0.88';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libsql-abstract-perl/lib/SQL/Abstract.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/lib/SQL/Abstract.pm?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/lib/SQL/Abstract.pm (original)
+++ trunk/libsql-abstract-perl/lib/SQL/Abstract.pm Sun May 17 10:07:20 2009
@@ -15,7 +15,7 @@
# GLOBALS
#======================================================================
-our $VERSION = '1.54';
+our $VERSION = '1.55';
# This would confuse some packagers
#$VERSION = eval $VERSION; # numify for warning-free dev releases
@@ -615,18 +615,20 @@
sub _where_field_op_ARRAYREF {
my ($self, $k, $op, $vals) = @_;
- if(@$vals) {
- $self->_debug("ARRAY($vals) means multiple elements: [ @$vals ]");
+ my @vals = @$vals; #always work on a copy
+
+ if(@vals) {
+ $self->_debug("ARRAY($vals) means multiple elements: [ @vals ]");
# see if the first element is an -and/-or op
my $logic;
- if ($vals->[0] =~ /^ - ( AND|OR ) $/ix) {
+ if ($vals[0] =~ /^ - ( AND|OR ) $/ix) {
$logic = uc $1;
- shift @$vals;
+ shift @vals;
}
- # distribute $op over each remaining member of @$vals, append logic if exists
- return $self->_recurse_where([map { {$k => {$op, $_}} } @$vals], $logic);
+ # distribute $op over each remaining member of @vals, append logic if exists
+ return $self->_recurse_where([map { {$k => {$op, $_}} } @vals], $logic);
# LDNOTE : had planned to change the distribution logic when
# $op =~ $self->{inequality_op}, because of Morgan laws :
@@ -635,7 +637,7 @@
# WHERE field != 22 AND field != 33.
# To do this, replace the above to roughly :
# my $logic = ($op =~ $self->{inequality_op}) ? 'AND' : 'OR';
- # return $self->_recurse_where([map { {$k => {$op, $_}} } @$vals], $logic);
+ # return $self->_recurse_where([map { {$k => {$op, $_}} } @vals], $logic);
}
else {
Modified: trunk/libsql-abstract-perl/t/04modifiers.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/t/04modifiers.t?rev=35560&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/t/04modifiers.t (original)
+++ trunk/libsql-abstract-perl/t/04modifiers.t Sun May 17 10:07:20 2009
@@ -8,6 +8,7 @@
use Data::Dumper;
use SQL::Abstract;
+use Clone;
=begin
Test -and -or and -nest modifiers, assuming the following:
@@ -371,7 +372,7 @@
},
);
-plan tests => @and_or_tests*3 + @numbered_mods*4 + @nest_tests*2;
+plan tests => @and_or_tests*4 + @numbered_mods*4 + @nest_tests*2;
for my $case (@and_or_tests) {
TODO: {
@@ -381,7 +382,10 @@
my @w;
local $SIG{__WARN__} = sub { push @w, @_ };
+
my $sql = SQL::Abstract->new ($case->{args} || {});
+ my $where_copy = Clone::clone ($case->{where});
+
lives_ok (sub {
my ($stmt, @bind) = $sql->where($case->{where});
is_same_sql_bind(
@@ -394,6 +398,8 @@
});
is (@w, 0, 'No warnings within and-or tests')
|| diag join "\n", 'Emitted warnings:', @w;
+
+ is_deeply ($case->{where}, $where_copy, 'Where conditions unchanged');
}
}
More information about the Pkg-perl-cvs-commits
mailing list