[svn:DBD-Pg] r12679 - in DBD-Pg/trunk: . lib/Bundle/DBD t

[email protected]
Newsgroups gmane.comp.db.postgresql.dbdpg.cvs
Message-ID <[email protected]>
Author: turnstep
Date: Tue Apr  7 13:24:17 2009
New Revision: 12679

Modified:
   DBD-Pg/trunk/.perlcriticrc
   DBD-Pg/trunk/META.yml
   DBD-Pg/trunk/Makefile.PL
   DBD-Pg/trunk/Pg.pm
   DBD-Pg/trunk/README
   DBD-Pg/trunk/SIGNATURE
   DBD-Pg/trunk/lib/Bundle/DBD/Pg.pm
   DBD-Pg/trunk/t/02attribs.t
   DBD-Pg/trunk/t/03dbmethod.t
   DBD-Pg/trunk/t/09arrays.t
   DBD-Pg/trunk/t/99_perlcritic.t
   DBD-Pg/trunk/t/99_spellcheck.t
   DBD-Pg/trunk/t/dbdpg_test_setup.pl

Log:
Fix up annoying Perl::Critic things, per bug 44704 and Debian bug 521969.
Also bump version.


Modified: DBD-Pg/trunk/.perlcriticrc
==============================================================================
--- DBD-Pg/trunk/.perlcriticrc	(original)
+++ DBD-Pg/trunk/.perlcriticrc	Tue Apr  7 13:24:17 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: DBD-Pg/trunk/META.yml
==============================================================================
--- DBD-Pg/trunk/META.yml	(original)
+++ DBD-Pg/trunk/META.yml	Tue Apr  7 13:24:17 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name                        : DBD-Pg
-version                     : 2.11.8_1
+version                     : 2.12.0
 abstract                    : DBI PostgreSQL interface
 author:              
   - Greg Sabino Mullane <greg-738XdyZ4GzZWk0Htik3J/[email protected]>
@@ -39,10 +39,10 @@
 provides:
   DBD::Pg:
     file                    : Pg.pm
-    version                 : 2.11.8_1
+    version                 : 2.12.0
   Bundle::DBD::Pg:
     file                    : lib/Bundle/DBD/Pg.pm
-    version                 : 2.11.8_1
+    version                 : 2.12.0
 
 keywords:
   - Postgres

Modified: DBD-Pg/trunk/Makefile.PL
==============================================================================
--- DBD-Pg/trunk/Makefile.PL	(original)
+++ DBD-Pg/trunk/Makefile.PL	Tue Apr  7 13:24:17 2009
@@ -7,7 +7,7 @@
 use 5.006001;
 
 ## No version.pm for this one, as the prereqs are not loaded yet.
