You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/02/20 11:22:26 UTC
[3/6] git commit: refs/heads/4.1 - db: Fix commas which should be
dots in create-schema, fix debug msg
db: Fix commas which should be dots in create-schema, fix debug msg
Signed-off-by: Rohit Yadav <bh...@apache.org>
(cherry picked from commit 44c8a33cf2c944715a08efc41db955b1fe095bf1)
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7ce22fc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7ce22fc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7ce22fc2
Branch: refs/heads/4.1
Commit: 7ce22fc2b2d304565f74c8fc7730742e0f3b0eba
Parents: d427e1a
Author: Rohit Yadav <bh...@apache.org>
Authored: Sat Feb 16 12:47:45 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Wed Feb 20 14:57:05 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/upgrade/dao/Upgrade40to41.java | 2 +-
setup/db/create-schema.sql | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7ce22fc2/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
index 2ebe980..e7fea23 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
@@ -70,7 +70,7 @@ public class Upgrade40to41 implements DbUpgrade {
public File[] getCleanupScripts() {
String script = Script.findScript("", "db/schema-40to410-cleanup.sql");
if (script == null) {
- throw new CloudRuntimeException("Unable to find db/schema-302to40-cleanup.sql");
+ throw new CloudRuntimeException("Unable to find db/schema-40to410-cleanup.sql");
}
return new File[] { new File(script) };
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7ce22fc2/setup/db/create-schema.sql
----------------------------------------------------------------------
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index f89c885..03428b1 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -145,12 +145,12 @@ DROP TABLE IF EXISTS `cloud`.`region`;
DROP TABLE IF EXISTS `cloud`.`s2s_customer_gateway`;
DROP TABLE IF EXISTS `cloud`.`s2s_vpn_gateway`;
DROP TABLE IF EXISTS `cloud`.`s2s_vpn_connection`;
-DROP TABLE IF EXISTS `cloud`,`external_nicira_nvp_devices`;
-DROP TABLE IF EXISTS `cloud`,`nicira_nvp_nic_map`;
-DROP TABLE IF EXISTS `cloud`,`s3`;
-DROP TABLE IF EXISTS `cloud`,`template_s3_ref`;
-DROP TABLE IF EXISTS `cloud`,`nicira_nvp_router_map`;
-DROP TABLE IF EXISTS `cloud`,`external_bigswitch_vns_devices`;
+DROP TABLE IF EXISTS `cloud`.`external_nicira_nvp_devices`;
+DROP TABLE IF EXISTS `cloud`.`nicira_nvp_nic_map`;
+DROP TABLE IF EXISTS `cloud`.`s3`;
+DROP TABLE IF EXISTS `cloud`.`template_s3_ref`;
+DROP TABLE IF EXISTS `cloud`.`nicira_nvp_router_map`;
+DROP TABLE IF EXISTS `cloud`.`external_bigswitch_vns_devices`;
DROP TABLE IF EXISTS `cloud`.`autoscale_vmgroup_policy_map`;
DROP TABLE IF EXISTS `cloud`.`autoscale_policy_condition_map`;
DROP TABLE IF EXISTS `cloud`.`autoscale_vmgroups`;