From a5d842fc4806cbffd2e8dbae4b6575340955952e Mon Sep 17 00:00:00 2001 From: Jonathan Halterman Date: Thu, 20 Mar 2014 13:10:24 -0700 Subject: [PATCH 1/4] alarm_action.alarm_state should be an enum --- files/default/mon.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/files/default/mon.sql b/files/default/mon.sql index bfab551..850e422 100644 --- a/files/default/mon.sql +++ b/files/default/mon.sql @@ -20,10 +20,9 @@ CREATE TABLE `alarm` ( KEY `created_at` (`created_at`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -DROP TABLE IF EXISTS `alarm_action`; CREATE TABLE `alarm_action` ( `alarm_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL, - `alarm_state` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL, + `alarm_state` enum('UNDETERMINED','OK','ALARM') COLLATE utf8mb4_unicode_ci NOT NULL, `action_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (`alarm_id`,`alarm_state`,`action_id`), CONSTRAINT `fk_alarm_action_alarm_id` FOREIGN KEY (`alarm_id`) REFERENCES `alarm` (`id`) ON DELETE CASCADE From 984d26cda7df51758a49c02be2639f1fcc91eb4e Mon Sep 17 00:00:00 2001 From: Jonathan Halterman Date: Thu, 20 Mar 2014 13:10:24 -0700 Subject: [PATCH 2/4] alarm_action.alarm_state should be an enum --- files/default/mon.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/files/default/mon.sql b/files/default/mon.sql index bfab551..850e422 100644 --- a/files/default/mon.sql +++ b/files/default/mon.sql @@ -20,10 +20,9 @@ CREATE TABLE `alarm` ( KEY `created_at` (`created_at`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -DROP TABLE IF EXISTS `alarm_action`; CREATE TABLE `alarm_action` ( `alarm_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL, - `alarm_state` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL, + `alarm_state` enum('UNDETERMINED','OK','ALARM') COLLATE utf8mb4_unicode_ci NOT NULL, `action_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (`alarm_id`,`alarm_state`,`action_id`), CONSTRAINT `fk_alarm_action_alarm_id` FOREIGN KEY (`alarm_id`) REFERENCES `alarm` (`id`) ON DELETE CASCADE From 8fdf7f16e0aa27b4e76cbc183ad17a97078eb690 Mon Sep 17 00:00:00 2001 From: Jonathan Halterman Date: Thu, 20 Mar 2014 13:30:29 -0700 Subject: [PATCH 3/4] Drop alarm_action before creation --- files/default/mon.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/files/default/mon.sql b/files/default/mon.sql index 850e422..a09da89 100644 --- a/files/default/mon.sql +++ b/files/default/mon.sql @@ -20,6 +20,7 @@ CREATE TABLE `alarm` ( KEY `created_at` (`created_at`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS `alarm_action`; CREATE TABLE `alarm_action` ( `alarm_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL, `alarm_state` enum('UNDETERMINED','OK','ALARM') COLLATE utf8mb4_unicode_ci NOT NULL, From 4685a09f216dd6b6976f0d8e7b76aaad8d96bf1f Mon Sep 17 00:00:00 2001 From: Jonathan Halterman Date: Thu, 20 Mar 2014 13:40:37 -0700 Subject: [PATCH 4/4] Drop alarm_aciton table take 2 --- files/default/mon.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/files/default/mon.sql b/files/default/mon.sql index 850e422..a09da89 100644 --- a/files/default/mon.sql +++ b/files/default/mon.sql @@ -20,6 +20,7 @@ CREATE TABLE `alarm` ( KEY `created_at` (`created_at`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS `alarm_action`; CREATE TABLE `alarm_action` ( `alarm_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL, `alarm_state` enum('UNDETERMINED','OK','ALARM') COLLATE utf8mb4_unicode_ci NOT NULL,