From 0fa8aa8fc6a709d3987af591af764d20226a69ee Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Fri, 4 Jul 2014 13:17:57 +0200 Subject: [PATCH] fixing for real the upgrade path --- install/mysql.sql | 3 ++- install/upgrades/{3.2.1~a.sql => 3.1.1~a.sql} | 0 install/upgrades/3.3.0~a.sql | 10 ---------- 3 files changed, 2 insertions(+), 11 deletions(-) rename install/upgrades/{3.2.1~a.sql => 3.1.1~a.sql} (100%) delete mode 100644 install/upgrades/3.3.0~a.sql diff --git a/install/mysql.sql b/install/mysql.sql index 251475fc..5a8c15ee 100644 --- a/install/mysql.sql +++ b/install/mysql.sql @@ -747,5 +747,6 @@ CREATE TABLE IF NOT EXISTS `alternc_status` ( KEY `name` (`name`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -INSERT INTO alternc_status SET name='alternc_version',value='3.1.0~c.sh'; +INSERT INTO alternc_status SET name='alternc_version',value='3.1.1~a.sql'; + diff --git a/install/upgrades/3.2.1~a.sql b/install/upgrades/3.1.1~a.sql similarity index 100% rename from install/upgrades/3.2.1~a.sql rename to install/upgrades/3.1.1~a.sql diff --git a/install/upgrades/3.3.0~a.sql b/install/upgrades/3.3.0~a.sql deleted file mode 100644 index 5bed9c5d..00000000 --- a/install/upgrades/3.3.0~a.sql +++ /dev/null @@ -1,10 +0,0 @@ - -ALTER TABLE variable DROP PRIMARY KEY; -ALTER TABLE variable ADD id bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST; -ALTER TABLE variable ADD strata enum('DEFAULT','GLOBAL','FQDN', 'FQDN_CREATOR', 'CREATOR', 'MEMBER', 'DOMAIN') NOT NULL DEFAULT 'DEFAULT'; -ALTER TABLE variable ADD strata_id bigint DEFAULT NULL; -ALTER TABLE variable ADD type text DEFAULT ''; -ALTER TABLE variable ADD UNIQUE (name, strata, strata_id); - -ALTER TABLE actions MODIFY COLUMN type enum('CREATE_FILE','FIX_USER','CREATE_DIR','DELETE','MOVE','FIX_DIR','FIX_FILE'); -