[libdbix-abstract-perl] 01/06: Imported Upstream version 1.030

gregor herrmann gregoa at debian.org
Wed Jan 15 16:03:44 UTC 2014


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libdbix-abstract-perl.

commit a2973fb0cb7432358eb67528015f6cce49b641ce
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Jan 15 16:54:40 2014 +0100

    Imported Upstream version 1.030
---
 Changes                 |  11 ++++++
 LICENSE                 |   8 ++--
 MANIFEST                |   5 +--
 META.yml                |  13 +++---
 Makefile.PL             |  43 ++++++++++----------
 README => README.md     |  16 +++++++-
 SIGNATURE               |  50 +++++++++++------------
 dist.ini                |  41 -------------------
 lib/DBIx/Abstract.pm    | 103 +++++++++++++++++++++++++++---------------------
 t/2-dbix-abstract.t     |  86 ++++++++++++++++++++--------------------
 t/release-portability.t |   6 +--
 t/release-unused-vars.t |  16 --------
 12 files changed, 186 insertions(+), 212 deletions(-)

diff --git a/Changes b/Changes
index 8e678e2..d9c7ead 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,16 @@
 Revision history for Perl extension DBIx::Abstract.
 
+1.03   2014-01-14
+        - We were explicitly returning undef for failure, which is basically
+          always wrong.  Corrected this.
+
+1.02   2014-01-14
+	- Update documentation, etc, to point to github version
+	- Make SQL generation deterministic, rather than depending on hash
+	  order, to ease testing and predictability.
+	- Misc minor code cleanups.
+	- Move to more of my standard Dist::Zilla config.
+
 1.01   2011-08-23
         - Update to modern build practices.
         - Make tests work with SQLite, so they don't need to be configured.
diff --git a/LICENSE b/LICENSE
index 6b7b654..3ccc6bd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-This software is copyright (c) 2011 by Rebecca Turner.
+This software is copyright (c) 2014 by Rebecca Turner.
 
 This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
@@ -12,7 +12,7 @@ b) the "Artistic License"
 
 --- The GNU General Public License, Version 1, February 1989 ---
 
-This software is Copyright (c) 2011 by Rebecca Turner.
+This software is Copyright (c) 2014 by Rebecca Turner.
 
 This is free software, licensed under:
 
@@ -22,7 +22,7 @@ This is free software, licensed under:
                      Version 1, February 1989
 
  Copyright (C) 1989 Free Software Foundation, Inc.
-                    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 51 Franklin St, Suite 500, Boston, MA  02110-1335  USA
 
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -272,7 +272,7 @@ That's all there is to it!
 
 --- The Artistic License 1.0 ---
 
-This software is Copyright (c) 2011 by Rebecca Turner.
+This software is Copyright (c) 2014 by Rebecca Turner.
 
 This is free software, licensed under:
 
diff --git a/MANIFEST b/MANIFEST
index dc175ad..2a36273 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,13 +1,13 @@
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.011.
 Changes
 INSTALL
 LICENSE
 MANIFEST
 META.yml
 Makefile.PL
-README
+README.md
 SIGNATURE
 THANKS
-dist.ini
 lib/DBIx/Abstract.pm
 t/2-dbix-abstract.t
 t/pod.t
@@ -15,4 +15,3 @@ t/release-minimum-version.t
 t/release-no-tabs.t
 t/release-portability.t
 t/release-synopsis.t
-t/release-unused-vars.t
diff --git a/META.yml b/META.yml
index 7af72b2..94e38c0 100644
--- a/META.yml
+++ b/META.yml
@@ -1,24 +1,25 @@
 ---
 abstract: 'DBI SQL abstraction'
 author:
-  - 'Becca <becca at referencethis.com>'
+  - 'Rebecca Turner <me at re-becca.org>'
 build_requires:
   DBD::SQLite: 0
   Test::More: 0
 configure_requires:
   ExtUtils::MakeMaker: 6.30
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.300000, CPAN::Meta::Converter version 2.112150'
+generated_by: 'Dist::Zilla version 5.011, CPAN::Meta::Converter version 2.120921'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
   version: 1.4
 name: DBIx-Abstract
 requires:
-  Carp: 0
   Check::ISA: 0
   DBI: 0
   Scalar::Util: 0
