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

[timbo]

Author: timbo
Date: Mon Oct 11 13:06:08 2010
New Revision: 14477

Modified:
   dbi/trunk/   (props changed)
   dbi/trunk/Changes
   dbi/trunk/lib/DBI/DBD/SqlEngine.pm

Log:
svn merge https://svn.perl.org/modules/dbi/branches/sqlengine/
--- Merging r14439 through r14476 into '.':
U    DBI.xs
U    lib/DBI/DBD/SqlEngine.pm
C    Changes
U    DBI.pm


Modified: dbi/trunk/Changes
==============================================================================
--- dbi/trunk/Changes   (original)
+++ dbi/trunk/Changes   Mon Oct 11 13:06:08 2010
@@ -9,6 +9,8 @@
 =head2 Changes in DBI 1.616 (svn rNNN) XXX
 
   Optimized connect() to remove redundant FETCH of \%attrib values.
+  Adding fix to recognize SQL::Statement errors even if instantiated
+    with RaiseError=0 (Jens Rehsack)
 
 =head2 Changes in DBI 1.615 (svn r14438) 21st September 2010
 

Modified: dbi/trunk/lib/DBI/DBD/SqlEngine.pm
==============================================================================
--- dbi/trunk/lib/DBI/DBD/SqlEngine.pm  (original)
+++ dbi/trunk/lib/DBI/DBD/SqlEngine.pm  Mon Oct 11 13:06:08 2010
@@ -33,7 +33,7 @@
 use Carp;
 use vars qw( @ISA $VERSION $drh %methods_installed);
 
-$VERSION = "0.02";
+$VERSION = "0.03";
 
 $drh = undef;    # holds driver handle(s) once initialized
 
@@ -273,9 +273,9 @@
         {
             $stmt = eval { $class->new($statement) };
         }
-        if ($@)
+        if ($@ || $stmt->{errstr})
         {
-            $dbh->set_err( $DBI::stderr, $@ );
+            $dbh->set_err( $DBI::stderr, $@ || $stmt->{errstr} );
             undef $sth;
         }
         else