[svn:dbi] r9140 - in dbi/trunk: . lib/DBI t

[timbo]

Author: timbo
Date: Mon Feb 19 09:22:27 2007
New Revision: 9140

Modified:
   dbi/trunk/Changes
   dbi/trunk/lib/DBI/DBD.pm
   dbi/trunk/t/85gofer.t

Log:
Limit the insanity (to managable levels) when using DBI_AUTOPROXy with gofer.


Modified: dbi/trunk/Changes
==============================================================================
--- dbi/trunk/Changes   (original)
+++ dbi/trunk/Changes   Mon Feb 19 09:22:27 2007
@@ -12,7 +12,7 @@
 Document user/passwd issues at the various levels of the stack
 
 
-=head2 Changes in DBI 1.54 (svn rev 9138),  19th February 2007
+=head2 Changes in DBI 1.54 (svn rev 9140),  19th February 2007
 
   NOTE: This release includes the 'next big thing' for DBI: DBD::Gofer.
   Take a look!

Modified: dbi/trunk/lib/DBI/DBD.pm
==============================================================================
--- dbi/trunk/lib/DBI/DBD.pm    (original)
+++ dbi/trunk/lib/DBI/DBD.pm    Mon Feb 19 09:22:27 2007
@@ -3014,7 +3014,7 @@
                        add => [ '$ENV{DBI_PUREPERL} = 2' ],
            },
            g => {      name => "DBD::Gofer",
-                       add => [ q{$ENV{DBI_AUTOPROXY} = 
'dbi:Gofer:transport=null'} ],
+                       add => [ q{$ENV{DBI_AUTOPROXY} = 
'dbi:Gofer:transport=null;policy=pedantic'} ],
            },
            xgp => {    name => "PurePerl & Gofer",
                        add => [ q{$ENV{DBI_PUREPERL} = 2; $ENV{DBI_AUTOPROXY} 
= 'dbi:Gofer:transport=null'} ],

Modified: dbi/trunk/t/85gofer.t
==============================================================================
--- dbi/trunk/t/85gofer.t       (original)
+++ dbi/trunk/t/85gofer.t       Mon Feb 19 09:22:27 2007
@@ -8,10 +8,18 @@
 use Cwd;
 use Time::HiRes qw(time);
 use Data::Dumper;
-use Test::More 'no_plan';
+use Test::More;
 
 use DBI;
 
+if (my $ap = $ENV{DBI_AUTOPROXY}) { # limit the insanity
+    plan skip_all => "transport+policy tests skipped with non-gofer 
DBI_AUTOPROXY"
+        if $ap !~ /^dbi:Gofer/i;
+    plan skip_all => "transport+policy tests skipped with non-pedantic policy 
in DBI_AUTOPROXY"
+        if $ap !~ /policy=pedantic\b/i;
+}
+plan 'no_plan';
+
 # 0=SQL::Statement if avail, 1=DBI::SQL::Nano
 # next line forces use of Nano rather than default behaviour
 $ENV{DBI_SQL_NANO}=1;