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/25 10:19:27 UTC
git commit: refs/heads/4.1 - db: Sync with master,
remove rules that are for 4.2
Updated Branches:
refs/heads/4.1 d5a474a91 -> b9d876c5c
db: Sync with master, remove rules that are for 4.2
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/b9d876c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b9d876c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b9d876c5
Branch: refs/heads/4.1
Commit: b9d876c5ca398529fe89b795ad46fbf49f2d00c9
Parents: d5a474a
Author: Rohit Yadav <bh...@apache.org>
Authored: Mon Feb 25 14:48:30 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Mon Feb 25 14:48:30 2013 +0530
----------------------------------------------------------------------
setup/db/db/schema-40to410.sql | 40 -----------------------------------
1 files changed, 0 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b9d876c5/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
index d7c0789..74f0dba 100644
--- a/setup/db/db/schema-40to410.sql
+++ b/setup/db/db/schema-40to410.sql
@@ -22,7 +22,6 @@
use cloud;
SET foreign_key_checks = 0;
-alter table vm_template add image_data_store_id bigint unsigned;
alter table vm_template add size bigint unsigned;
alter table vm_template add state varchar(255);
alter table vm_template add update_count bigint unsigned;
@@ -59,45 +58,6 @@ alter table cluster add column owner varchar(255);
alter table cluster add column created datetime COMMENT 'date created';
alter table cluster add column lastUpdated datetime COMMENT 'last updated';
alter table cluster add column engine_state varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'the engine state of the zone';
-CREATE TABLE `cloud`.`object_datastore_ref` (
- `id` bigint unsigned NOT NULL auto_increment,
- `datastore_id` bigint unsigned NOT NULL,
- `datastore_role` varchar(255) NOT NULL,
- `object_id` bigint unsigned NOT NULL,
- `object_type` varchar(255) NOT NULL,
- `created` DATETIME NOT NULL,
- `last_updated` DATETIME,
- `job_id` varchar(255),
- `download_pct` int(10) unsigned,
- `download_state` varchar(255),
- `error_str` varchar(255),
- `local_path` varchar(255),
- `install_path` varchar(255),
- `size` bigint unsigned COMMENT 'the size of the template on the pool',
- `state` varchar(255) NOT NULL,
- `update_count` bigint unsigned NOT NULL,
- `updated` DATETIME,
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
-
-CREATE TABLE `cloud`.`data_store_provider` (
- `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
- `name` varchar(255) NOT NULL COMMENT 'name of primary data store provider',
- `uuid` varchar(255) NOT NULL COMMENT 'uuid of primary data store provider',
- PRIMARY KEY(`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `cloud`.`image_data_store` (
- `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
- `name` varchar(255) NOT NULL COMMENT 'name of data store',
- `image_provider_id` bigint unsigned NOT NULL COMMENT 'id of image_data_store_provider',
- `protocol` varchar(255) NOT NULL COMMENT 'protocol of data store',
- `data_center_id` bigint unsigned COMMENT 'datacenter id of data store',
- `scope` varchar(255) COMMENT 'scope of data store',
- `uuid` varchar(255) COMMENT 'uuid of data store',
- PRIMARY KEY(`id`),
- CONSTRAINT `fk_tags__image_data_store_provider_id` FOREIGN KEY(`image_provider_id`) REFERENCES `data_store_provider`(`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `cloud`.`vm_compute_tags` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',