[Hyperic-hq-discuss] hq r3975 - trunk/src/org/hyperic/tools/ant/dbupgrade

[<cl...@hy...>]

Author: clee
Date: 2007-03-30 15:44:36 -0800 (Fri, 30 Mar 2007)
New Revision: 3975
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3975

Modified:
   trunk/src/org/hyperic/tools/ant/dbupgrade/SST_DirectSQL.java
Log:
Add flag to allow statements to fail without throwing exception

Modified: trunk/src/org/hyperic/tools/ant/dbupgrade/SST_DirectSQL.java
===================================================================
--- trunk/src/org/hyperic/tools/ant/dbupgrade/SST_DirectSQL.java	2007-03-30 23:38:21 UTC (rev 3974)
+++ trunk/src/org/hyperic/tools/ant/dbupgrade/SST_DirectSQL.java	2007-03-30 23:44:36 UTC (rev 3975)
@@ -40,7 +40,6 @@
 public class SST_DirectSQL extends SchemaSpecTask {
 
     private VerifySchema verifySchema;
-    private Statement statement;
     private List statements;
 
     public SST_DirectSQL () {
@@ -95,15 +94,29 @@
         private Connection conn = null;
         private String desc = null;
         private String targetDB = null;
+        private boolean fail = true;
 
         public Statement () {}
 
         public void init (Connection conn) {
             this.conn = conn;
         }
-        public void setDesc (String s) { desc=s; }
-        public String getDesc () { return desc; }
+        public void setDesc(String s) {
+            desc = s;
+        }
 
+        public String getDesc() {
+            return desc;
+        }
+
+        public boolean isFail() {
+            return fail;
+        }
+
+        public void setFail(boolean fail) {
+            this.fail = fail;
+        }
+
         public void setTargetDB (String t) { targetDB = t; }
 
         public void addText(String msg) {
@@ -153,8 +166,9 @@
                 try {
                     ps.execute();
                 } catch (SQLException e) {
-                    if (sqlStmt.trim().toLowerCase().startsWith("drop")) {
-                        log(">>>>> Drop failed: " + e);
+                    if (!isFail() ||
+                        sqlStmt.trim().toLowerCase().startsWith("drop")) {
+                        log(">>>>> SQL failed: " + e);
                         conn.rollback();
                         conn.commit();
                     } else {