bug 11667: drop primary keys in cloud_usage.usage_load_balancer_policy and cloud_usage.usage_port_forwarding

alena11081 · alena11081 · commit eba686496562 · 2011-10-07T11:02:14.000-07:00
status 11667: resolved fixed

Conflicts:

	server/src/com/cloud/user/AccountManagerImpl.java
diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -390,7 +390,7 @@ public List<ResourceLimitVO> searchForLimits(Long id, Long accountId, Long domai
        
        if (domainId != null) {
            sc.setParameters("domainId", domainId);
-           sc.setParameters("accountId", null);
+           sc.setParameters("accountId", (Object[])null);
        }
        
        if (resourceType != null) {
diff --git a/server/src/com/cloud/upgrade/dao/DbUpgradeUtils.java b/server/src/com/cloud/upgrade/dao/DbUpgradeUtils.java
@@ -39,6 +39,25 @@ public static void dropKeysIfExist(Connection conn, String tableName, List<Strin
     }
     
     
+    public static void dropPrimaryKeyIfExists(Connection conn, String tableName) {
+        PreparedStatement pstmt = null;
+        try {
+            pstmt = conn.prepareStatement("ALTER TABLE " + tableName + " DROP PRIMARY KEY ");
+            pstmt.executeUpdate();
+            s_logger.debug("Primary key is dropped successfully from the table " + tableName);
+        } catch (SQLException e) {
+            // do nothing here
+        } finally {
+            try {
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+    
+    
     public static void dropTableColumnsIfExist(Connection conn, String tableName, List<String> columns) {
         PreparedStatement pstmt = null;
         try {
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java b/server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java
@@ -89,5 +89,8 @@ private void fixForeignKeys(Connection conn) {
         }
         
         
+        // drop primary keys
+        DbUpgradeUtils.dropPrimaryKeyIfExists(conn, "cloud_usage.usage_load_balancer_policy");
+        DbUpgradeUtils.dropPrimaryKeyIfExists(conn, "cloud_usage.usage_port_forwarding");
     }
 }
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -244,7 +244,6 @@ public boolean stop() {
         return true;
     }
 
-
     public AccountVO getSystemAccount() {
         if (_systemAccount == null) {
             _systemAccount = _accountDao.findById(Account.ACCOUNT_ID_SYSTEM);
diff --git a/setup/db/create-schema-premium.sql b/setup/db/create-schema-premium.sql
@@ -178,8 +178,7 @@ CREATE TABLE  `cloud_usage`.`usage_load_balancer_policy` (
   `account_id` bigint unsigned NOT NULL,
   `domain_id` bigint unsigned NOT NULL,
   `created` DATETIME NOT NULL,
-  `deleted` DATETIME NULL,
-  PRIMARY KEY  (`id`)
+  `deleted` DATETIME NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 ALTER TABLE `cloud_usage`.`usage_load_balancer_policy` ADD INDEX `i_usage_load_balancer_policy__account_id`(`account_id`);
@@ -210,8 +209,7 @@ CREATE TABLE  `cloud_usage`.`usage_port_forwarding` (
   `account_id` bigint unsigned NOT NULL,
   `domain_id` bigint unsigned NOT NULL,
   `created` DATETIME NOT NULL,
-  `deleted` DATETIME NULL,
-  PRIMARY KEY  (`id`)
+  `deleted` DATETIME NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 ALTER TABLE `cloud_usage`.`usage_port_forwarding` ADD INDEX `i_usage_port_forwarding__account_id`(`account_id`);

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ public List<ResourceLimitVO> searchForLimits(Long id, Long accountId, Long domai`
`390`	`390`
`391`	`391`	`if (domainId != null) {`
`392`	`392`	`sc.setParameters("domainId", domainId);`
`393`		`- sc.setParameters("accountId", null);`
	`393`	`+ sc.setParameters("accountId", (Object[])null);`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`if (resourceType != null) {`
Original file line number	Diff line number	Diff line change
`@@ -89,5 +89,8 @@ private void fixForeignKeys(Connection conn) {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`
	`92`	`+ // drop primary keys`
	`93`	`+ DbUpgradeUtils.dropPrimaryKeyIfExists(conn, "cloud_usage.usage_load_balancer_policy");`
	`94`	`+ DbUpgradeUtils.dropPrimaryKeyIfExists(conn, "cloud_usage.usage_port_forwarding");`
`92`	`95`	`}`
`93`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,6 @@ public boolean stop() {`
`244`	`244`	`return true;`
`245`	`245`	`}`
`246`	`246`
`247`		`-`
`248`	`247`	`public AccountVO getSystemAccount() {`
`249`	`248`	`if (_systemAccount == null) {`
`250`	`249`	`_systemAccount = _accountDao.findById(Account.ACCOUNT_ID_SYSTEM);`