-  strict: 0
-  warnings: 0
-version: 1.01
+resources:
+  bugtracker: https://github.com/iarna/DBIx-Abstract/issues
+  homepage: https://github.com/iarna/DBIx-Abstract
+  repository: https://github.com/iarna/DBIx-Abstract.git
+version: 1.03
diff --git a/Makefile.PL b/Makefile.PL
index 9228a75..98a336f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,5 @@
 
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.011.
 use strict;
 use warnings;
 
@@ -10,11 +11,8 @@ use ExtUtils::MakeMaker 6.30;
 
 my %WriteMakefileArgs = (
   "ABSTRACT" => "DBI SQL abstraction",
-  "AUTHOR" => "Becca <becca\@referencethis.com>",
-  "BUILD_REQUIRES" => {
-    "DBD::SQLite" => 0,
-    "Test::More" => 0
-  },
+  "AUTHOR" => "Rebecca Turner <me\@re-becca.org>",
+  "BUILD_REQUIRES" => {},
   "CONFIGURE_REQUIRES" => {
     "ExtUtils::MakeMaker" => "6.30"
   },
@@ -23,31 +21,34 @@ my %WriteMakefileArgs = (
   "LICENSE" => "perl",
   "NAME" => "DBIx::Abstract",
   "PREREQ_PM" => {
-    "Carp" => 0,
     "Check::ISA" => 0,
     "DBI" => 0,
-    "Scalar::Util" => 0,
-    "strict" => 0,
-    "warnings" => 0
+    "Scalar::Util" => 0
+  },
+  "TEST_REQUIRES" => {
+    "DBD::SQLite" => 0,
+    "Test::More" => 0
   },
-  "VERSION" => "1.01",
+  "VERSION" => "1.03",
   "test" => {
     "TESTS" => "t/*.t"
   }
 );
 
 
-unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) {
-  my $br = delete $WriteMakefileArgs{BUILD_REQUIRES};
-  my $pp = $WriteMakefileArgs{PREREQ_PM};
-  for my $mod ( keys %$br ) {
-    if ( exists $pp->{$mod} ) {
-      $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod};
-    }
-    else {
-      $pp->{$mod} = $br->{$mod};
-    }
-  }
+my %FallbackPrereqs = (
+  "Check::ISA" => 0,
+  "DBD::SQLite" => 0,
+  "DBI" => 0,
+  "Scalar::Util" => 0,
+  "Test::More" => 0
+);
+
+
+unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
+  delete $WriteMakefileArgs{TEST_REQUIRES};
+  delete $WriteMakefileArgs{BUILD_REQUIRES};
+  $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs;
 }
 
 delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
