From 02b3a7d13cb035c6ca16454c5c356a528598576e Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 10 Jul 2008 14:06:44 +0000
Subject: [PATCH] sql's onerror='stop' shouldn't make the task fail.  PR 24668.
  Based on a patch by Dante Briones.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@675579 13f79535-47bb-0310-9956-ffa450edef68
---
 CONTRIBUTORS                                        |  1 +
 WHATSNEW                                            |  5 +++++
 contributors.xml                                    |  4 ++++
 docs/manual/CoreTasks/sql.html                      |  2 +-
 src/main/org/apache/tools/ant/taskdefs/SQLExec.java | 12 +++++++++---
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9ca02b14a..c760814ca 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -52,6 +52,7 @@ Dan Armbrust
 Daniel Ribagnac
 Daniel Spilker
 Danno Ferrin
+Dante Briones
 Davanum Srinivas
 Dave Brondsema
 Dave Brosius
diff --git a/WHATSNEW b/WHATSNEW
index e36978588..38177f62e 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -44,6 +44,11 @@ Changes that could break older environments:
   simultaniously (while within <parallel>, for example).  This lock is
   no longer in place, messageLogged should be made thread-safe now.
 
+ * <sql>'s onError="stop" no longer fails the build if an error
+   occurs,  this is the main difference between stop and error and
+   matches what the documentation implied.
+   Bugzilla Report 24668.
+
 Fixed bugs:
 -----------
 
diff --git a/contributors.xml b/contributors.xml
index 7459e64b2..294765863 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -231,6 +231,10 @@
     <first>Danno</first>
     <last>Ferrin</last>
   </name>
+  <name>
+    <first>Dante</first>
+    <last>Briones</last>
+  </name>
   <name>
     <first>Davanum</first>
     <last>Srinivas</last>
diff --git a/docs/manual/CoreTasks/sql.html b/docs/manual/CoreTasks/sql.html
index f70c426e3..b348c63c8 100644
--- a/docs/manual/CoreTasks/sql.html
+++ b/docs/manual/CoreTasks/sql.html
@@ -40,7 +40,7 @@ statements will all be executed as one transaction.</p>
 <p>The <i>onerror</i> attribute specifies how to proceed when an error occurs 
 during the execution of one of the statements. 
 The possible values are: <b>continue</b> execution, only show the error;
-<b>stop</b> execution and commit transaction;
+<b>stop</b> execution, log the error but don't fail the task
 and <b>abort</b> execution and transaction and fail task.</p>
 
 <p>
diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index 4a0ac32e0..708fbe34f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -466,10 +466,14 @@ public class SQLExec extends JDBCTask {
                 }
             } catch (IOException e) {
                 closeQuietly();
-                throw new BuildException(e, getLocation());
+                if (onError.equals("abort")) {
+                    throw new BuildException(e, getLocation());
+                }
             } catch (SQLException e) {
                 closeQuietly();
-                throw new BuildException(e, getLocation());
+                if (onError.equals("abort")) {
+                    throw new BuildException(e, getLocation());
+                }
             } finally {
                 try {
                     if (statement != null) {
@@ -603,10 +607,12 @@ public class SQLExec extends JDBCTask {
             goodSql++;
         } catch (SQLException e) {
             log("Failed to execute: " + sql, Project.MSG_ERR);
+            if (!onError.equals("abort")) {
+                log(e.toString(), Project.MSG_ERR);
+            }
             if (!onError.equals("continue")) {
                 throw e;
             }
-            log(e.toString(), Project.MSG_ERR);
         } finally {
             if (resultSet != null) {
                 try {