From 7c0e7c953cc13d20a2a8edf3ecd27cfc347c8520 Mon Sep 17 00:00:00 2001 From: Dominique Rousseau Date: Tue, 19 Jan 2016 16:14:03 +0100 Subject: [PATCH 1/2] fix de la creation de la table default_subdomains ( fixes #1662 ) --- install/mysql.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/mysql.sql b/install/mysql.sql index 34845926..4ba2516b 100644 --- a/install/mysql.sql +++ b/install/mysql.sql @@ -687,7 +687,8 @@ CREATE TABLE IF NOT EXISTS `default_subdomains` ( `domain_type_parameter` varchar(255) NOT NULL, `concerned` enum('BOTH','MAIN','SLAVE') NOT NULL DEFAULT 'MAIN', `enabled` boolean not null default true, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + UNIQUE KEY `unique_row` (`sub`,`domain_type`,`domain_type_parameter`,`concerned`) ) ENGINE=MyISAM COMMENT='Contains the defaults subdomains created on domains creation'; INSERT IGNORE INTO `default_subdomains` (`sub`, `domain_type`, `domain_type_parameter`, `concerned`) VALUES From b379d2cb34adaebc067a0cd2a7da679f6ccd203b Mon Sep 17 00:00:00 2001 From: Dominique Rousseau Date: Tue, 19 Jan 2016 16:14:58 +0100 Subject: [PATCH 2/2] ajout d'un alter table pour eviter les doublons dans default_subdomains - pas teste, pas sur que ca casse pas un truc - ( refs #1662 ) --- install/upgrades/3.0.0~1.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/install/upgrades/3.0.0~1.sql b/install/upgrades/3.0.0~1.sql index 865f0c60..f4860b5e 100644 --- a/install/upgrades/3.0.0~1.sql +++ b/install/upgrades/3.0.0~1.sql @@ -204,6 +204,9 @@ UPDATE domaines_type SET create_tmpdir=true, create_targetdir=true WHERE target= ALTER IGNORE TABLE domaines MODIFY domaine VARCHAR(255); ALTER IGNORE TABLE sub_domaines MODIFY domaine VARCHAR(255); +-- Should lthe default_subdomains table already exists, prevent the following INSERT INTO to double the entries +ALTER TABLE `default_subdomains` ADD UNIQUE KEY `unique_row` (`sub`,`domain_type`,`domain_type_parameter`,`concerned`); + -- Defaults subdomains to create when a domain is added CREATE TABLE IF NOT EXISTS `default_subdomains` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,