db: Fix developer's deploydb and cloud-setup-databases for rolling update

yadvr · yadvr · commit 16e81130cca7 · 2013-02-16T17:18:42.000+05:30
- Fix developer prefill to use 4.0's schema
- Fix developer/pom.xml and cloud-setup-databases to not run create-schema-view,
  the upgrade path is configured to do a rolling update and set it up

Signed-off-by: Rohit Yadav &lt;bhaisaab@apache.org&gt;
diff --git a/developer/developer-prefill.sql b/developer/developer-prefill.sql
@@ -18,25 +18,25 @@
 -- Add a default ROOT domain
 use cloud;
 
-INSERT INTO `cloud`.`domain` (id, uuid, name, parent, path, owner, region_id) VALUES
-            (1, UUID(), 'ROOT', NULL, '/', 2, 1);
+INSERT INTO `cloud`.`domain` (id, uuid, name, parent, path, owner) VALUES
+            (1, UUID(), 'ROOT', NULL, '/', 2);
 
 -- Add system and admin accounts
-INSERT INTO `cloud`.`account` (id, uuid, account_name, type, domain_id, state, region_id) VALUES
-            (1, UUID(), 'system', 1, 1, 'enabled', 1);
+INSERT INTO `cloud`.`account` (id, uuid, account_name, type, domain_id, state) VALUES
+            (1, UUID(), 'system', 1, 1, 'enabled');
 
-INSERT INTO `cloud`.`account` (id, uuid, account_name, type, domain_id, state, region_id) VALUES
-            (2, UUID(), 'admin', 1, 1, 'enabled', 1);
+INSERT INTO `cloud`.`account` (id, uuid, account_name, type, domain_id, state) VALUES
+            (2, UUID(), 'admin', 1, 1, 'enabled');
 
 -- Add system user
 INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname,
-            lastname, email, state, created, region_id) VALUES (1, UUID(), 'system', RAND(),
-            '1', 'system', 'cloud', NULL, 'enabled', NOW(), 1);
+            lastname, email, state, created) VALUES (1, UUID(), 'system', RAND(),
+            '1', 'system', 'cloud', NULL, 'enabled', NOW());
 
 -- Add system user with encrypted password=password
 INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname,
-            lastname, email, state, created, region_id) VALUES (2, UUID(), 'admin', '5f4dcc3b5aa765d61d8327deb882cf99',
-            '2', 'Admin', 'User', 'admin@mailprovider.com', 'enabled', NOW(), 1);
+            lastname, email, state, created) VALUES (2, UUID(), 'admin', '5f4dcc3b5aa765d61d8327deb882cf99',
+            '2', 'Admin', 'User', 'admin@mailprovider.com', 'enabled', NOW());
 
 -- Add configurations
 INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
diff --git a/developer/pom.xml b/developer/pom.xml
@@ -157,8 +157,6 @@
                 <!-- Create default schema and db table views -->
                 <argument>${basedir}/target/db/create-schema.sql</argument>
                 <argument>${basedir}/target/db/create-schema-premium.sql</argument>
-                <!-- Create schema view -->
-                <argument>${basedir}/target/db/create-schema-view.sql</argument>
                 <!-- Seed templates -->
                 <argument>${basedir}/target/db/templates.sql</argument>
                 <!-- Run cloudbridge related sqls -->
diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
@@ -211,7 +211,7 @@ for full help
                     ""),
             )
 
-        for f in ["create-database","create-schema", "create-database-premium","create-schema-premium", "create-schema-view"]:
+        for f in ["create-database","create-schema", "create-database-premium","create-schema-premium"]:
             p = os.path.join(self.dbFilesPath,"%s.sql"%f)
             if not os.path.exists(p): continue
             text = file(p).read()
@@ -358,7 +358,7 @@ for example:
                 if not os.path.exists(dbf):
                     self.errorAndExit("Cannot find %s"%dbf)
 
-            coreSchemas = ['create-database.sql', 'create-schema.sql', 'create-schema-view.sql', 'templates.sql']
+            coreSchemas = ['create-database.sql', 'create-schema.sql', 'templates.sql']
             if not self.serversetup:
                 coreSchemas.append('server-setup.sql')
 