diff --git a/README b/README.md
similarity index 75%
rename from README
rename to README.md
index 250b3fd..1747745 100644
--- a/README
+++ b/README.md
@@ -1,5 +1,13 @@
+Deprecated
+----------
+
+It is highly recommended that you use something like SQL::Abstract, which
+was inspired by this module.  Or even DBIx::Class (which uses
+SQL::Abstract for it's query syntax).  They're maintained and widely used.
+
 DBIx::Abstract
 --------------
+
 This module provides methods for doing manipulating database tables This
 module provides methods retreiving and storing data in SQL databases.
 It provides methods for all of the more important SQL commands (like
@@ -21,24 +29,28 @@ Notable features include:
 
 COPYRIGHT
 ---------
-Portions copyright 2001-2002,2011 by Rebecca Turner
+
+Portions copyright 2001-2002,2011,2013 by Rebecca Turner
 Portions copyright 2000-2001 by Adelphia Business Solutions
-Copyright 1998-2000 by the Maine Internetworks (MINT)
+Portions copyright 1998-2000 by the Maine Internetworks (MINT)
 
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.
 
 PREREQUISITES
 -------------
+
 DBI (and a working DBD driver of course)
 
 HOW TO BUILD
 ------------
+
 perl Makefile.PL
 make
 make test
 
 HOW TO INSTALL
 --------------
+
 make install
 
diff --git a/SIGNATURE b/SIGNATURE
index a1e2658..9363441 100644
--- a/SIGNATURE
+++ b/SIGNATURE
@@ -1,5 +1,5 @@
 This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.68.
+signed via the Module::Signature module, version 0.69.
 
 To verify the content in this distribution, first make sure you have
 Module::Signature installed, then type:
@@ -14,37 +14,35 @@ not run its Makefile.PL or Build.PL.
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-SHA1 01bd8ec5787e13958b59de2f8acee8093075ad29 Changes
+SHA1 7861cc78cef16eae4e544883f8e000e90fb03b86 Changes
 SHA1 268ab0c57b05e4585f89ca3101472078efba81b9 INSTALL
-SHA1 7f7f48c804dbd34389e2a6e6622f50e9f21bbbc5 LICENSE
-SHA1 fb77fe1d42959d99179d92bbbf6c1988c82decce MANIFEST
-SHA1 fdb57f8b51f28f83ed781f3eedb29bc7e6690bf6 META.yml
-SHA1 75bf474fcca6e6a93e47de5a1960ad63894301da Makefile.PL
-SHA1 bb2d1f5ed0e2d89a81c4aafc44d224d3b0f038af README
+SHA1 8e1bbc507f96b7043c901fe822f0a2a6ae5ab952 LICENSE
+SHA1 e2c51ca2fbaab970a8c52805ebd5105bef2f677a MANIFEST
+SHA1 e884c962fff94efa531162b2ea51b14fab52038d META.yml
+SHA1 55060c4d2c14a0f85448f071e20a2f8d5f659289 Makefile.PL
+SHA1 6944a278b591349021b1f59a44d5e81b7ddca128 README.md
 SHA1 a6b50ea5c2665318927f7dc42bcd42c26fbb2dfa THANKS
-SHA1 047315d0b1cdfc1fed31b34dcb8cdb890d3cc169 dist.ini
-SHA1 d0a4a204e8df25d41dfdd067329a07c5cffd39a1 lib/DBIx/Abstract.pm
-SHA1 2afe30feff4686ab56b0fee7091c2d9c72cc8c76 t/2-dbix-abstract.t
+SHA1 e66e23f536314b6522d9f21a0110f0b0de3046e2 lib/DBIx/Abstract.pm
+SHA1 3823460442ab5be399fca541c9863b52e8d48589 t/2-dbix-abstract.t
 SHA1 b2131e5af08c2702a3742365d55f365e9cc0cf15 t/pod.t
 SHA1 54ed25287b7e1c9ff328eaf126d438438c8a1d48 t/release-minimum-version.t
 SHA1 455d1dd1867212a665ad5ea4126b572411de300c t/release-no-tabs.t
-SHA1 3bb783b8a31b5eaff916bcb8bf7b348ee340ecb5 t/release-portability.t
+SHA1 8d931d5c7b6fc03e39a744d59522e4b7077562a1 t/release-portability.t
 SHA1 612226d447015079c046d65932f774304a4b9f20 t/release-synopsis.t
-SHA1 d7221447937ab93002a123801def7be09748c106 t/release-unused-vars.t
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v1.4.12 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOU+C+AAoJEF6ojHedHIiFvkcQAOo7iGcxzK6lYkKiHNkYlC4B
-cE4jGoUp8ee6oyjObmq7+RVoHSIo6PEbTxijEY4Iwi3pjZUE7W0fxriMe5Bkl+FZ
-pPRyiNBq6WpHwautvU4GHPXfS2IuACPxKKnAI9lzeaodKhcQkW+X9dRYYIY0AxGK
-7tlsQBIyG9rMlyTOlIq4nER51slZlI2+TeNVHswyWjMOfBYLoE/S0zI2Gj4Po5sr
-QWAWwx7inst5DEAetuXviXO6jH7CUtF76RrIwY4XDmN9aqEizi07CLz9fzU1FtlJ
-GGRPgLlBge0YMq1M/FB40L0sWHPWyrdzPNdWQvHxNwAmuahd0kJFZN9c1va1uuep
-YAOrfy4toci5SMsaxE+EeLKfsXyWBSFie43WcovncNvUoe1ToMQ/qSGMbzypIUWj
-Yowg6cJQmB6W4uLrMFAI/DbBCAG/Ct2AgXRAtqwz/TKEangqti+8I4OVbI7xXAfD
-GsK20T8MTbaDLNgZs67cq+x+KaVLQTl8m4m6+9JNE+tZPSGIj5p1CbU1exqXrouA
-fv3iIc4RW6EhVwelY3TB08EpdbPwq+ytYPrwyxbXbqM+vNukSh7vRDgnpkeQcBQb
-xi0Kj4oVEhBKy6FXJofpMM1FN0Jbx0ISixnnLMJXBprZZInLe4CB2vNZC4f00RRu
-O98LJ/Wud/7D5a9h3fAP
-=dLGa
+iQIcBAEBAgAGBQJS1X8qAAoJEF6ojHedHIiFZ5gQALnRV4esgaePMo8beJViWUt/
+DuKAkUCkRY6YWmYe6v4ho6PMvOUHCPOMb/MhffxuAqIuPU2lWuou/920DclLCgfL
+40yJ6uUCYs7q8KTcMwqh573uz35LoDfOaB7w0t2th76K4ABb02U20ZLDiZTYmwbl
+uZl8WDzcZA/YJDZYEza1RpQB4LRbQo5L0+P0cnVdu1Fm5w04hO2zKuvG0+0Tafub
+FJFYa5qxcbdeSauEws8LEp5MJztr4m8oql4YS7zwvGop4c7D1Nx+auHHAVPs4E1o
+dHi8eTXTmbi6dH3wghn5nGGaGTVurXYsBFKTqmrwnBbIdSDB0O6+uoKiMqTtAaWs
+rXiBVz1Yw1md62Jj7d3WwiREDOCmdWdbFsJjmxfVcQlzrwPlJwONpX4H7yCkqAc/
+qiwbLYJWwmnQinzEKU4bCIxay/J0JWJavWAy0yY9v+7VIyXq2fQewAUe+km4mJ6i
+CxNB4bogDKPXhd65X4NzZgUB/D4zkgdJTDuUPbl90NjStN6+j56PJmggHL50r0TO
+T5JGmlcYL7TeDFmz+5dilhIm9edfgdW/LGvbKdVO8H1j5XvxhhUb3h0nEsY3Nnpj
+qbtnxtLPbs3ZecofQQZ9Ltsjq3whUy/SgTBk8g5N34IYnXzrq3Oh0vQ9qTiCP+yy
+Bqv8A3H7dX64Zttc4N88
+=uThQ
 -----END PGP SIGNATURE-----
diff --git a/dist.ini b/dist.ini
deleted file mode 100644
index b31989f..0000000
--- a/dist.ini
+++ /dev/null
@@ -1,41 +0,0 @@
-name    = DBIx-Abstract
-version = 1.01
-author  = Becca <becca at referencethis.com>
-license = Perl_5
-copyright_holder = Rebecca Turner
-copyright_year   = 2011
-
-[@Git]
-
-[@Filter]
--bundle = @Basic
--remove = Readme
-
-[AutoPrereqs]
-
-[Prereqs / TestRequires]
-Test::More = 0
-DBD::SQLite = 0
-
-[GitHub::Update]
-metacpan = 1
-
-[PkgVersion]
-[NextRelease]
-[PodWeaver]
-
-[PruneFiles]
-match = ~$
-
-[InstallGuide]
-[NoTabsTests]
-[Signature]
-[CheckChangeLog]
-
-[MinimumVersionTests]
-[PortabilityTests]
-[SynopsisTests]
-
-;;; Remove these if you want to use dzil with this distribution and perl 5.8
-
-[UnusedVarsTests]
diff --git a/lib/DBIx/Abstract.pm b/lib/DBIx/Abstract.pm
index c953ce5..0acf85b 100644
--- a/lib/DBIx/Abstract.pm
+++ b/lib/DBIx/Abstract.pm
@@ -1,8 +1,6 @@
 # ABSTRACT: DBI SQL abstraction
 package DBIx::Abstract;
-{
-  $DBIx::Abstract::VERSION = '1.01';
-}
+$DBIx::Abstract::VERSION = '1.03';
 use DBI;
 use Scalar::Util 'weaken';
 use Check::ISA qw( obj_does );
@@ -33,7 +31,7 @@ sub ___drivers {
     }
 
     my @keys;
-    foreach ( keys(%$config) ) {
+    foreach ( keys %$config ) {
         next if /^user$/;
         next if /^password$/;
         next if /^driver$/;
@@ -133,7 +131,7 @@ sub connect {
     }
     $self->{'dbh'} = $dbh;
     $self->opt( loglevel => 0 );
-    foreach ( keys(%$options) ) {
+    foreach ( keys %$options ) {
         $self->opt( $_, $options->{$_} );
     }
     my @log;
@@ -555,7 +553,7 @@ sub __where_hash {
     my $ret;
     my @bind_params;
     $self->__logwrite( 7, 'Processing hash' );
-    foreach ( keys(%$where) ) {
+    foreach ( sort keys %$where ) {
         $self->__logwrite( 7, 'key', $_, 'value', $where->{$_} );
         if ($ret) { $ret .= ' AND ' }
         $ret .= "$_ ";
@@ -632,16 +630,16 @@ sub insert {
 
     my $sql = "INSERT INTO $table ";
     if ( ref($fields) eq 'HASH' ) {
-        my @keys   = keys(%$fields);
-        my @values = values(%$fields);
-        $#keys > -1 or die 'DBIx::Abstract: insert must have fields';
+        my @keys   = sort keys %$fields;
+        my @values = map {$fields->{$_}} @keys;
+        @keys or die 'DBIx::Abstract: insert must have fields';
         $sql .= '(';
-        for ( my $i = 0 ; $i <= $#keys ; $i++ ) {
+        for ( my $i = 0 ; $i < @keys ; $i++ ) {
             if ($i) { $sql .= ',' }
             $sql .= ' ' . $keys[$i];
         }
         $sql .= ') VALUES (';
-        for ( my $i = 0 ; $i <= $#keys ; $i++ ) {
+        for ( my $i = 0 ; $i < @keys ; $i++ ) {
             if ($i) { $sql .= ', ' }
             if ( defined( $values[$i] ) ) {
                 if ( ref( $values[$i] ) eq 'SCALAR' ) {
@@ -689,8 +687,8 @@ sub replace {
 
     my $sql = "REPLACE INTO $table ";
     if ( ref($fields) eq 'HASH' ) {
-        my @keys   = keys(%$fields);
-        my @values = values(%$fields);
+        my @keys   = sort keys %$fields;
+        my @values = map {$fields->{$_}} @keys;
         $#keys > -1 or die 'DBIx::Abstract: insert must have fields';
         $sql .= '(';
         for ( my $i = 0 ; $i <= $#keys ; $i++ ) {
@@ -751,8 +749,8 @@ sub update {
 
     $sql = "UPDATE $table SET";
     if ( ref($fields) eq 'HASH' ) {
-        @keys   = keys(%$fields);
-        @values = values(%$fields);
+        @keys   = sort keys %$fields;
+        @values = map {$fields->{$_}} @keys;
         $#keys > -1 or die 'DBIx::Abstract: update must have fields';
         for ( $i = 0 ; $i <= $#keys ; $i++ ) {
             if ($i) { $sql .= ',' }
@@ -801,10 +799,9 @@ sub select {
     my $group;    #== The key to group by, only available in hash mode
     my ( $sql, $join );
     if ( ref($fields) eq 'HASH' ) {
-        foreach ( keys(%$fields) ) {
-            my $field = $_;
-            $field = lc($field);
-            if (/^-(.*)/) { $field = $1 }
+        foreach ( sort keys %$fields ) {
+            my $field = lc $_;
+            $field =~ s/^-//;
             $fields->{$field} = $fields->{$_};
         }
         $table = $fields->{'table'} || $fields->{'tables'};
@@ -899,7 +896,7 @@ sub select_one_to_hashref {
     $self->__logwrite( 2, 'select_one_to_hashref' );
     $db->select(@_);
     my $result = $db->fetchrow_hashref;
-    return undef unless $result;
+    return unless $result;
     return {%$result};
 }
 
@@ -909,7 +906,7 @@ sub select_one_to_arrayref {
     $self->__logwrite( 2, 'select_one _to_arrayref' );
     $db->select(@_);
     my $result = $db->fetchrow_arrayref;
-    return undef unless $result;
+    return unless $result;
     return [@$result];
 }
 
@@ -919,7 +916,7 @@ sub select_one_to_array {
     $self->__logwrite( 2, 'select_one_to_arrayref' );
     $db->select(@_);
     my $result = $db->fetchrow_arrayref;
-    return undef unless $result;
+    return unless $result;
     return @$result;
 }
 
@@ -934,7 +931,7 @@ sub select_all_to_hashref {
     $self->__logwrite( 2, 'select_all_to_hash' );
     $db->select(@_);
     my $result = $db->fetchall_arrayref();
-    return undef unless $result;
+    return unless $result;
     my %to_ret;
     foreach (@$result) {
 
@@ -1118,16 +1115,19 @@ sub AUTOLOAD {
 
 1;
 
+__END__
 
 =pod
 
+=encoding utf-8
+
 =head1 NAME
 
 DBIx::Abstract - DBI SQL abstraction
 
 =head1 VERSION
 
-version 1.01
+version 1.03
 
 =head1 SYNOPSIS
 
@@ -1637,50 +1637,61 @@ will work with all drivers.)
 
 =over 2
 
-=item * Fixed a bug discovered by Jan Martin Mathiassen
-<reaper at mindriot.as>.  If you pass in a password but no username it's
-supposed to ignore the password.  Instead it was clearing it in the hash
-that you passed in but still using it.
+=item * Updated source pointers to github.
 
-=item * Removed Test::More and Test::Builder from the distribution-- put
-Test::Simple in the prerequisites.
+=item * Fixed hash randomization related test failure
 
 =back
 
 =head1 AUTHOR
 
-Rebecca Turner <winter at cpan.org>
+Rebecca Turner <me at re-becca.org>
 
-=head1 COPYRIGHT AND LICENSE
+=head1 SOURCE
 
-Portions copyright 2001-2002,2011 by Rebecca Turner
+The development version is on github at L<http://https://github.com/iarna/DBIx-Abstract>
+and may be cloned from L<git://https://github.com/iarna/DBIx-Abstract.git>
 
-Portions copyright 2000-2001 by Adelphia Business Solutions
+=for :stopwords cpan testmatrix url annocpan anno bugtracker rt cpants kwalitee diff irc mailto metadata placeholders metacpan
 
-Copyright 1998-2000 by the Maine Internetworks (MINT)
+=head1 SUPPORT
 
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
+=head2 Websites
 
-=head1 SEE ALSO
+The following websites have more information about this module, and may be of help to you. As always,
+in addition to those websites please use your favorite search engine to discover more resources.
 
-http://sourceforge.net/projects/dbix-abstract/
+=over 4
 
-L<DBI(3)>
+=item *
+
+MetaCPAN
+
+A modern, open-source CPAN search engine, useful to view POD in HTML format.
+
+L<http://metacpan.org/release/DBIx-Abstract>
+
+=back
+
+=head2 Bugs / Feature Requests
+
+Please report any bugs at L<https://github.com/iarna/DBIx-Abstract/issues>.
 
 =head1 AUTHOR
 
-Becca <becca at referencethis.com>
+Rebecca Turner <me at re-becca.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2011 by Rebecca Turner.
+Portions copyright 2001-2014 by Rebecca Turner
 
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
+Portions copyright 2000-2001 by Adelphia Business Solutions
 
-=cut
+Portions copyright 1998-2000 by the Maine Internetworks (MINT)
 
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
 
-__END__
+L<DBI(3)>
 
+=cut
diff --git a/t/2-dbix-abstract.t b/t/2-dbix-abstract.t
index 7e66b8f..25582e9 100644
--- a/t/2-dbix-abstract.t
+++ b/t/2-dbix-abstract.t
@@ -149,53 +149,51 @@ if (open(LOG,'test.log')) {
             push(@data,$_);
         }
     }
-    foreach (\@log,\@data) {
-        map({s/^[^\t]+/DATE/g} @$_);
-        map({s/^(DATE\t5\t(?:Rec|C)onnect\t).*$/$1CONNECT ARGS/} @$_);
-        map({s/^(DATE\t5\tconnected\t)\n$/${1}0\n/} @$_);
-    }
+    s/^[^\t]+/DATE/g for @log, @data;
+    s/^(DATE\t5\t(?:Rec|C)onnect\t).*$/$1CONNECT ARGS/ for @log, @data;
+    s/^(DATE\t5\tconnected\t)\n$/${1}0\n/ for @log, @data;
     if (is_deeply( \@log, \@data, "SQL log matches expectations" )) {
         unlink('test.log');
     }
 }
 
 __DATA__
-Tue Aug 23 12:40:28 2011	5	Option change	logfile		test.log
-Tue Aug 23 12:40:28 2011	5	Connect	dsn=>dbi:SQLite:dbname=testfile.sql
-Tue Aug 23 12:40:28 2011	5	connected	
-Tue Aug 23 12:40:28 2011	5	reconnect	success
-Tue Aug 23 12:40:28 2011	5	Reconnect
-Tue Aug 23 12:40:28 2011	5	connected	1
-Tue Aug 23 12:40:28 2011	5	connected	1
-Tue Aug 23 12:40:28 2011	5	Cloned
-Tue Aug 23 12:40:28 2011	3	create table foo (id int null,name char(30) not null,value char(30) null)
-Tue Aug 23 12:40:28 2011	3	create table bar (id int null,foo_id int null,name char(30) not null)
-Tue Aug 23 12:40:29 2011	1	INSERT INTO foo ( value, name, id) VALUES ('value1', 'test1', '1')
-Tue Aug 23 12:40:29 2011	1	INSERT INTO bar ( name, foo_id, id) VALUES ('test1', '4', '1')
-Tue Aug 23 12:40:29 2011	1	INSERT INTO foo ( value, name, id) VALUES ('value2', 'test2', '2')
-Tue Aug 23 12:40:29 2011	1	INSERT INTO bar ( name, foo_id, id) VALUES ('test2', '3', '2')
-Tue Aug 23 12:40:29 2011	1	INSERT INTO foo ( value, name, id) VALUES ('value3', 'test3', '3')
-Tue Aug 23 12:40:30 2011	1	INSERT INTO bar ( name, foo_id, id) VALUES ('test3', '2', '3')
-Tue Aug 23 12:40:30 2011	1	INSERT INTO foo ( value, name, id) VALUES ('value4', 'test4', '4')
-Tue Aug 23 12:40:30 2011	1	INSERT INTO bar ( name, foo_id, id) VALUES ('test4', '1', '4')
-Tue Aug 23 12:40:30 2011	1	UPDATE foo SET value='bonk', name='blat' WHERE id = '2'
-Tue Aug 23 12:40:30 2011	2	SELECT * FROM foo WHERE id < '10'
-Tue Aug 23 12:40:30 2011	5	rows
-Tue Aug 23 12:40:30 2011	4	fetchrow_array
-Tue Aug 23 12:40:30 2011	4	fetchrow_array
-Tue Aug 23 12:40:30 2011	4	fetchrow_array
-Tue Aug 23 12:40:30 2011	4	fetchrow_array
-Tue Aug 23 12:40:30 2011	4	fetchrow_array
-Tue Aug 23 12:40:30 2011	0	Where parser iterated too deep (limit of 20)
-Tue Aug 23 12:40:30 2011	2	SELECT * FROM foo WHERE (id < '10') and ((name = 'blat') or (value = 'bonk'))
-Tue Aug 23 12:40:30 2011	5	rows
-Tue Aug 23 12:40:30 2011	4	fetchrow_array
-Tue Aug 23 12:40:30 2011	4	fetchrow_array
-Tue Aug 23 12:40:30 2011	2	SELECT count(foo.id) FROM foo,bar WHERE (foo.id < '10') and ( foo.id = bar.foo_id ) GROUP BY bar.name
-Tue Aug 23 12:40:30 2011	5	rows
-Tue Aug 23 12:40:30 2011	1	DELETE FROM foo WHERE id like '%'
-Tue Aug 23 12:40:30 2011	5	rows
-Tue Aug 23 12:40:30 2011	3	drop table foo
-Tue Aug 23 12:40:30 2011	3	drop table bar
-Tue Aug 23 12:40:31 2011	5	connected	1
-Tue Aug 23 12:40:31 2011	5	connected	
+Tue Jan 14 12:42:50 2014	5	Option change	logfile		test.log
+Tue Jan 14 12:42:50 2014	5	Connect	dsn=>dbi:SQLite:dbname=testfile.sql
+Tue Jan 14 12:42:50 2014	5	connected	
+Tue Jan 14 12:42:50 2014	5	reconnect	success
+Tue Jan 14 12:42:50 2014	5	Reconnect
+Tue Jan 14 12:42:50 2014	5	connected	1
+Tue Jan 14 12:42:50 2014	5	connected	1
+Tue Jan 14 12:42:50 2014	5	Cloned
+Tue Jan 14 12:42:50 2014	3	create table foo (id int null,name char(30) not null,value char(30) null)
+Tue Jan 14 12:42:50 2014	3	create table bar (id int null,foo_id int null,name char(30) not null)
+Tue Jan 14 12:42:50 2014	1	INSERT INTO foo ( id, name, value) VALUES ('1', 'test1', 'value1')
+Tue Jan 14 12:42:50 2014	1	INSERT INTO bar ( foo_id, id, name) VALUES ('4', '1', 'test1')
+Tue Jan 14 12:42:50 2014	1	INSERT INTO foo ( id, name, value) VALUES ('2', 'test2', 'value2')
+Tue Jan 14 12:42:50 2014	1	INSERT INTO bar ( foo_id, id, name) VALUES ('3', '2', 'test2')
+Tue Jan 14 12:42:50 2014	1	INSERT INTO foo ( id, name, value) VALUES ('3', 'test3', 'value3')
+Tue Jan 14 12:42:50 2014	1	INSERT INTO bar ( foo_id, id, name) VALUES ('2', '3', 'test3')
+Tue Jan 14 12:42:50 2014	1	INSERT INTO foo ( id, name, value) VALUES ('4', 'test4', 'value4')
+Tue Jan 14 12:42:50 2014	1	INSERT INTO bar ( foo_id, id, name) VALUES ('1', '4', 'test4')
+Tue Jan 14 12:42:50 2014	1	UPDATE foo SET name='blat', value='bonk' WHERE id = '2'
+Tue Jan 14 12:42:50 2014	2	SELECT * FROM foo WHERE id < '10'
+Tue Jan 14 12:42:50 2014	5	rows
+Tue Jan 14 12:42:50 2014	4	fetchrow_array
+Tue Jan 14 12:42:50 2014	4	fetchrow_array
+Tue Jan 14 12:42:50 2014	4	fetchrow_array
+Tue Jan 14 12:42:50 2014	4	fetchrow_array
+Tue Jan 14 12:42:50 2014	4	fetchrow_array
+Tue Jan 14 12:42:50 2014	0	Where parser iterated too deep (limit of 20)
+Tue Jan 14 12:42:50 2014	2	SELECT * FROM foo WHERE (id < '10') and ((name = 'blat') or (value = 'bonk'))
+Tue Jan 14 12:42:50 2014	5	rows
+Tue Jan 14 12:42:50 2014	4	fetchrow_array
+Tue Jan 14 12:42:50 2014	4	fetchrow_array
+Tue Jan 14 12:42:50 2014	2	SELECT count(foo.id) FROM foo,bar WHERE (foo.id < '10') and ( foo.id = bar.foo_id ) GROUP BY bar.name
+Tue Jan 14 12:42:50 2014	5	rows
+Tue Jan 14 12:42:50 2014	1	DELETE FROM foo WHERE id like '%'
+Tue Jan 14 12:42:50 2014	5	rows
+Tue Jan 14 12:42:50 2014	3	drop table foo
+Tue Jan 14 12:42:50 2014	3	drop table bar
+Tue Jan 14 12:42:50 2014	5	connected	1
+Tue Jan 14 12:42:50 2014	5	connected	
diff --git a/t/release-portability.t b/t/release-portability.t
index fa24cf3..3f82125 100644
--- a/t/release-portability.t
+++ b/t/release-portability.t
@@ -10,7 +10,7 @@ BEGIN {
 
 use Test::More;
 
-eval "use Test::Portability::Files";
-plan skip_all => "Test::Portability::Files required for testing portability"
-  if $@;
+eval 'use Test::Portability::Files';
+plan skip_all => 'Test::Portability::Files required for testing portability'
+    if $@;
 run_tests();
diff --git a/t/release-unused-vars.t b/t/release-unused-vars.t
deleted file mode 100644
index 8237f96..0000000
--- a/t/release-unused-vars.t
+++ /dev/null
@@ -1,16 +0,0 @@
-#!perl
-
-BEGIN {
-  unless ($ENV{RELEASE_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for release candidate testing');
-  }
-}
-
-
-use Test::More;
-
-eval "use Test::Vars";
-plan skip_all => "Test::Vars required for testing unused vars"
-  if $@;
-all_vars_ok();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdbix-abstract-perl.git



More information about the Pkg-perl-cvs-commits mailing list