r74375 - in /branches/upstream/libdbd-pg-perl/current: Changes META.yml Makefile.PL Pg.pm README README.dev SIGNATURE dbdimp.c lib/Bundle/DBD/Pg.pm t/07copy.t t/dbdpg_test_setup.pl

ansgar at users.alioth.debian.org ansgar at users.alioth.debian.org
Sat May 14 08:58:00 UTC 2011


Author: ansgar
Date: Sat May 14 08:57:34 2011
New Revision: 74375

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74375
Log:
[svn-upgrade] new version libdbd-pg-perl (2.18.1)

Modified:
    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/README.dev
    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/07copy.t
    branches/upstream/libdbd-pg-perl/current/t/dbdpg_test_setup.pl

Modified: branches/upstream/libdbd-pg-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/Changes?rev=74375&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/Changes (original)
+++ branches/upstream/libdbd-pg-perl/current/Changes Sat May 14 08:57:34 2011
@@ -1,15 +1,22 @@
 'GSM' is Greg Sabino Mullane, greg at turnstep.com)
 
 
-Version 2.18.0  Released March 28, 2011
+Version 2.18.1  Released May 9, 2011
+
+  - Fix LANG testing issue [GSM] (CPAN bug #56705)
+
+  - Fix bug when async commands issued immediately after a COPY. [GSM] (CPAN bug #68041)
+
+
+Version 2.18.0  Released March 28, 2011 (subversion r14081)
 
   - Thanks to 123people.com for sponsoring work on this release [GSM]
 
+  - New cancel() method per DBI spec. [Eric Simon] (CPAN bug #63516)
+
   - Fix memory leak when binding arrays [GSM] (CPAN bug #65734)
 
   - Fix memory leak with ParamValues. [Martin J. Evans] (CPAN bug #60863)
-
-  - New cancel() method per DBI spec. [Eric Simon] (CPAN bug #63516)
 
   - Fix memory leak in handle_old_async (missing PQclear)
     [Rainer Weikusat] (CPAN bug #63408)

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=74375&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/META.yml (original)
+++ branches/upstream/libdbd-pg-perl/current/META.yml Sat May 14 08:57:34 2011
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name                        : DBD-Pg
-version                     : 2.18.0
+version                     : 2.18.1
 abstract                    : DBI PostgreSQL interface
 author:              
   - Greg Sabino Mullane <greg at turnstep.com>
@@ -39,10 +39,10 @@
 provides:
   DBD::Pg:
     file                    : Pg.pm
-    version                 : 2.18.0
+    version                 : 2.18.1
   Bundle::DBD::Pg:
     file                    : lib/Bundle/DBD/Pg.pm
-    version                 : 2.18.0
+    version                 : 2.18.1
 
 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=74375&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/Makefile.PL (original)
+++ branches/upstream/libdbd-pg-perl/current/Makefile.PL Sat May 14 08:57:34 2011
@@ -1,4 +1,4 @@
-# $Id: Makefile.PL 14796 2011-03-28 19:42:44Z turnstep $
+# $Id: Makefile.PL 14843 2011-05-09 15:53:36Z 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.18.0';
+my $VERSION = '2.18.1';
 
 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=74375&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/Pg.pm (original)
+++ branches/upstream/libdbd-pg-perl/current/Pg.pm Sat May 14 08:57:34 2011
@@ -1,5 +1,5 @@
 #  -*-cperl-*-
-#  $Id: Pg.pm 14796 2011-03-28 19:42:44Z turnstep $
+#  $Id: Pg.pm 14843 2011-05-09 15:53:36Z turnstep $
 #
 #  Copyright (c) 2002-2011 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.18.0');
+	use version; our $VERSION = qv('2.18.1');
 
 	use DBI ();
 	use DynaLoader ();
@@ -1732,7 +1732,7 @@
 
 =head1 VERSION
 
-This documents version 2.18.0 of the DBD::Pg module
+This documents version 2.18.1 of the DBD::Pg module
 
 =head1 DESCRIPTION
 
@@ -3839,7 +3839,7 @@
   do_something_else();
   {
     if ($dbh->pg_ready()) {
-      $res = $pg_result();
+      $res = pg_result();
       print "Result of do(): $res\n";
     }
     print "Query is still running...\n";

Modified: branches/upstream/libdbd-pg-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/README?rev=74375&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/README (original)
+++ branches/upstream/libdbd-pg-perl/current/README Sat May 14 08:57:34 2011
@@ -6,7 +6,7 @@
 DESCRIPTION:
 ------------
 
-This is version 2.18.0 of DBD::Pg, the Perl interface to Postgres using DBI. 
+This is version 2.18.1 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/README.dev
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/README.dev?rev=74375&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/README.dev (original)
+++ branches/upstream/libdbd-pg-perl/current/README.dev Sat May 14 08:57:34 2011
@@ -682,11 +682,13 @@
 * Tell Greg to post on PlanetPostgresql.
 
 * If a non-beta, clean out any CPAN bugs, including going back and marking resolved 
-bugs with this new version, once it appears in the choices.
+bugs with this new version, once it appears in the choices (takes a day or two for 
+the version to appear as a choice in the pulldown).
+
+* Check the CPAN testers report a few days after the PAUSE upload:
+http://www.cpantesters.org/distro/D/DBD-Pg.html
 
 * Update this file based on your experiences!!
-
-* Wait for the bugs or accolades to pour in.
 
 
 =====================

Modified: branches/upstream/libdbd-pg-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/SIGNATURE?rev=74375&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/SIGNATURE (original)
+++ branches/upstream/libdbd-pg-perl/current/SIGNATURE Sat May 14 08:57:34 2011
@@ -15,24 +15,24 @@
 Hash: RIPEMD160
 
 SHA1 60008bc93c714fe8ede90cfae2d5444077b5659e .perlcriticrc
-SHA1 569cfeb7851492f415b15b394ba3f54802504224 Changes
+SHA1 734bf40473c3b74b2e1e74e0e891e7f3df0073fd Changes
 SHA1 21bc5f3c797d4d5b72285198ffeb1e4e1f0a2902 LICENSES/artistic.txt
 SHA1 06877624ea5c77efe3b7e39b0f909eda6e25a4ec LICENSES/gpl-2.0.txt
 SHA1 117e5883538d3a9bcdb7b4f015ae0b3ae060c0fe MANIFEST
 SHA1 9aa8e51bdd4f3c1f3528e1bab45f503fc45991d4 MANIFEST.SKIP
-SHA1 957a8f0b2b406dc723f912987b8d2864eba3f3a1 META.yml
-SHA1 d728fd9b8091dcafa9ffd862ff6f77e1b7e4ea70 Makefile.PL
+SHA1 d1642a332a695d87a87523e2a4532e2e97b15719 META.yml
+SHA1 c4afd24fbbe0e840ad54ccec4a370ead7d5d0407 Makefile.PL
 SHA1 17d0501f8bacb2fba6c5ddfac072c45e5c3ff6c5 Pg.h
-SHA1 6946104e01effb64c09e5d8ab0ee660207391ff6 Pg.pm
+SHA1 92f60ab6f8a8ebe01890b48350598b505b879c44 Pg.pm
 SHA1 9d30acdb46c61b5bba0226782a9652de929906e5 Pg.xs
-SHA1 0597521322c653fa8c9d5b01dc681df5ab4b2dd9 README
-SHA1 eaa14fd48ab0b9de768499d62042e572fe950c07 README.dev
+SHA1 04d041e07bea9e0563a2bbc999e07cd3a3a95649 README
+SHA1 af5c1ae27ef74a05ccd7539a5cd09297887d08ed README.dev
 SHA1 7e213bf90f513595b59c0a2c4ef94fea1592efcf README.win32
 SHA1 56367817fd4315160c5123b880fdf69d59974948 TODO
-SHA1 4a32adc3944016c92ec233e5948de0bc6b7ed331 dbdimp.c
+SHA1 d77c8a25d92065390041c6d5312beb7641eb3a3d dbdimp.c
 SHA1 22cc5de68760e581dfb89005f493df81c1b48092 dbdimp.h
 SHA1 6c33bcf138e577722283bef02fceb8cbce4d100d dbivport.h
-SHA1 a7f5212a36ff792f9274fe0d0485ec92da17fd66 lib/Bundle/DBD/Pg.pm
+SHA1 a8457a4fadea6bdce9cef4f7c58985ac5560234b lib/Bundle/DBD/Pg.pm
 SHA1 7b88775116f57ab8dd7be46672aa366f32bcc70c quote.c
 SHA1 7ccff1056809e35bcc1a3ff4f5a3d337f207681f quote.h
 SHA1 93aa7e8cae0a361d1e6163dea0281ebff41f3c5f t/00_signature.t
@@ -44,13 +44,13 @@
 SHA1 9f9519dc96f35f479d2fa64097dcde195bce73d2 t/03smethod.t
 SHA1 723db2e94914a5739c867f5b2b0151cced63d614 t/04misc.t
 SHA1 b7b72e0a9569e97e97975ea12e4adbc99a50d076 t/06bytea.t
-SHA1 fbf66abb75009bfbe875c45d9ee204220ff107a7 t/07copy.t
+SHA1 c4c43b2229411c3850de0a9cb9bae8e5ccc7d822 t/07copy.t
 SHA1 e6fe3d9c739d31f344c4a56382004a97202e4d51 t/08async.t
 SHA1 877b2591531317802336eee5983bb5ca052c7a4f t/09arrays.t
 SHA1 ea049356a2a6f7355fbfb398414f707564c0eacb t/12placeholders.t
 SHA1 81558ca5c783ea6792fd103444a04df615a8d127 t/20savepoints.t
 SHA1 dfef0062e9549b2cad7b429c7214734ab6ab5a4a t/99cleanup.t
-SHA1 b06b12dc9f46c2e4144d52a1f53c70a1ab97d924 t/dbdpg_test_setup.pl
+SHA1 7c7e5d7b141344c20193282aebe7eedfc83921f7 t/dbdpg_test_setup.pl
 SHA1 30b4c1b0a41123bbbdc690588a2fdb319023bf0c t/lib/App/Info.pm
 SHA1 94cd383136553746ff12128aa367fb71e98087df t/lib/App/Info/Handler.pm
 SHA1 b5bf85b12a5fc207c44113a9c028fb7fbd68531f t/lib/App/Info/Handler/Prompt.pm
@@ -64,7 +64,7 @@
 SHA1 f07cd5ecaeb854c81ceb9206364979cf607e6546 win32.mak
 -----BEGIN PGP SIGNATURE-----
 
-iEYEAREDAAYFAk2RKPgACgkQvJuQZxSWSsijcACfemzx6buir4sC/nNrexTzIR+L
-ULQAn1ngAd0JFncyB5zX5tNJUoJIBiYt
-=uCcn
+iEYEAREDAAYFAk3IEgQACgkQvJuQZxSWSsjHoQCg8yK5ahfw2iJkasBFbUg+I9Kr
++6IAoNYOaoHIk4s4/jF10icsss4iD9mr
+=AJTu
 -----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=74375&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/dbdimp.c (original)
+++ branches/upstream/libdbd-pg-perl/current/dbdimp.c Sat May 14 08:57:34 2011
@@ -1,6 +1,6 @@
 /*
 
-  $Id: dbdimp.c 14779 2011-03-27 03:43:15Z turnstep $
+  $Id: dbdimp.c 14842 2011-05-09 15:42:14Z turnstep $
 
   Copyright (c) 2002-2011 Greg Sabino Mullane and others: see the Changes file
   Portions Copyright (c) 2002 Jeffrey W. Baker
@@ -261,8 +261,9 @@
 
 
 /* ================================================================== */
-
-/* Database specific error handling. */
+/* 
+   Database specific error handling.
+*/
 static void pg_error (pTHX_ SV * h, int error_num, const char * error_msg)
 {
 	D_imp_xxh(h);
@@ -294,7 +295,9 @@
 
 
 /* ================================================================== */
-/* Turn database notices into perl warnings for proper handling. */
+/*
+  Turn database notices into perl warnings for proper handling.
+*/
 static void pg_warn (void * arg, const char * message)
 {
 	dTHX;
@@ -334,7 +337,9 @@
 
 
 /* ================================================================== */
-/* Quick command executor used throughout this file */
+/*
+  Quick command executor used throughout this file
+*/
 static ExecStatusType _result(pTHX_ imp_dbh_t * imp_dbh, const char * sql)
 {
 	PGresult *     result;
@@ -359,7 +364,9 @@
 
 
 /* ================================================================== */
-/* Set the SQLSTATE based on a result, returns the status */
+/*
+  Set the SQLSTATE based on a result, returns the status
+*/
 static ExecStatusType _sqlstate(pTHX_ imp_dbh_t * imp_dbh, PGresult * result)
 {
 	ExecStatusType status   = PGRES_FATAL_ERROR; /* until proven otherwise */
@@ -1338,8 +1345,10 @@
 } /* end of dbd_discon_all */
 
 
-/* Deprecated in favor of $dbh->{pg_socket} */
-/* ================================================================== */
+/* ================================================================== */
+/*
+  Deprecated in favor of $dbh->{pg_socket}
+*/
 int pg_db_getfd (imp_dbh_t * imp_dbh)
 {
 	dTHX;
@@ -3491,7 +3500,9 @@
 
 
 /* ================================================================== */
-/* Pop off savepoints to the specified savepoint name */
+/* 
+   Pop off savepoints to the specified savepoint name
+*/
 static void pg_db_free_savepoints_to (pTHX_ imp_dbh_t * imp_dbh, const char *savepoint)
 {
 	I32 i;
@@ -3725,8 +3736,7 @@
 
 
 /* ================================================================== */
-int
-pg_db_putline (SV * dbh, const char * buffer)
+int pg_db_putline (SV * dbh, const char * buffer)
 {
 	dTHX;
 	D_imp_dbh(dbh);
@@ -3757,8 +3767,7 @@
 
 
 /* ================================================================== */
-int
-pg_db_getline (SV * dbh, SV * svbuf, int length)
+int pg_db_getline (SV * dbh, SV * svbuf, int length)
 {
 	dTHX;
 	D_imp_dbh(dbh);
@@ -3804,8 +3813,7 @@
 
 
 /* ================================================================== */
-int
-pg_db_getcopydata (SV * dbh, SV * dataline, int async)
+int pg_db_getcopydata (SV * dbh, SV * dataline, int async)
 {
 	dTHX;
 	D_imp_dbh(dbh);
@@ -3849,6 +3857,9 @@
 		TRACE_PQGETRESULT;
 		result = PQgetResult(imp_dbh->conn);
 		status = _sqlstate(aTHX_ imp_dbh, result);
+		while (result != NULL) {
+			result = PQgetResult(imp_dbh->conn);
+		}
 		TRACE_PQCLEAR;
 		PQclear(result);
 		if (PGRES_COMMAND_OK != status) {
@@ -3868,8 +3879,7 @@
 
 
 /* ================================================================== */
-int
-pg_db_putcopydata (SV * dbh, SV * dataline)
+int pg_db_putcopydata (SV * dbh, SV * dataline)
 {
 	dTHX;
 	D_imp_dbh(dbh);
@@ -3941,6 +3951,9 @@
 		TRACE_PQGETRESULT;
 		result = PQgetResult(imp_dbh->conn);
 		status = _sqlstate(aTHX_ imp_dbh, result);
+		while (result != NULL) {
+			result = PQgetResult(imp_dbh->conn);
+		}
 		TRACE_PQCLEAR;
 		PQclear(result);
 		if (PGRES_COMMAND_OK != status) {
@@ -4173,7 +4186,9 @@
 
 
 /* ================================================================== */
-/* For lo_* functions. Used to ensure we are in a transaction */
+/* 
+   For lo_* functions. Used to ensure we are in a transaction
+*/
 static int pg_db_start_txn (pTHX_ SV * dbh, imp_dbh_t * imp_dbh)
 {
 	int status = -1;
@@ -4199,8 +4214,10 @@
 
 
 /* ================================================================== */
-/* For lo_import and lo_export functions. Used to commit or rollback a 
-   transaction, but only if AutoCommit is on. */
+/* 
+   For lo_import and lo_export functions. Used to commit or rollback a 
+   transaction, but only if AutoCommit is on.
+*/
 static int pg_db_end_txn (pTHX_ SV * dbh, imp_dbh_t * imp_dbh, int commit)
 {
 	int status = -1;
@@ -4602,7 +4619,9 @@
 
 
 /* ================================================================== */
-/* Return the result of an asynchronous query, waiting if needed */
+/* 
+   Return the result of an asynchronous query, waiting if needed
+*/
 int pg_db_result (SV *h, imp_dbh_t *imp_dbh)
 {
 	dTHX;
@@ -4701,16 +4720,15 @@
 } /* end of pg_db_result */
 
 
+/* ================================================================== */
 /* 
-==================================================================
-Indicates if an asynchronous query has finished yet
-Accepts either a database or a statement handle
-Returns:
-  -1 if no query is running (and raises an exception)
-  +1 if the query is finished
+   Indicates if an asynchronous query has finished yet
+   Accepts either a database or a statement handle
+   Returns:
+   -1 if no query is running (and raises an exception)
+   +1 if the query is finished
    0 if the query is still running
-  -2 for other errors
-==================================================================
+   -2 for other errors
 */
 int pg_db_ready(SV *h, imp_dbh_t *imp_dbh)
 {
@@ -4740,14 +4758,13 @@
 } /* end of pg_db_ready */
 
 
+/* ================================================================== */
 /*
-Attempt to cancel a running asynchronous query
-Returns true if the cancel succeeded, and false if it did not
-In this case, pg_cancel will return false.
-NOTE: We only return true if we cancelled
+  Attempt to cancel a running asynchronous query
+  Returns true if the cancel succeeded, and false if it did not
+  In this case, pg_cancel will return false.
+  NOTE: We only return true if we cancelled
 */
-
-/* ================================================================== */
 int pg_db_cancel(SV *h, imp_dbh_t *imp_dbh)
 {
 	dTHX;
@@ -4847,12 +4864,11 @@
 } /* end of pg_db_cancel_sth */
 
 
+/* ================================================================== */
 /*
-Finish up an existing async query, either by cancelling it,
-or by waiting for a result.
-
+  Finish up an existing async query, either by cancelling it,
+  or by waiting for a result.
  */
-/* ================================================================== */
 static int handle_old_async(pTHX_ SV * handle, imp_dbh_t * imp_dbh, const int asyncflag) {
 
 	PGresult *result;
@@ -4943,8 +4959,10 @@
 
 
 /* ================================================================== */
-/* Attempt to cancel a synchronous query
-   Returns true if the cancel succeeded, and false if it did not */
+/* 
+   Attempt to cancel a synchronous query
+   Returns true if the cancel succeeded, and false if it did not
+*/
 int dbd_st_cancel(SV *sth, imp_sth_t *imp_sth)
 {
 	dTHX;

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=74375&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 Sat May 14 08:57:34 2011
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-$VERSION = '2.18.0';
+$VERSION = '2.18.1';
 
 1;
 

Modified: branches/upstream/libdbd-pg-perl/current/t/07copy.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-pg-perl/current/t/07copy.t?rev=74375&op=diff
==============================================================================
--- branches/upstream/libdbd-pg-perl/current/t/07copy.t (original)
+++ branches/upstream/libdbd-pg-perl/current/t/07copy.t Sat May 14 08:57:34 2011
@@ -6,6 +6,7 @@
 use strict;
 use warnings;
 use Data::Dumper;
+use DBD::Pg ':async';
 use Test::More;
 use lib 't','.';
 require 'dbdpg_test_setup.pl';
@@ -14,7 +15,7 @@
 my $dbh = connect_database();
 
 if ($dbh) {
-	plan tests => 55;
+	plan tests => 57;
 }
 else {
 	plan skip_all => 'Connection to database failed, cannot continue testing';
@@ -327,6 +328,29 @@
 };
 is ($@, q{}, $t);
 
+$t='Async queries work after COPY OUT';
+$dbh->do('CREATE TEMP TABLE foobar AS SELECT 123::INTEGER AS x');
+$dbh->do('COPY foobar TO STDOUT');
+1 while ($dbh->pg_getcopydata($buffer) >= 0);
+
+eval {
+	$dbh->do('SELECT 111', { pg_async => PG_ASYNC} );
+};
+is ($@, q{}, $t);
+$dbh->pg_result();
+
+$t='Async queries work after COPY IN';
+$dbh->do('COPY foobar FROM STDIN');
+$dbh->pg_putcopydata(456);
+$dbh->pg_putcopyend();
+
+eval {
+	$dbh->do('SELECT 222', { pg_async => PG_ASYNC} );
+};
+is ($@, q{}, $t);
+$dbh->pg_result();
+
+
 SKIP: {
 	$pgversion < 80200 and skip ('Server version 8.2 or greater needed for test', 1);
 

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=74375&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 Sat May 14 08:57:34 2011
@@ -13,7 +13,6 @@
 if (exists $ENV{TEST_OUTPUT}) {
 	my $file = $ENV{TEST_OUTPUT};
 	open $testfh, '>>', $file or die qq{Could not append file "$file": $!\n};
-	#Test::More->builder->output($testfh);
 	Test::More->builder->failure_output($testfh);
 	Test::More->builder->todo_output($testfh);
 }
@@ -102,7 +101,7 @@
 			1;
 		};
 
-		if ($@ =~ /invalid connection option/) {
+		if ($@ =~ /invalid connection option/ or $@ =~ /failed:.*"dbbarf"/) {
 			return $helpconnect, $@, undef;
 		}
 




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