Logic to read delimiter

Author: syed

framework/db/src/com/cloud/utils/db/ScriptRunner.java

@@ -20,6 +20,8 @@
  */
 package com.cloud.utils.db;
 
+import org.apache.log4j.Logger;
+
 import java.io.IOException;
 import java.io.LineNumberReader;
 import java.io.Reader;
@@ -29,15 +31,14 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import org.apache.log4j.Logger;
-
 /**
  * Tool to run database scripts
  */
 public class ScriptRunner {
     private static Logger s_logger = Logger.getLogger(ScriptRunner.class);
 
     private static final String DEFAULT_DELIMITER = ";";
+    private static final String CHANGE_DELIMITER_STMT = "DELIMITER ";
 
     private Connection connection;
 
@@ -128,6 +129,12 @@ private void runScript(Connection conn, Reader reader) throws IOException, SQLEx
                     // Do nothing
                 } else if (trimmedLine.length() < 1 || trimmedLine.startsWith("#")) {
                     // Do nothing
+                } else if (trimmedLine.startsWith(CHANGE_DELIMITER_STMT)) {
+                    String[] res = trimmedLine.split(CHANGE_DELIMITER_STMT, 2);
+                    if (res.length == 2) {
+                        String newDelimiter = res[1];
+                        setDelimiter(newDelimiter, fullLineDelimiter);
+                    }
                 } else if (!fullLineDelimiter && trimmedLine.endsWith(getDelimiter()) || fullLineDelimiter && trimmedLine.equals(getDelimiter())) {
                     command.append(line.substring(0, line.lastIndexOf(getDelimiter())));
                     command.append(" ");

setup/db/db/schema-41000to41100.sql

@@ -134,13 +134,11 @@ CREATE PROCEDURE `cloud`.`ADD_COLUMN_TO_TABLE_IDEMPOTENT`(
                         IN comment VARCHAR(255))
 BEGIN
         SET @t1=CONCAT('SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA="cloud" AND TABLE_NAME="', tableName,  '" AND COLUMN_NAME="', colName, '" into @outvar');
-        SELECT @t1;
         PREPARE stmt1 FROM @t1;
         EXECUTE stmt1;
         DEALLOCATE PREPARE stmt1;
         IF (@outvar < 1) THEN
             SET @t2=CONCAT('ALTER TABLE `cloud`.`', tableName, '` ADD COLUMN `', colName, '` ', colType, ' DEFAULT NULL COMMENT "', comment , '"');
-            SELECT @t2;
             PREPARE stmt2 FROM @t2;
             EXECUTE stmt2;
             DEALLOCATE PREPARE stmt2;