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/21 10:31:16 UTC

git commit: refs/heads/master - CLOUDSTACK-1347: Don't enforce not null rule on queue_proc_time of sync_item_queue

Updated Branches:
  refs/heads/master 7a3f072a5 -> 59db01ce6


CLOUDSTACK-1347: Don't enforce not null rule on queue_proc_time of sync_item_queue

In c63dbb88042d7eabea2664c2b608c51792fc9f18 I removed the rule from create-schema:
-  `queue_proc_time` datetime COMMENT 'when processing started for the item',

But, upgrade path schema-40to410.sql had a different rule which caused the bug:
+ALTER TABLE `cloud`.`sync_queue_item` ADD `queue_proc_time` DATETIME NOT NULL
COMMENT 'when processing started for the item' AFTER `queue_proc_number`;

In this fix we just revert to whatever rule was defined in create-schema as the
developer may have forgetten to fix same rule in create-schema and upgrade path.
This commit can be reverted or the code be fixed if we want that queue_proc_time
cannot be null.

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/59db01ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/59db01ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/59db01ce

Branch: refs/heads/master
Commit: 59db01ce6e9a428d5853786eef5279ee30aa23b2
Parents: 7a3f072
Author: Rohit Yadav <bh...@apache.org>
Authored: Thu Feb 21 14:56:43 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Thu Feb 21 15:01:00 2013 +0530

----------------------------------------------------------------------
 setup/db/db/schema-40to410.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/59db01ce/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
index 9a59318..47b7cbe 100644
--- a/setup/db/db/schema-40to410.sql
+++ b/setup/db/db/schema-40to410.sql
@@ -200,7 +200,7 @@ ALTER TABLE `cloud`.`sync_queue` DROP COLUMN `queue_proc_time`;
 
 ALTER TABLE `cloud`.`sync_queue` DROP COLUMN `queue_proc_msid`;
 
-ALTER TABLE `cloud`.`sync_queue_item` ADD `queue_proc_time` DATETIME NOT NULL COMMENT 'when processing started for the item' AFTER `queue_proc_number`;
+ALTER TABLE `cloud`.`sync_queue_item` ADD `queue_proc_time` DATETIME COMMENT 'when processing started for the item' AFTER `queue_proc_number`;
 
 ALTER TABLE `cloud`.`sync_queue_item` ADD INDEX `i_sync_queue__queue_proc_time`(`queue_proc_time`);