Author: turnstep
Date: Wed Jul 9 17:20:12 2008
New Revision: 11512
Modified:
DBD-Pg/trunk/.perlcriticrc
DBD-Pg/trunk/t/00-signature.t
DBD-Pg/trunk/t/00basic.t
DBD-Pg/trunk/t/01connect.t
DBD-Pg/trunk/t/01constants.t
DBD-Pg/trunk/t/02attribs.t
DBD-Pg/trunk/t/03dbmethod.t
DBD-Pg/trunk/t/03smethod.t
DBD-Pg/trunk/t/04misc.t
DBD-Pg/trunk/t/06bytea.t
DBD-Pg/trunk/t/07copy.t
DBD-Pg/trunk/t/08async.t
DBD-Pg/trunk/t/09arrays.t
DBD-Pg/trunk/t/12placeholders.t
DBD-Pg/trunk/t/20savepoints.t
DBD-Pg/trunk/t/99_perlcritic.t
DBD-Pg/trunk/t/99_pod.t
DBD-Pg/trunk/t/99_spellcheck.t
DBD-Pg/trunk/t/99_yaml.t
DBD-Pg/trunk/t/99cleanup.t
DBD-Pg/trunk/t/dbdpg_test_setup.pl
Log:
More Perl::Critic inspired minor fixes. Thanks to gregor herrmann for the
report on RT 37567 for the inspiration.
Modified: DBD-Pg/trunk/.perlcriticrc
==============================================================================
--- DBD-Pg/trunk/.perlcriticrc (original)
+++ DBD-Pg/trunk/.perlcriticrc Wed Jul 9 17:20:12 2008
@@ -23,6 +23,7 @@
[-Documentation::RequirePODUseEncodingUTF8]
[-Editor::RequireEmacsFileVariables]
[-ErrorHandling::RequireCarping]
+[-ErrorHandling::RequireCheckingReturnValueOfEval]
[-InputOutput::ProhibitBacktickOperators]
[-InputOutput::ProhibitOneArgSelect]
[-InputOutput::RequireCheckedSyscalls]
Modified: DBD-Pg/trunk/t/00-signature.t
==============================================================================
--- DBD-Pg/trunk/t/00-signature.t (original)
+++ DBD-Pg/trunk/t/00-signature.t Wed Jul 9 17:20:12 2008
@@ -2,6 +2,7 @@
## Test that our SIGNATURE file is valid - requires TEST_SIGNATURE env
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/00basic.t
==============================================================================
--- DBD-Pg/trunk/t/00basic.t (original)
+++ DBD-Pg/trunk/t/00basic.t Wed Jul 9 17:20:12 2008
@@ -3,6 +3,7 @@
## Simply test that we can load the DBI and DBD::Pg modules,
## and that the latter gives a good version
+use 5.006;
use strict;
use warnings;
use Test::More tests => 3;
Modified: DBD-Pg/trunk/t/01connect.t
==============================================================================
--- DBD-Pg/trunk/t/01connect.t (original)
+++ DBD-Pg/trunk/t/01connect.t Wed Jul 9 17:20:12 2008
@@ -3,6 +3,7 @@
## Make sure we can connect and disconnect cleanly
## All tests are stopped if we cannot make the first connect
+use 5.006;
use strict;
use warnings;
use DBI;
Modified: DBD-Pg/trunk/t/01constants.t
==============================================================================
--- DBD-Pg/trunk/t/01constants.t (original)
+++ DBD-Pg/trunk/t/01constants.t Wed Jul 9 17:20:12 2008
@@ -1,5 +1,6 @@
#!perl
+use 5.006;
use strict;
## We cannot 'use warnings' here as PG_TSQUERY and others trip it up
## no critic (RequireUseWarnings)
Modified: DBD-Pg/trunk/t/02attribs.t
==============================================================================
--- DBD-Pg/trunk/t/02attribs.t (original)
+++ DBD-Pg/trunk/t/02attribs.t Wed Jul 9 17:20:12 2008
@@ -2,6 +2,7 @@
## Test all handle attributes: database, statement, and generic ("any")
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/03dbmethod.t
==============================================================================
--- DBD-Pg/trunk/t/03dbmethod.t (original)
+++ DBD-Pg/trunk/t/03dbmethod.t Wed Jul 9 17:20:12 2008
@@ -10,6 +10,7 @@
## "pg_savepoint", "pg_release", "pg_rollback_to" (see 20savepoints.t)
## "pg_putline", "pg_getline", "pg_endcopy" (see 07copy.t)
+use 5.006;
use strict;
use warnings;
use Data::Dumper;
@@ -1346,7 +1347,7 @@
$t='DB handle method "pg_notifies" returns the correct values';
$dbh->do("NOTIFY $notify_name");
$dbh->commit();
-$info = $dbh->pg_notifies;;
+$info = $dbh->pg_notifies;
is_deeply ($info, [$notify_name, $pid, ''], $t);
#
Modified: DBD-Pg/trunk/t/03smethod.t
==============================================================================
--- DBD-Pg/trunk/t/03smethod.t (original)
+++ DBD-Pg/trunk/t/03smethod.t Wed Jul 9 17:20:12 2008
@@ -6,6 +6,7 @@
## "finish"
## "dump_results"
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/04misc.t
==============================================================================
--- DBD-Pg/trunk/t/04misc.t (original)
+++ DBD-Pg/trunk/t/04misc.t Wed Jul 9 17:20:12 2008
@@ -2,6 +2,7 @@
## Various stuff that does not go elsewhere
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/06bytea.t
==============================================================================
--- DBD-Pg/trunk/t/06bytea.t (original)
+++ DBD-Pg/trunk/t/06bytea.t Wed Jul 9 17:20:12 2008
@@ -2,6 +2,7 @@
## Test bytea handling
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/07copy.t
==============================================================================
--- DBD-Pg/trunk/t/07copy.t (original)
+++ DBD-Pg/trunk/t/07copy.t Wed Jul 9 17:20:12 2008
@@ -2,6 +2,7 @@
## Test the COPY functionality
+use 5.006;
use strict;
use warnings;
use Data::Dumper;
@@ -336,7 +337,7 @@
$dbh->pg_getcopydata($newvar);
};
is ($@, q{}, $t);
-};
+}
#
# Make sure rollback and commit reset our internal copystate tracking
Modified: DBD-Pg/trunk/t/08async.t
==============================================================================
--- DBD-Pg/trunk/t/08async.t (original)
+++ DBD-Pg/trunk/t/08async.t Wed Jul 9 17:20:12 2008
@@ -2,6 +2,7 @@
## Test asynchronous queries
+use 5.006;
use strict;
use warnings;
use Test::More;
@@ -271,7 +272,7 @@
$sth->finish();
-}; ## end of pg_sleep skip
+} ## end of pg_sleep skip
$t=q{Method execute() works when prepare has PG_ASYNC flag};
Modified: DBD-Pg/trunk/t/09arrays.t
==============================================================================
--- DBD-Pg/trunk/t/09arrays.t (original)
+++ DBD-Pg/trunk/t/09arrays.t Wed Jul 9 17:20:12 2008
@@ -2,6 +2,7 @@
## Test arrays
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/12placeholders.t
==============================================================================
--- DBD-Pg/trunk/t/12placeholders.t (original)
+++ DBD-Pg/trunk/t/12placeholders.t Wed Jul 9 17:20:12 2008
@@ -2,6 +2,7 @@
## Test of placeholders
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/20savepoints.t
==============================================================================
--- DBD-Pg/trunk/t/20savepoints.t (original)
+++ DBD-Pg/trunk/t/20savepoints.t Wed Jul 9 17:20:12 2008
@@ -2,6 +2,7 @@
## Test savepoint functionality
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/99_perlcritic.t
==============================================================================
--- DBD-Pg/trunk/t/99_perlcritic.t (original)
+++ DBD-Pg/trunk/t/99_perlcritic.t Wed Jul 9 17:20:12 2008
@@ -4,6 +4,7 @@
## This is highly customized, so take with a grain of salt
## Requires TEST_CRITIC to be set
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/99_pod.t
==============================================================================
--- DBD-Pg/trunk/t/99_pod.t (original)
+++ DBD-Pg/trunk/t/99_pod.t Wed Jul 9 17:20:12 2008
@@ -3,6 +3,7 @@
## Check our Pod, requires Test::Pod
## Also done if available: Test::Pod::Coverage
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/99_spellcheck.t
==============================================================================
--- DBD-Pg/trunk/t/99_spellcheck.t (original)
+++ DBD-Pg/trunk/t/99_spellcheck.t Wed Jul 9 17:20:12 2008
@@ -3,6 +3,7 @@
## Spellcheck as much as we can
## Requires TEST_SPELL to be set
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/99_yaml.t
==============================================================================
--- DBD-Pg/trunk/t/99_yaml.t (original)
+++ DBD-Pg/trunk/t/99_yaml.t Wed Jul 9 17:20:12 2008
@@ -2,6 +2,7 @@
## Test META.yml for YAMLiciousness, requires Test::YAML::Meta
+use 5.006;
use strict;
use warnings;
use Test::More;
Modified: DBD-Pg/trunk/t/99cleanup.t
==============================================================================
--- DBD-Pg/trunk/t/99cleanup.t (original)
+++ DBD-Pg/trunk/t/99cleanup.t Wed Jul 9 17:20:12 2008
@@ -3,6 +3,7 @@
## Cleanup all database objects we may have created
## Shutdown the test database if we created one
+use 5.006;
use strict;
use warnings;
use Test::More tests => 1;
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 Wed Jul 9 17:20:12 2008
@@ -6,6 +6,7 @@
use Data::Dumper;
use DBI;
use Cwd;
+use 5.006;
select(($|=1,select(STDERR),$|=1)[1]);
my @schemas =
@@ -85,13 +86,12 @@
$testdsn =~ s/$alias\s*=(\w+)/'db="'.lc $2.'"'/e;
}
- eval {
+ goto GOTDBH if eval {
$dbh = DBI->connect($testdsn, $testuser, '',
{RaiseError =>
1, PrintError => 0, AutoCommit => 1});
+ 1;
};
- goto GOTDBH unless $@;
-
if ($@ =~ /invalid connection option/) {
return $helpconnect, $@, undef;
}
