From 59db01ce6e9a428d5853786eef5279ee30aa23b2 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 21 Feb 2013 14:56:43 +0530 Subject: [PATCH] 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 --- setup/db/db/schema-40to410.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql index 9a59318354c..47b7cbe14d7 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`);