r34569 - in /trunk/libsql-abstract-perl: Changes MANIFEST META.yml Makefile.PL debian/changelog debian/copyright inc/ lib/SQL/Abstract.pm lib/SQL/Abstract/Test.pm t/04modifiers.t
eloy at users.alioth.debian.org
eloy at users.alioth.debian.org
Fri May 1 18:58:01 UTC 2009
Author: eloy
Date: Fri May 1 18:57:52 2009
New Revision: 34569
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=34569
Log:
new upstream version
Added:
trunk/libsql-abstract-perl/inc/
- copied from r34567, branches/upstream/libsql-abstract-perl/current/inc/
Modified:
trunk/libsql-abstract-perl/Changes
trunk/libsql-abstract-perl/MANIFEST
trunk/libsql-abstract-perl/META.yml
trunk/libsql-abstract-perl/Makefile.PL
trunk/libsql-abstract-perl/debian/changelog
trunk/libsql-abstract-perl/debian/copyright
trunk/libsql-abstract-perl/lib/SQL/Abstract.pm
trunk/libsql-abstract-perl/lib/SQL/Abstract/Test.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=34569&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/Changes (original)
+++ trunk/libsql-abstract-perl/Changes Fri May 1 18:57:52 2009
@@ -1,4 +1,9 @@
Revision history for SQL::Abstract
+
+revision 1.53 2009-04-30 14:58 (UTC)
+----------------------------
+ - make sure hash keys are sorted in all search sub-conditions
+ - switch installer from EU::MM to M::I
revision 1.52 2009-04-28 23:14 (UTC)
----------------------------
Modified: trunk/libsql-abstract-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/MANIFEST?rev=34569&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/MANIFEST (original)
+++ trunk/libsql-abstract-perl/MANIFEST Fri May 1 18:57:52 2009
@@ -1,9 +1,18 @@
Changes
+inc/Module/Install.pm
+inc/Module/Install/Base.pm
+inc/Module/Install/Can.pm
+inc/Module/Install/Fetch.pm
+inc/Module/Install/Makefile.pm
+inc/Module/Install/Metadata.pm
+inc/Module/Install/Win32.pm
+inc/Module/Install/WriteAll.pm
INSTALL
lib/SQL/Abstract.pm
lib/SQL/Abstract/Test.pm
Makefile.PL
MANIFEST This list of files
+META.yml
t/00new.t
t/01generate.t
t/02where.t
@@ -15,4 +24,3 @@
t/08special_ops.t
t/09refkind.t
t/10test.t
-META.yml Module meta-data (added by MakeMaker)
Modified: trunk/libsql-abstract-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/META.yml?rev=34569&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/META.yml (original)
+++ trunk/libsql-abstract-perl/META.yml Fri May 1 18:57:52 2009
@@ -1,29 +1,26 @@
---- #YAML:1.0
-name: SQL-Abstract
-version: 1.52
-abstract: Generate SQL from Perl data structures
+---
+abstract: 'Generate SQL from Perl data structures'
author:
- - Matt Trout <mst at shadowcat.co.uk>, but see the POD
-license: unknown
-distribution_type: module
-configure_requires:
- ExtUtils::MakeMaker: 0
+ - 'Nathan Wiger <nate at wiger.org>'
build_requires:
- ExtUtils::MakeMaker: 0
+ Test::Builder: 0
+ Test::Deep: 0
+ Test::Exception: 0
+ Test::More: 0
+ Test::Warn: 0
+distribution_type: module
+generated_by: 'Module::Install version 0.79'
+license: gpl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+name: SQL-Abstract
+no_index:
+ directory:
+ - inc
+ - t
requires:
- Data::Dumper: 0
- List::Util: 0
- Scalar::Util: 0
- Test::Builder: 0
- Test::Deep: 0
- Test::Exception: 0
- Test::More: 0
- Test::Warn: 0
-no_index:
- directory:
- - t
- - inc
-generated_by: ExtUtils::MakeMaker version 6.50
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ List::Util: 0
+ Scalar::Util: 0
+ perl: 5.6.1
+version: 1.53
Modified: trunk/libsql-abstract-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/Makefile.PL?rev=34569&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/Makefile.PL (original)
+++ trunk/libsql-abstract-perl/Makefile.PL Fri May 1 18:57:52 2009
@@ -1,20 +1,24 @@
-use 5.006;
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
- NAME => 'SQL::Abstract',
- VERSION_FROM => 'lib/SQL/Abstract.pm', # finds $VERSION
- PREREQ_PM => {
- "List::Util" => 0,
- "Scalar::Util" => 0,
- "Test::Builder" => 0,
- "Test::More" => 0,
- "Test::Exception" => 0,
- "Test::Warn" => 0,
- "Test::Deep" => 0,
- "Data::Dumper" => 0,
- }, # e.g., Module::Name => 1.1
- ABSTRACT_FROM => 'lib/SQL/Abstract.pm', # retrieve abstract from module
- AUTHOR => 'Matt Trout <mst at shadowcat.co.uk>, but see the POD',
-);
+use inc::Module::Install 0.79;
+use strict;
+use warnings;
+
+use 5.006001;
+
+perl_version '5.006001';
+name 'SQL-Abstract';
+author 'Nathan Wiger <nate at wiger.org>';
+
+all_from 'lib/SQL/Abstract.pm';
+
+requires "List::Util" => 0;
+requires "Scalar::Util" => 0;
+
+test_requires "Test::Builder" => 0;
+test_requires "Test::Deep" => 0;
+test_requires "Test::More" => 0;
+test_requires "Test::Exception" => 0;
+test_requires "Test::Warn" => 0;
+
+tests_recursive 't';
+
+WriteAll();
Modified: trunk/libsql-abstract-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/debian/changelog?rev=34569&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/debian/changelog (original)
+++ trunk/libsql-abstract-perl/debian/changelog Fri May 1 18:57:52 2009
@@ -1,3 +1,9 @@
+libsql-abstract-perl (1.53-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Krzysztof Krzyżaniak (eloy) <eloy at debian.org> Fri, 01 May 2009 20:53:54 +0200
+
libsql-abstract-perl (1.52-1) unstable; urgency=low
* New upstream release
Modified: trunk/libsql-abstract-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/debian/copyright?rev=34569&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/debian/copyright (original)
+++ trunk/libsql-abstract-perl/debian/copyright Fri May 1 18:57:52 2009
@@ -7,6 +7,11 @@
Files: *
Copyright: © 2001-2007 Nathan Wiger
© 2007-2009 Matt Trout <mst at shadowcat.co.uk>
+License-Alias: Perl
+License: GPL-1+ | Artistic
+
+Files: inc/*:
+Copyright: © 2002 - 2009 by Brian Ingerson, Audrey Tang and Adam Kennedy
License-Alias: Perl
License: GPL-1+ | Artistic
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=34569&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/lib/SQL/Abstract.pm (original)
+++ trunk/libsql-abstract-perl/lib/SQL/Abstract.pm Fri May 1 18:57:52 2009
@@ -15,7 +15,7 @@
# GLOBALS
#======================================================================
-our $VERSION = '1.52';
+our $VERSION = '1.53';
# This would confuse some packagers
#$VERSION = eval $VERSION; # numify for warning-free dev releases
@@ -422,7 +422,6 @@
my ($self, $where) = @_;
my (@sql_clauses, @all_bind);
- # LDNOTE : don't really know why we need to sort keys
for my $k (sort keys %$where) {
my $v = $where->{$k};
@@ -463,7 +462,7 @@
HASHREF => sub {
if ($op eq 'OR') {
- return $self->_where_ARRAYREF([%$v], 'OR');
+ return $self->_where_ARRAYREF([ map { $_ => $v->{$_} } (sort keys %$v) ], 'OR');
}
else { # NEST | AND
return $self->_where_HASHREF($v);
@@ -2340,6 +2339,8 @@
C<SQL::Abstract>, and as such list members there are very familiar with
how to create queries.
+=head1 LICENSE
+
This module is free software; you may copy this under the terms of
the GNU General Public License, or the Artistic License, copies of
which should have accompanied your Perl kit.
Modified: trunk/libsql-abstract-perl/lib/SQL/Abstract/Test.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/lib/SQL/Abstract/Test.pm?rev=34569&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/lib/SQL/Abstract/Test.pm (original)
+++ trunk/libsql-abstract-perl/lib/SQL/Abstract/Test.pm Fri May 1 18:57:52 2009
@@ -424,7 +424,7 @@
is_same_sql_bind is_same_sql is_same_bind
eq_sql_bind eq_sql eq_bind
/];
-
+
my ($sql, @bind) = SQL::Abstract->new->select(%args);
is_same_sql_bind($given_sql, \@given_bind,
@@ -451,10 +451,14 @@
Therefore the tests will pass as long as the semantics
is preserved, even if the surface syntax has changed.
-B<Disclaimer> : this is only a half-cooked semantic equivalence;
-parsing is simple-minded, and comparison of SQL abstract syntax trees
-ignores commutativity or associativity of AND/OR operators, Morgan
-laws, etc.
+B<Disclaimer> : the semantic equivalence handling is pretty limited.
+A lot of effort goes into distinguishing significant from
+non-significant parenthesis, including AND/OR operator associativity.
+Currently this module does not support commutativity and more
+intelligent transformations like Morgan laws, etc.
+
+For a good overview of what this test framework is capable of refer
+to C<t/10test.t>
=head1 FUNCTIONS
Modified: trunk/libsql-abstract-perl/t/04modifiers.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsql-abstract-perl/t/04modifiers.t?rev=34569&op=diff
==============================================================================
--- trunk/libsql-abstract-perl/t/04modifiers.t (original)
+++ trunk/libsql-abstract-perl/t/04modifiers.t Fri May 1 18:57:52 2009
@@ -176,8 +176,8 @@
{
where => { -and => [a => 1, b => 2, k => [11, 12] ], x => 9, -or => { c => 3, d => 4, l => { '=' => [21, 22] } } },
- stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND ((l = ? OR l = ?) OR c = ? OR d = ? ) AND x = ?',
- bind => [qw/1 2 11 12 21 22 3 4 9/],
+ stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND (c = ? OR d = ? OR (l = ? OR l = ?) ) AND x = ?',
+ bind => [qw/1 2 11 12 3 4 21 22 9/],
},
{
@@ -196,8 +196,8 @@
# explicit OR logic in arrays should leave everything intact
args => { logic => 'or' },
where => { -and => [a => 1, b => 2, k => [11, 12] ], x => 9, -or => { c => 3, d => 4, l => { '=' => [21, 22] } } },
- stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND ( l = ? OR l = ? OR c = ? OR d = ? ) AND x = ? ',
- bind => [qw/1 2 11 12 21 22 3 4 9/],
+ stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND ( c = ? OR d = ? OR l = ? OR l = ? ) AND x = ? ',
+ bind => [qw/1 2 11 12 3 4 21 22 9/],
},
{
@@ -361,8 +361,8 @@
},
{
where => {a => 1, -nest => {-or => {b => 2, c => 3}}},
- stmt => 'WHERE ( ( (c = ? OR b = ?) AND a = ? ) )',
- bind => [qw/3 2 1/],
+ stmt => 'WHERE ( ( (b = ? OR c = ?) AND a = ? ) )',
+ bind => [qw/2 3 1/],
},
{
where => [a => 1, -nest => {b => 2, c => 3}, -nest => [d => 4, e => 5]],
More information about the Pkg-perl-cvs-commits
mailing list