-my $VERSION = '2.11.8_1';
+my $VERSION = '2.12.0';
 
 my $lib;
 BEGIN {

Modified: DBD-Pg/trunk/Pg.pm
==============================================================================
--- DBD-Pg/trunk/Pg.pm	(original)
+++ DBD-Pg/trunk/Pg.pm	Tue Apr  7 13:24:17 2009
@@ -17,7 +17,7 @@
 {
 	package DBD::Pg;
 
-	use version; our $VERSION = qv('2.11.8_1');
+	use version; our $VERSION = qv('2.12.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.11.8_1 of the DBD::Pg module
+This documents version 2.12.0 of the DBD::Pg module
 
 =head1 DESCRIPTION
 

Modified: DBD-Pg/trunk/README
==============================================================================
--- DBD-Pg/trunk/README	(original)
+++ DBD-Pg/trunk/README	Tue Apr  7 13:24:17 2009
@@ -1,13 +1,3 @@
-===================================================
-WARNING!!
-
-THIS IS A TEST VERSION (2.11.8_1) AND SHOULD BE USED 
-FOR TESTING PURPOSES ONLY. PLEASE USE A STABLE 
-VERSION (no underscore) BY VISITING:
-
-http://search.cpan.org/dist/DBD-Pg/
-===================================================
-
 DBD::Pg  --  the DBI PostgreSQL interface for Perl
 
 # $Id$
@@ -15,7 +5,7 @@
 DESCRIPTION:
 ------------
 
-This is version 2.11.8_1 of DBD::Pg, the Perl interface to Postgres using DBI. 
+This is version 2.12.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: DBD-Pg/trunk/SIGNATURE
==============================================================================
--- DBD-Pg/trunk/SIGNATURE	(original)
+++ DBD-Pg/trunk/SIGNATURE	Tue Apr  7 13:24:17 2009
@@ -15,44 +15,44 @@
 Hash: RIPEMD160
 
 SHA1 2f324889a0b126216bf45a04d74803557c4a404e .perlcriticrc
-SHA1 b76de2d63c091ed89270c2086ff0e4ebfd6c2802 Changes
+SHA1 67b40359d87cf48f83f78b8d1d0b895bc5acb2fa Changes
 SHA1 4d91c71e5dbb19ece1505ab75c36d00a744bb076 MANIFEST
 SHA1 6fd98d850a9a67911c047e7f0a8752fd15be98d7 MANIFEST.SKIP
-SHA1 59e79c2f4bf6177f2442a82f3276e74dcff630b6 META.yml
-SHA1 10ed04aa160d2ab23b0e399c22dc0b34167cdb60 Makefile.PL
-SHA1 c51356c52c139265e20a2ad33bc8d3ee04f6ff48 Pg.h
-SHA1 4ee9b41b85dd8ca450867180cc56fb348cb5ead2 Pg.pm
-SHA1 ff0fb11360e79db3c86e8b312cf58f62c5f19d2d Pg.xs
-SHA1 8f4abad643aa77b17a4452d6ed4ff2b4b553c4e2 README
+SHA1 45593eab09a8aaf00888961ed76593d991cbcbf9 META.yml
+SHA1 b70507d2c8561760645478e5f691f98d8a3ff7ac Makefile.PL
+SHA1 23ff9a53497b927573048b7457d5eb8173d8b9b0 Pg.h
+SHA1 f7c5d0b0a9a88a3ccfe6a8a5c21e316718be2f21 Pg.pm
+SHA1 4e39c717f6050aff330b22e2bc52f6f2532d21c5 Pg.xs
+SHA1 d1128b98e48d8c836609010988b2dc5b651c5c18 README
 SHA1 8f20ecd6822bce2a39504beb087bdd341ace06f4 README.dev
-SHA1 968d5fad61bce160b31a9cb1a21dd240b9df930f README.win32
+SHA1 7e213bf90f513595b59c0a2c4ef94fea1592efcf README.win32
 SHA1 fe7a42afdeec6a218c45f76e875cc3324b870956 TODO
-SHA1 e7af4e19b3c02046a5e545bc169d5e6b7cf4b39b dbdimp.c
-SHA1 cf577f22e9dc3c591daa32c51ebd83dd38f55a8f dbdimp.h
+SHA1 2bef6d7ce41827d1fe32c9719ad7b625caa8cc02 dbdimp.c
+SHA1 3852dea79080d2c3e1ed9644fbbd6d25c2151c13 dbdimp.h
 SHA1 6c33bcf138e577722283bef02fceb8cbce4d100d dbivport.h
-SHA1 34423f202eba056955cc93616378163ee3a93819 lib/Bundle/DBD/Pg.pm
-SHA1 dbe8b0bd24538a61d4c617848e7fca27fd4ea3eb quote.c
+SHA1 de634e129018c805910a05f7ec8e48d4d0ad0fb5 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 ec842e6aaf11d6a55809318d69bd11ce8245092f t/01constants.t
-SHA1 bfa92ae26c5cbbf66144c014dd0f3c47da2a1246 t/02attribs.t
-SHA1 6ad4b49593cffb6da626764332fa2665a7f53d3f t/03dbmethod.t
+SHA1 1e0d8cad9de0063d4258739f6c8eb2cee27d9937 t/01constants.t
+SHA1 85c9abd61b53c7cdd3efa690b81b2a9510e35fec t/02attribs.t
+SHA1 24f8c6b8d964ec0a9d0e6ebc1e29af16fba6aace t/03dbmethod.t
 SHA1 7ce47f4163e23b3f3df589487707257f5158001a t/03smethod.t
 SHA1 910d6c2234d77a74a49cf189b6c799e13bf75280 t/04misc.t
 SHA1 ee7ecab04b202d5cd8816fbb8c2703971161dd53 t/06bytea.t
 SHA1 99aac4b46da5b138c42358854f8f9682b742c44d t/07copy.t
-SHA1 1413c886eaf1714db1cf8abfb989dabfd86dee87 t/08async.t
-SHA1 5027751944bdca8f0fe63c20c790c4c3beccf433 t/09arrays.t
-SHA1 46e3c5a05ba8a527cdd72fc4c9a392812ded4208 t/12placeholders.t
+SHA1 3aa283c6065bc2a7b734fc4c7d1f21ac79acfdde t/08async.t
+SHA1 9cce5dcbb516e249abb9d6a7fed663720875c888 t/09arrays.t
+SHA1 53b8ace91aa1575b68dc9c48e7dffbf8a74ac765 t/12placeholders.t
 SHA1 85b5df8ef0c78b1d2d0018d874c62af7ef01a28f t/20savepoints.t
 SHA1 711a85cb938c6aa8a2b4200c0836a7caa397bf9f t/99_perlcritic.t
-SHA1 3b22d5db94ca05d1fa1a8ea25d9c2ce866c36642 t/99_pod.t
-SHA1 e2477a6e2fd50500e56a1835249655f7bc1a1e13 t/99_spellcheck.t
+SHA1 9487888f49204c35be2e46a8f1d0142859010e4f t/99_pod.t
+SHA1 bd1fbc8f54778cf2a559a8b96547c6cf1f17e3a4 t/99_spellcheck.t
 SHA1 ace40437561196dc6a08b5e725de35aed0e9902c t/99_yaml.t
 SHA1 60031c2db489d77291078ab6a418723e1a35f137 t/99cleanup.t
-SHA1 b17758fd1561d818fd1ff9ec1eed36f12ca0b340 t/dbdpg_test_setup.pl
+SHA1 60cf270e00de00da24376101dfedc4ad999ae09b 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
@@ -60,12 +60,12 @@
 SHA1 c4526a50a9266817c64a8f8a9e3fa19b27715f50 t/lib/App/Info/RDBMS/PostgreSQL.pm
 SHA1 188d73fe871cc0afa65837c19eb2a6b43884a8f4 t/lib/App/Info/Request.pm
 SHA1 6eaa2bdb5bc68d1b68933f59dd21882b920a5df0 t/lib/App/Info/Util.pm
-SHA1 d45775f130012bbd89396031c860793b08155732 types.c
-SHA1 babbe8fc08df3f005aa90f67b8f47f911ca40c00 types.h
+SHA1 17a1ebe24d06bde24b26f09f084bb91180dbc1d6 types.c
+SHA1 144146d529684b716165811e687bea6a930c361c types.h
 SHA1 f07cd5ecaeb854c81ceb9206364979cf607e6546 win32.mak
 -----BEGIN PGP SIGNATURE-----
 
-iEYEAREDAAYFAklD6l4ACgkQvJuQZxSWSshDWwCfQXYcz7FCXjWRn+bnyQSz5IXr
-0XkAoIu2cKhYZr6dlHhEvW4GiZBm/Gof
-=vClT
+iEYEAREDAAYFAknOOOIACgkQvJuQZxSWSsg72QCeNXC6x/FxhIEJmWUz6E6Qb2Et
+z3oAoMmhquVhFwQRjAgVyri8WqkUKFCY
+=7flY
 -----END PGP SIGNATURE-----

Modified: DBD-Pg/trunk/lib/Bundle/DBD/Pg.pm
==============================================================================
--- DBD-Pg/trunk/lib/Bundle/DBD/Pg.pm	(original)
+++ DBD-Pg/trunk/lib/Bundle/DBD/Pg.pm	Tue Apr  7 13:24:17 2009
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-$VERSION = '2.11.8_1';
+$VERSION = '2.12.0';
 
 1;
 

Modified: DBD-Pg/trunk/t/02attribs.t
==============================================================================
--- DBD-Pg/trunk/t/02attribs.t	(original)
+++ DBD-Pg/trunk/t/02attribs.t	Tue Apr  7 13:24:17 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,7 +1579,7 @@
 
 			$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 {

Modified: DBD-Pg/trunk/t/03dbmethod.t
==============================================================================
--- DBD-Pg/trunk/t/03dbmethod.t	(original)
+++ DBD-Pg/trunk/t/03dbmethod.t	Tue Apr  7 13:24:17 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: DBD-Pg/trunk/t/09arrays.t
==============================================================================
--- DBD-Pg/trunk/t/09arrays.t	(original)
+++ DBD-Pg/trunk/t/09arrays.t	Tue Apr  7 13:24:17 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: DBD-Pg/trunk/t/99_perlcritic.t
==============================================================================
--- DBD-Pg/trunk/t/99_perlcritic.t	(original)
+++ DBD-Pg/trunk/t/99_perlcritic.t	Tue Apr  7 13:24:17 2009
@@ -61,7 +61,6 @@
 		next;
 	}
 	last if /= Compiling/;
-	print "Checking $_\n";
 	if (m{^([\w\./-]+) \- }) {
 		$devfile{$1} = $.;
 		next;

Modified: DBD-Pg/trunk/t/99_spellcheck.t
==============================================================================
--- DBD-Pg/trunk/t/99_spellcheck.t	(original)
+++ DBD-Pg/trunk/t/99_spellcheck.t	Tue Apr  7 13:24:17 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;
@@ -612,6 +612,7 @@
 ## Changes:
 boolean
 destringifying
+expr
 spellcheck
 gborg
 n's

Modified: DBD-Pg/trunk/t/dbdpg_test_setup.pl
==============================================================================
--- DBD-Pg/trunk/t/dbdpg_test_setup.pl	(original)
+++ DBD-Pg/trunk/t/dbdpg_test_setup.pl	Tue Apr  7 13:24:17 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'),
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.