From aa4656b9c0950d67571c3d7f8bda9d02d29a4a5b Mon Sep 17 00:00:00 2001 From: slerena Date: Wed, 11 Feb 2009 17:28:39 +0000 Subject: [PATCH] 2009-02-11 Sancho Lerena * pandoradb_migrate_20_to_21.sql: Fixed typo. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1444 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 4 ++++ pandora_console/pandoradb_migrate_20_to_21.sql | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 85392c8c64..84ab7e7e55 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2009-02-11 Sancho Lerena + + * pandoradb_migrate_20_to_21.sql: Fixed typo. + 2009-02-11 Esteban Sanchez * general/main_menu.php, include/styles/menu.css: Selected menu style diff --git a/pandora_console/pandoradb_migrate_20_to_21.sql b/pandora_console/pandoradb_migrate_20_to_21.sql index d8433bec54..608c6e2aea 100644 --- a/pandora_console/pandoradb_migrate_20_to_21.sql +++ b/pandora_console/pandoradb_migrate_20_to_21.sql @@ -182,6 +182,7 @@ ALTER TABLE `tusuario` CHANGE `direccion` `email` VARCHAR( 100 ) CHARACTER SE ALTER TABLE `tusuario` CHANGE `telefono` `phone` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL; ALTER TABLE `tusuario` CHANGE `nivel` `is_admin` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'; +DROP TABLE IF EXISTS talert_compound; CREATE TABLE IF NOT EXISTS `talert_compound` ( `id` int(10) unsigned NOT NULL auto_increment, @@ -214,9 +215,11 @@ CREATE TABLE IF NOT EXISTS `talert_compound` ( ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +DROP TABLE IF EXISTS talert_compound_elements; + CREATE TABLE IF NOT EXISTS `talert_compound_elements` ( `id_alert_compound` int(10) unsigned NOT NULL, - `id_alert_template_module` int(10) unsigned NOT NULL,:w + `id_alert_template_module` int(10) unsigned NOT NULL, `operation` enum('NOP', 'AND','OR','XOR','NAND','NOR','NXOR'), `order` tinyint(2) unsigned default 0, UNIQUE (`id_alert_compound`, `id_alert_template_module`, `operation`), @@ -226,6 +229,9 @@ CREATE TABLE IF NOT EXISTS `talert_compound_elements` ( ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS talert_compound_actions; + CREATE TABLE IF NOT EXISTS `talert_compound_actions` ( `id_alert_compound` int(10) unsigned NOT NULL, `id_alert_action` int(10) unsigned NOT NULL,