Updated IDEMPOTENT_ADD_FOREIGN_KEY procedure and fixed some foreign keys to keep proper names

Author: harikrishna-patnala

engine/schema/src/main/java/com/cloud/upgrade/dao/DatabaseAccessObject.java

@@ -26,6 +26,17 @@ public class DatabaseAccessObject {
 
     private static Logger s_logger = Logger.getLogger(DatabaseAccessObject.class);
 
+    public void addForeignKey(Connection conn, String tableName, String tableColumn, String foreignTableName, String foreignColumnName) {
+        String addForeignKeyStmt = String.format("CALL `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY`('%s', '%s', '%s', '%s')", tableName, tableColumn, foreignTableName, foreignColumnName);
+        try(PreparedStatement pstmt = conn.prepareStatement(addForeignKeyStmt);)
+        {
+            pstmt.executeUpdate();
+            s_logger.debug(String.format("Foreign key is added successfully from the table %s", tableName));
+        } catch (SQLException e) {
+            s_logger.error("Ignored SQL Exception when trying to add foreign key on table "  + tableName + " exception: " + e.getMessage());
+        }
+    }
+
     public void dropKey(Connection conn, String tableName, String key, boolean isForeignKey)
     {
         String alter_sql_str;

engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgradeUtils.java

@@ -23,7 +23,10 @@ public class DbUpgradeUtils {
 
     private static DatabaseAccessObject dao = new DatabaseAccessObject();
 
-    public static void dropKeysIfExist(Connection conn, String tableName, List<String> keys, boolean isForeignKey) {
+    public static void addForeignKey(Connection conn, String tableName, String tableColumn, String foreignTableName, String foreignColumnName) {
+        dao.addForeignKey(conn, tableName, tableColumn, foreignTableName, foreignColumnName);
+    }
+   public static void dropKeysIfExist(Connection conn, String tableName, List<String> keys, boolean isForeignKey) {
         for (String key : keys) {
             dao.dropKey(conn, tableName, key, isForeignKey);
         }

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41810to41900.java

@@ -22,8 +22,6 @@
 
 import java.io.InputStream;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -59,7 +57,7 @@ public InputStream[] getPrepareScripts() {
 
     @Override
     public void performDataMigration(Connection conn) {
-        fixIndexes(conn);
+        fixForeignKeyNames(conn);
     }
 
     @Override
@@ -88,47 +86,29 @@ public void updateSystemVmTemplates(Connection conn) {
         }
     }
 
-    private void fixIndexes(Connection conn) {
+    private void fixForeignKeyNames(Connection conn) {
         //Alter foreign key name for user_vm table from fk_user_data_id to fk_user_vm__user_data_id (if exists) and re-add it again
         List<String> keys = new ArrayList<String>();
         keys.add("fk_user_data_id");
+        keys.add("fk_user_vm_user_data_id");
         DbUpgradeUtils.dropKeysIfExist(conn, "cloud.user_vm", keys, true);
         DbUpgradeUtils.dropKeysIfExist(conn, "cloud.user_vm", keys, false);
-        try {
-            PreparedStatement pstmt = conn.prepareStatement(
-                    "CALL `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY`('cloud.user_vm', 'user_data', 'id');");
-            pstmt.execute();
-            pstmt.close();
-        } catch (SQLException e) {
-            LOG.error("Unable to update foreign key in user_vm table ", e);
-        }
+        DbUpgradeUtils.addForeignKey(conn, "user_vm", "user_data_id", "user_data", "id");
 
         //Alter foreign key name for vm_template table from fk_user_data_id to fk_vm_template__user_data_id (if exists) and re-add it again
         keys = new ArrayList<>();
         keys.add("fk_user_data_id");
+        keys.add("fk_vm_template_user_data_id");
         DbUpgradeUtils.dropKeysIfExist(conn, "cloud.vm_template", keys, true);
         DbUpgradeUtils.dropKeysIfExist(conn, "cloud.vm_template", keys, false);
-        try {
-            PreparedStatement pstmt = conn.prepareStatement(
-                    "CALL `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY`('cloud.vm_template', 'user_data', 'id');");
-            pstmt.execute();
-            pstmt.close();
-        } catch (SQLException e) {
-            LOG.error("Unable to update foreign key in user_vm table ", e);
-        }
+        DbUpgradeUtils.addForeignKey(conn, "vm_template", "user_data_id", "user_data", "id");
 
         //Alter foreign key name for volumes table from fk_passphrase_id to fk_volumes__passphrase_id (if exists) and re-add it again
         keys = new ArrayList<>();
         keys.add("fk_passphrase_id");
+        keys.add("fk_volumes_passphrase_id");
         DbUpgradeUtils.dropKeysIfExist(conn, "cloud.volumes", keys, true);
         DbUpgradeUtils.dropKeysIfExist(conn, "cloud.volumes", keys, false);
-        try {
-            PreparedStatement pstmt = conn.prepareStatement(
-                    "CALL `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY`('cloud.volumes', 'passphrase', 'id');");
-            pstmt.execute();
-            pstmt.close();
-        } catch (SQLException e) {
-            LOG.error("Unable to update foreign key in volumes table ", e);
-        }
+        DbUpgradeUtils.addForeignKey(conn, "volumes", "passphrase_id","passphrase", "id");
     }
 }

engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql

@@ -22,9 +22,9 @@
 DROP PROCEDURE IF EXISTS `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY`;
 CREATE PROCEDURE `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY` (
     IN in_table_name VARCHAR(200),
+    IN in_table_column VARCHAR(200),
     IN in_foreign_table_name VARCHAR(200),
     IN in_foreign_column_name VARCHAR(200)
 )
 BEGIN
-    DECLARE CONTINUE HANDLER FOR 1005,1826 BEGIN END; SET @ddl = CONCAT('ALTER TABLE ', in_table_name); SET @ddl = CONCAT(@ddl, ' ', ' ADD CONSTRAINT '); SET @ddl = CONCAT(@ddl, 'fk_', in_table_name, '__', in_foreign_table_name, '_', in_foreign_column_name); SET @ddl = CONCAT(@ddl, ' FOREIGN KEY (', in_foreign_table_name, '_', in_foreign_column_name, ')'); SET @ddl = CONCAT(@ddl, ' REFERENCES ', in_foreign_table_name, '(', in_foreign_column_name, ')'); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; END;
-
+    DECLARE CONTINUE HANDLER FOR 1005,1826 BEGIN END; SET @ddl = CONCAT('ALTER TABLE cloud.', in_table_name); SET @ddl = CONCAT(@ddl, ' ', ' ADD CONSTRAINT '); SET @ddl = CONCAT(@ddl, 'fk_', in_table_name, '__', in_foreign_table_name, '_', in_foreign_column_name); SET @ddl = CONCAT(@ddl, ' FOREIGN KEY (', in_table_column, ')'); SET @ddl = CONCAT(@ddl, ' REFERENCES ', in_foreign_table_name, '(', in_foreign_column_name, ')'); PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; END;