r33184 - in /branches/upstream/libdbd-pg-perl/current: .perlcriticrc Changes META.yml Makefile.PL Pg.pm README SIGNATURE dbdimp.c lib/Bundle/DBD/Pg.pm t/02attribs.t t/03dbmethod.t t/09arrays.t t/99_perlcritic.t t/99_spellcheck.t t/dbdpg_test_setup.pl
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Tue Apr 14 14:58:13 UTC 2009
Author: ryan52-guest
Date: Tue Apr 14 14:58:07 2009
New Revision: 33184
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=33184
Log:
[svn-upgrade] Integrating new upstream version, libdbd-pg-perl (2.13.0)
Modified:
branches/upstream/libdbd-pg-perl/current/.perlcriticrc
branches/upstream/libdbd-pg-perl/current/Changes
branches/upstream/libdbd-pg-perl/current/META.yml
branches/upstream/libdbd-pg-perl/current/Makefile.PL
branches/upstream/libdbd-pg-perl/current/Pg.pm
branches/upstream/libdbd-pg-perl/current/README
branches/upstream/libdbd-pg-perl/current/SIGNATURE
branches/upstream/libdbd-pg-perl/current/dbdimp.c
branches/upstream/libdbd-pg-perl/current/lib/Bundle/DBD/Pg.pm
branches/upstream/libdbd-pg-perl/current/t/02attribs.t
branches/upstream/libdbd-pg-perl/current/t/03dbmethod.t
branches/upstream/libdbd-pg-perl/current/t/09arrays.t
branches/upstream/libdbd-pg-perl/current/t/99_perlcritic.t
branches/upstream/libdbd-pg-perl/current/t/99_spellcheck.t
branches/upstream/libdbd-pg-perl/current/t/dbdpg_test_setup.pl
Modified: branches/upstream/libdbd-pg-perl/current/.perlcriticrc
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/.perlcriticrc?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/.perlcriticrc (original)
+++ branches/upstream/libdbd-pg-perl/current/.perlcriticrc Tue Apr 14 14:58:07 2009
@@ -34,11 +34,13 @@
[-Lax::ProhibitStringyEval::ExceptForRequire]
[-Lax::RequireEndWithTrueConst]
[-Miscellanea::RequireRcsKeywords]
+[-Miscellanea::ProhibitUnrestrictedNoCritic]
[-Modules::ProhibitAutomaticExportation]
[-Modules::ProhibitExcessMainComplexity]
[-Modules::ProhibitMultiplePackages]
[-Modules::RequireBarewordIncludes]
[-Modules::RequireEndWithOne]
+[-NamingConventions::Capitalization]
[-References::ProhibitDoubleSigils]
[-RegularExpressions::ProhibitCaptureWithoutTest]
[-RegularExpressions::RequireDotMatchAnything]
Modified: branches/upstream/libdbd-pg-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/Changes?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/Changes (original)
+++ branches/upstream/libdbd-pg-perl/current/Changes Tue Apr 14 14:58:07 2009
@@ -1,6 +1,16 @@
('GSM' is Greg Sabino Mullane, greg at turnstep.com)
-2.12.0 Released March 28, 2009
+2.13.0 Released April 13, 2009
+
+ - Ensure we always set sqlstate inside of pg_st_prepare_statement
+ (CPAN bug #44732) [rweikusat at mssgmbh.com]
+ - When libpq has a connection error, return SQLSTATE 08000 ( "CONNECTION EXCEPTION" )
+ instead of the more generic 02000 ( "DATA EXCEPTION" ) (CPAN bug #44744)
+ [rweikusat at mssgmbh.com]
+ - Fix minor Perl::Critic nags (CPAN bug #44704) (Debian #bug 521969) [GSM]
+ - Clarify change of $dbh->{Name} behavior (CPAN bug 44985) [GSM]
+
+2.12.0 Released March 28, 2009 (subversion r12627)
- Change large object interface from lo_* to pg_lo_* and make them accessible
via direct $dbh calls (e.g. $dbh->pg_lo_import instead of $dbh->func(..,'pg_lo_import').
@@ -15,7 +25,7 @@
- Fix minor bugs in POD docs. [Frank Wiegand] (CPAN bug #44242)
- Fix minor bug in POD docs. [Tim Mattison]
-2.11.8 Released December 28, 2008
+2.11.8 Released December 28, 2008 (subversion r12161)
- Fix minor bug in t/12placeholders.t test (CPAN bug #41723)
Modified: branches/upstream/libdbd-pg-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/META.yml?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/META.yml (original)
+++ branches/upstream/libdbd-pg-perl/current/META.yml Tue Apr 14 14:58:07 2009
@@ -1,6 +1,6 @@
--- #YAML:1.0
name : DBD-Pg
-version : 2.12.0
+version : 2.13.0
abstract : DBI PostgreSQL interface
author:
- Greg Sabino Mullane <greg at turnstep.com>
@@ -39,10 +39,10 @@
provides:
DBD::Pg:
file : Pg.pm
- version : 2.12.0
+ version : 2.13.0
Bundle::DBD::Pg:
file : lib/Bundle/DBD/Pg.pm
- version : 2.12.0
+ version : 2.13.0
keywords:
- Postgres
Modified: branches/upstream/libdbd-pg-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/Makefile.PL?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/Makefile.PL (original)
+++ branches/upstream/libdbd-pg-perl/current/Makefile.PL Tue Apr 14 14:58:07 2009
@@ -1,4 +1,4 @@
-# $Id: Makefile.PL 12627 2009-03-24 01:00:58Z turnstep $
+# $Id: Makefile.PL 12683 2009-04-09 16:14:48Z turnstep $
use ExtUtils::MakeMaker;
use Config;
@@ -7,7 +7,7 @@
use 5.006001;
## No version.pm for this one, as the prereqs are not loaded yet.
-my $VERSION = '2.12.0';
+my $VERSION = '2.13.0';
my $lib;
BEGIN {
Modified: branches/upstream/libdbd-pg-perl/current/Pg.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/Pg.pm?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/Pg.pm (original)
+++ branches/upstream/libdbd-pg-perl/current/Pg.pm Tue Apr 14 14:58:07 2009
@@ -1,5 +1,5 @@
# -*-cperl-*-
-# $Id: Pg.pm 12642 2009-03-28 14:46:57Z turnstep $
+# $Id: Pg.pm 12687 2009-04-13 19:15:07Z turnstep $
#
# Copyright (c) 2002-2009 Greg Sabino Mullane and others: see the Changes file
# Portions Copyright (c) 2002 Jeffrey W. Baker
@@ -17,7 +17,7 @@
{
package DBD::Pg;
- use version; our $VERSION = qv('2.12.0');
+ use version; our $VERSION = qv('2.13.0');
use DBI ();
use DynaLoader ();
@@ -537,7 +537,7 @@
}
if ( $typtype eq 'e' ) {
- my $SQL = "SELECT enumlabel FROM pg_catalog.pg_enum WHERE enumtypid = $typoid ORDER BY oid";
+ $SQL = "SELECT enumlabel FROM pg_catalog.pg_enum WHERE enumtypid = $typoid ORDER BY oid";
$row->[23] = $dbh->selectcol_arrayref($SQL);
}
else {
@@ -1718,7 +1718,7 @@
=head1 VERSION
-This documents version 2.12.0 of the DBD::Pg module
+This documents version 2.13.0 of the DBD::Pg module
=head1 DESCRIPTION
@@ -3128,7 +3128,10 @@
=head3 B<Name> (string, read-only)
-Returns the name of the current database.
+Returns the name of the current database. This is the same as the DSN, without the
+"dbi:Pg:" part. Before version 2.0.0, this only returned the bare database name
+(e.g. 'foo'). From version 2.0.0 onwards, it returns the more correct
+output (e.g. 'dbname=foo')
=head3 B<Username> (string, read-only)
Modified: branches/upstream/libdbd-pg-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/README?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/README (original)
+++ branches/upstream/libdbd-pg-perl/current/README Tue Apr 14 14:58:07 2009
@@ -1,11 +1,11 @@
DBD::Pg -- the DBI PostgreSQL interface for Perl
-# $Id: README 12627 2009-03-24 01:00:58Z turnstep $
+# $Id: README 12683 2009-04-09 16:14:48Z turnstep $
DESCRIPTION:
------------
-This is version 2.12.0 of DBD::Pg, the Perl interface to Postgres using DBI.
+This is version 2.13.0 of DBD::Pg, the Perl interface to Postgres using DBI.
The web site for this interface, and the latest version, can be found at:
http://search.cpan.org/dist/DBD-Pg/
Modified: branches/upstream/libdbd-pg-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/SIGNATURE?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/SIGNATURE (original)
+++ branches/upstream/libdbd-pg-perl/current/SIGNATURE Tue Apr 14 14:58:07 2009
@@ -14,45 +14,45 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160
-SHA1 2f324889a0b126216bf45a04d74803557c4a404e .perlcriticrc
-SHA1 67b40359d87cf48f83f78b8d1d0b895bc5acb2fa Changes
+SHA1 529fa593badc0747c6c8ebde07b951bb40857154 .perlcriticrc
+SHA1 71d383058a7b08085b03486791bfd83b84f0c787 Changes
SHA1 4d91c71e5dbb19ece1505ab75c36d00a744bb076 MANIFEST
SHA1 6fd98d850a9a67911c047e7f0a8752fd15be98d7 MANIFEST.SKIP
-SHA1 45593eab09a8aaf00888961ed76593d991cbcbf9 META.yml
-SHA1 b70507d2c8561760645478e5f691f98d8a3ff7ac Makefile.PL
+SHA1 547495530b47e53ba22b50306dc2a92936a0e34c META.yml
+SHA1 d91ec74ed0b6bc4cea009bc8c3ff4d700ff67347 Makefile.PL
SHA1 23ff9a53497b927573048b7457d5eb8173d8b9b0 Pg.h
-SHA1 f7c5d0b0a9a88a3ccfe6a8a5c21e316718be2f21 Pg.pm
+SHA1 ac3e652febb79b43247917f6ee2bad8de20a3d05 Pg.pm
SHA1 4e39c717f6050aff330b22e2bc52f6f2532d21c5 Pg.xs
-SHA1 d1128b98e48d8c836609010988b2dc5b651c5c18 README
+SHA1 5093f6d51a7a8f3580858737235c88b9794d4e3f README
SHA1 8f20ecd6822bce2a39504beb087bdd341ace06f4 README.dev
SHA1 7e213bf90f513595b59c0a2c4ef94fea1592efcf README.win32
SHA1 fe7a42afdeec6a218c45f76e875cc3324b870956 TODO
-SHA1 2bef6d7ce41827d1fe32c9719ad7b625caa8cc02 dbdimp.c
+SHA1 417f75c40b46402197c5451a3cb49e0cfdbe7bbe dbdimp.c
SHA1 3852dea79080d2c3e1ed9644fbbd6d25c2151c13 dbdimp.h
SHA1 6c33bcf138e577722283bef02fceb8cbce4d100d dbivport.h
-SHA1 de634e129018c805910a05f7ec8e48d4d0ad0fb5 lib/Bundle/DBD/Pg.pm
+SHA1 3cf1e55ed40c8c0a36f494ca52da2896cbeee79a lib/Bundle/DBD/Pg.pm
SHA1 fe02d60d99123a5bb17d65bea35ade9a9b8f1eb4 quote.c
SHA1 0a1fdd0406c5c367a9aba366d1d35cfa8d5272ae quote.h
SHA1 93aa7e8cae0a361d1e6163dea0281ebff41f3c5f t/00-signature.t
SHA1 073baf503a601ceeb49516d61bd275f0c1e51563 t/00basic.t
SHA1 f407ad828fe5898e1fa585523852b204ce9b5b2d t/01connect.t
SHA1 1e0d8cad9de0063d4258739f6c8eb2cee27d9937 t/01constants.t
-SHA1 85c9abd61b53c7cdd3efa690b81b2a9510e35fec t/02attribs.t
-SHA1 24f8c6b8d964ec0a9d0e6ebc1e29af16fba6aace t/03dbmethod.t
+SHA1 13a1fbffcfcc0e44f9ff5bbe39a00c59c494d4d3 t/02attribs.t
+SHA1 51ff634a86d264f75b5e094f916140b3dc8637ed t/03dbmethod.t
SHA1 7ce47f4163e23b3f3df589487707257f5158001a t/03smethod.t
SHA1 910d6c2234d77a74a49cf189b6c799e13bf75280 t/04misc.t
SHA1 ee7ecab04b202d5cd8816fbb8c2703971161dd53 t/06bytea.t
SHA1 99aac4b46da5b138c42358854f8f9682b742c44d t/07copy.t
SHA1 3aa283c6065bc2a7b734fc4c7d1f21ac79acfdde t/08async.t
-SHA1 9cce5dcbb516e249abb9d6a7fed663720875c888 t/09arrays.t
+SHA1 96c3e73259cdad68ef3f18874a2697111e136e0c t/09arrays.t
SHA1 53b8ace91aa1575b68dc9c48e7dffbf8a74ac765 t/12placeholders.t
SHA1 85b5df8ef0c78b1d2d0018d874c62af7ef01a28f t/20savepoints.t
-SHA1 711a85cb938c6aa8a2b4200c0836a7caa397bf9f t/99_perlcritic.t
+SHA1 2378bf8da302755211ccc9f0a971ec1b999b24ec t/99_perlcritic.t
SHA1 9487888f49204c35be2e46a8f1d0142859010e4f t/99_pod.t
-SHA1 bd1fbc8f54778cf2a559a8b96547c6cf1f17e3a4 t/99_spellcheck.t
+SHA1 c0d6d378f5546b0197a115845bb35011448ee29f t/99_spellcheck.t
SHA1 ace40437561196dc6a08b5e725de35aed0e9902c t/99_yaml.t
SHA1 60031c2db489d77291078ab6a418723e1a35f137 t/99cleanup.t
-SHA1 60cf270e00de00da24376101dfedc4ad999ae09b t/dbdpg_test_setup.pl
+SHA1 107e11db9822d866e7f8b1e7c216b40474ef508a t/dbdpg_test_setup.pl
SHA1 bc4a58bdd5e853139f9e1fc6129f83e50a07a2c6 t/lib/App/Info.pm
SHA1 58befda00c12b1721875262505112203bf230450 t/lib/App/Info/Handler.pm
SHA1 b5bf85b12a5fc207c44113a9c028fb7fbd68531f t/lib/App/Info/Handler/Prompt.pm
@@ -65,7 +65,7 @@
SHA1 f07cd5ecaeb854c81ceb9206364979cf607e6546 win32.mak
-----BEGIN PGP SIGNATURE-----
-iEYEAREDAAYFAknOOOIACgkQvJuQZxSWSsg72QCeNXC6x/FxhIEJmWUz6E6Qb2Et
-z3oAoMmhquVhFwQRjAgVyri8WqkUKFCY
-=7flY
+iEYEAREDAAYFAknj7xwACgkQvJuQZxSWSsheuQCcDMK6Hi9fjstgIgQX3r7DxYw1
+cbcAnjVtCjcGhU5lQPOVK5SI3Nw10OzX
+=xHXF
-----END PGP SIGNATURE-----
Modified: branches/upstream/libdbd-pg-perl/current/dbdimp.c
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/dbdimp.c?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/dbdimp.c (original)
+++ branches/upstream/libdbd-pg-perl/current/dbdimp.c Tue Apr 14 14:58:07 2009
@@ -1,6 +1,6 @@
/*
- $Id: dbdimp.c 12635 2009-03-26 16:16:10Z turnstep $
+ $Id: dbdimp.c 12682 2009-04-09 15:52:56Z turnstep $
Copyright (c) 2002-2009 Greg Sabino Mullane and others: see the Changes file
Portions Copyright (c) 2002 Jeffrey W. Baker
@@ -377,6 +377,10 @@
strncpy(imp_dbh->sqlstate, "01000", 6); /* WARNING */
break;
case PGRES_FATAL_ERROR:
+ if (!result) { /* libpq returned null - some sort of connection problem */
+ strncpy(imp_dbh->sqlstate, "08000", 6); /* CONNECTION EXCEPTION */
+ break;
+ }
default:
strncpy(imp_dbh->sqlstate, "22000", 6); /* DATA EXCEPTION */
break;
@@ -2113,9 +2117,8 @@
TRACE_PQPREPARE;
result = PQprepare(imp_dbh->conn, imp_sth->prepare_name, statement, params, imp_sth->PQoids);
+ status = _sqlstate(aTHX_ imp_dbh, result);
if (result) {
- TRACE_PQRESULTSTATUS;
- status = PQresultStatus(result);
TRACE_PQCLEAR;
PQclear(result);
}
Modified: branches/upstream/libdbd-pg-perl/current/lib/Bundle/DBD/Pg.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/lib/Bundle/DBD/Pg.pm?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/lib/Bundle/DBD/Pg.pm (original)
+++ branches/upstream/libdbd-pg-perl/current/lib/Bundle/DBD/Pg.pm Tue Apr 14 14:58:07 2009
@@ -4,7 +4,7 @@
use strict;
use warnings;
-$VERSION = '2.12.0';
+$VERSION = '2.13.0';
1;
Modified: branches/upstream/libdbd-pg-perl/current/t/02attribs.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/t/02attribs.t?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/t/02attribs.t (original)
+++ branches/upstream/libdbd-pg-perl/current/t/02attribs.t Tue Apr 14 14:58:07 2009
@@ -417,8 +417,8 @@
skip ('Cannot test unicode with a LATIN1 database', 5)
if $server_encoding eq 'LATIN1';
- my $SQL = 'SELECT id, pname FROM dbd_pg_test WHERE id = ?';
- my $sth = $dbh->prepare($SQL);
+ $SQL = 'SELECT id, pname FROM dbd_pg_test WHERE id = ?';
+ $sth = $dbh->prepare($SQL);
$sth->execute(1);
local $dbh->{pg_enable_utf8} = 1;
@@ -950,7 +950,7 @@
q{UPDATE dbd_pg_test SET id=2 WHERE id=2},
q{SELECT * FROM dbd_pg_test},
) {
- my $expected = substr($_,0,6);
+ $expected = substr($_,0,6);
$t=qq{Statement handle attribute "pg_cmd_status" works for '$expected'};
$sth = $dbh->prepare($_);
$sth->execute();
@@ -1558,7 +1558,7 @@
if (fork) {
$t=qq{Parent in fork test is working properly ("InactiveDestroy" = $destroy)};
$sth->execute(1);
- my $val = $sth->fetchall_arrayref()->[0][0];
+ $val = $sth->fetchall_arrayref()->[0][0];
is ($val, $answer, $t);
# Let the child exit first
select(undef,undef,undef,0.3);
@@ -1579,16 +1579,16 @@
$t='Statement handle works after forking';
$sth->execute(1);
- my $val = $sth->fetchall_arrayref()->[0][0];
+ $val = $sth->fetchall_arrayref()->[0][0];
is ($val, $answer, $t);
}
else {
$t=qq{Ping fails after the child has exited ("InactiveDestroy" = $destroy)};
is ( $dbh->ping(), 0, $t);
- $t='Failed ping returns a SQLSTATE code of 22000';
+ $t='Failed ping returns a SQLSTATE code of 08000';
my $state = $dbh->state();
- is ($state, '22000', $t);
+ is ($state, '08000', $t);
$t=qq{pg_ping gives an error code of -2 after the child has exited ("InactiveDestroy" = $destroy)};
is ( $dbh->pg_ping(), -2,$t);
Modified: branches/upstream/libdbd-pg-perl/current/t/03dbmethod.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/t/03dbmethod.t?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/t/03dbmethod.t (original)
+++ branches/upstream/libdbd-pg-perl/current/t/03dbmethod.t Tue Apr 14 14:58:07 2009
@@ -719,8 +719,6 @@
is_deeply ($stats, $correct_stats->{three_uo}, $t);
{
- my $stats;
-
$t="Correct stats output for $table1";
$sth = $dbh->statistics_info(undef,undef,$table1,undef,undef);
$stats = $sth->fetchall_arrayref;
@@ -1384,7 +1382,7 @@
my ($fh,$filename) = File::Temp::tmpnam();
print $fh "abc\ndef";
close $fh or warn 'Failed to close temporary file';
- my $handle = $dbh->pg_lo_import($filename);
+ $handle = $dbh->pg_lo_import($filename);
my $objid = $handle;
ok ($handle, $t);
unlink $filename;
@@ -1399,7 +1397,7 @@
like ($handle, qr/^\d+$/o, $t);
$t='DB handle method "pg_lo_read" returns correct data after "pg_lo_import"';
- my $data = '';
+ $data = '';
$result = $dbh->pg_lo_read($handle, $data, 100);
is ($result, 7, $t);
is ($data, "abc\ndef", $t);
@@ -1482,7 +1480,7 @@
my ($fh,$filename) = File::Temp::tmpnam();
print $fh "abc\ndef";
close $fh or warn 'Failed to close temporary file';
- my $handle = $dbh->pg_lo_import($filename);
+ $handle = $dbh->pg_lo_import($filename);
ok ($handle, $t);
$t='DB handle method "pg_lo_import" inserts correct data (AutoCommit on, begin_work not called)';
Modified: branches/upstream/libdbd-pg-perl/current/t/09arrays.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/t/09arrays.t?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/t/09arrays.t (original)
+++ branches/upstream/libdbd-pg-perl/current/t/09arrays.t Tue Apr 14 14:58:07 2009
@@ -525,7 +525,7 @@
$t="Array test $msg : $input";
$SQL = qq{SELECT ARRAY[$input]};
- my $result = '';
+ $result = '';
eval {
$result = $dbh->selectall_arrayref($SQL)->[0][0];
};
Modified: branches/upstream/libdbd-pg-perl/current/t/99_perlcritic.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/t/99_perlcritic.t?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/t/99_perlcritic.t (original)
+++ branches/upstream/libdbd-pg-perl/current/t/99_perlcritic.t Tue Apr 14 14:58:07 2009
@@ -61,7 +61,6 @@
next;
}
last if /= Compiling/;
- print "Checking $_\n";
if (m{^([\w\./-]+) \- }) {
$devfile{$1} = $.;
next;
Modified: branches/upstream/libdbd-pg-perl/current/t/99_spellcheck.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/t/99_spellcheck.t?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/t/99_spellcheck.t (original)
+++ branches/upstream/libdbd-pg-perl/current/t/99_spellcheck.t Tue Apr 14 14:58:07 2009
@@ -39,11 +39,11 @@
sub spellcheck {
- my ($desc, $text, $file) = @_;
+ my ($desc, $text, $filename) = @_;
my $check = Text::SpellChecker->new(text => $text);
my %badword;
while (my $word = $check->next_word) {
- next if $okword{Common}{$word} or $okword{$file}{$word};
+ next if $okword{Common}{$word} or $okword{$filename}{$word};
$badword{$word}++;
}
my $count = keys %badword;
Modified: branches/upstream/libdbd-pg-perl/current/t/dbdpg_test_setup.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/t/dbdpg_test_setup.pl?rev=33184&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/t/dbdpg_test_setup.pl (original)
+++ branches/upstream/libdbd-pg-perl/current/t/dbdpg_test_setup.pl Tue Apr 14 14:58:07 2009
@@ -231,7 +231,7 @@
}
INITDB:
- my ($info,$testport);
+ my $testport;
$helpconnect = 16;
## Use the initdb found by App::Info
@@ -326,7 +326,7 @@
$su = $testuser;
$founduser++;
$info = '';
- my $olddir = getcwd;
+ $olddir = getcwd;
eval {
chdir $testdir;
$info = qx{su -m $testuser -c "$initdb --locale=C -E UTF8 -D $testdir/data 2>&1"};
@@ -422,7 +422,7 @@
$option = q{-o '-k socket'};
}
my $COM = qq{$pg_ctl $option -l $testdir/dbdpg_test.logfile -D $testdir/data start};
- my $olddir = getcwd;
+ $olddir = getcwd;
if ($su) {
chdir $testdir;
$COM = qq{su -m $su -c "$COM"};
@@ -527,7 +527,7 @@
$dbh->do("SET search_path TO $S");
$dbh->do('CREATE SEQUENCE dbd_pg_testsequence');
# If you add columns to this, please do not use reserved words!
- my $SQL = q{
+ $SQL = q{
CREATE TABLE dbd_pg_test (
id integer not null primary key,
lii integer unique not null default nextval('dbd_pg_testsequence'),
More information about the Pkg-perl-cvs-commits
mailing list