From 80805f78ea409bfa6ee837cc6cbcf49db028a4fa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@destailleur.fr> Date: Thu, 10 Mar 2016 13:43:09 +0100 Subject: [PATCH] Disable too dangerous patch. Fix must be done by doing an insert only without creating/renaming databases. --- .../install/mysql/migration/3.7.0-3.8.0.sql | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index ff1dbb77d4e..f9f15f08c23 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -798,13 +798,14 @@ update llx_opensurvey_sondage set format = 'D' where format = 'D+'; update llx_opensurvey_sondage set format = 'A' where format = 'A+'; --Deal with holidays_user that do not have rowid -CREATE TABLE llx_holiday_users_tmp -( - rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, - fk_user integer NOT NULL, - fk_type integer NOT NULL, - nb_holiday real NOT NULL DEFAULT '0' -) ENGINE=innodb; -INSERT INTO llx_holiday_users_tmp(fk_user,fk_type,nb_holiday) SELECT fk_user,fk_type,nb_holiday FROM llx_holiday_users; -DROP TABLE llx_holiday_users; -ALTER TABLE llx_holiday_users_tmp RENAME TO llx_holiday_users; \ No newline at end of file +--CREATE TABLE llx_holiday_users_tmp +--( +-- rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, +-- fk_user integer NOT NULL, +-- fk_type integer NOT NULL, +-- nb_holiday real NOT NULL DEFAULT '0' +--) ENGINE=innodb; +--INSERT INTO llx_holiday_users_tmp(fk_user,fk_type,nb_holiday) SELECT fk_user,fk_type,nb_holiday FROM llx_holiday_users; +--DROP TABLE llx_holiday_users; +--ALTER TABLE llx_holiday_users_tmp RENAME TO llx_holiday_users; + -- GitLab