[svn:dbi] r14909 - in dbi/trunk: . lib/DBI/DBD

Author: mjevans
Date: Thu Jul 14 00:24:11 2011
New Revision: 14909

Modified:
   dbi/trunk/Changes
   dbi/trunk/lib/DBI/DBD/SqlEngine.pm

Log:
Revert r14891 as it does not work and seems to cause test failures although
there still remains a problem which hopefully sno is sorting.


Modified: dbi/trunk/Changes
==============================================================================
--- dbi/trunk/Changes	(original)
+++ dbi/trunk/Changes	Thu Jul 14 00:24:11 2011
@@ -13,8 +13,6 @@
   Fixed the definition of ArrayTupleStatus and remove confusion over
     rows affected in list context of execute_array (Martin J. Evans)
   Fixed sql_type_cast example and typo in errors (Martin J. Evans)
-  Fixed parameter-count check for complicated statements using
-    DBI::DBD::SqlEngine + SQL::Statement::Param (H.Merijn Brand)
 
   Enhanced and standardized driver trace level mechanism (Tim Bunce)
   Removed old code that was an inneffective attempt to detect

Modified: dbi/trunk/lib/DBI/DBD/SqlEngine.pm
==============================================================================
--- dbi/trunk/lib/DBI/DBD/SqlEngine.pm	(original)
+++ dbi/trunk/lib/DBI/DBD/SqlEngine.pm	Thu Jul 14 00:24:11 2011
@@ -781,9 +781,7 @@
     {
         # bug in SQL::Statement 1.20 and below causes breakage
         # on all but the first call
-        my @req_prm = $stmt->params();
-        my $n_req = @req_prm == 1 && ref $req_prm[0] ? $req_prm[0]->num : scalar @req_prm;
-        unless ( $n_req == ( my $nparm = @$params ) )
+        unless ( ( my $req_prm = $stmt->params() ) == ( my $nparm = @$params ) )
         {
             my $msg = "You passed $nparm parameters where $req_prm required";
             $sth->set_err( $DBI::stderr, $msg );