From 5d512af4b4c53921fc581e8dc7ea4c2e201560bc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 13 Mar 2018 09:53:33 +0100 Subject: [PATCH] Fix migration --- htdocs/install/mysql/migration/7.0.0-8.0.0.sql | 5 +++-- .../install/mysql/tables/llx_societe_account.sql | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql index 1d1261edf5f..6ff739b5f40 100644 --- a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql +++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql @@ -235,6 +235,7 @@ CREATE TABLE llx_societe_account( -- BEGIN MODULEBUILDER FIELDS rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, entity integer DEFAULT 1, + key_account varchar(128), login varchar(128) NOT NULL, pass_encoding varchar(24) NOT NULL, pass_crypted varchar(128), @@ -255,13 +256,13 @@ CREATE TABLE llx_societe_account( ) ENGINE=innodb; --- BEGIN MODULEBUILDER INDEXES +ALTER TABLE llx_societe_account ADD COLUMN key_account varchar(128); + ALTER TABLE llx_societe_account ADD INDEX idx_societe_account_rowid (rowid); ALTER TABLE llx_societe_account ADD INDEX idx_societe_account_login (login); ALTER TABLE llx_societe_account ADD INDEX idx_societe_account_status (status); ALTER TABLE llx_societe_account ADD INDEX idx_societe_account_fk_website (fk_website); ALTER TABLE llx_societe_account ADD INDEX idx_societe_account_fk_soc (fk_soc); --- END MODULEBUILDER INDEXES ALTER TABLE llx_societe_account ADD UNIQUE INDEX uk_societe_account_login_website_soc(entity, fk_soc, login, site, fk_website); diff --git a/htdocs/install/mysql/tables/llx_societe_account.sql b/htdocs/install/mysql/tables/llx_societe_account.sql index e1a421affe4..4dd17f441ed 100644 --- a/htdocs/install/mysql/tables/llx_societe_account.sql +++ b/htdocs/install/mysql/tables/llx_societe_account.sql @@ -19,17 +19,17 @@ CREATE TABLE llx_societe_account( -- BEGIN MODULEBUILDER FIELDS rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, entity integer DEFAULT 1, + key_account varchar(128), login varchar(128) NOT NULL, - pass_encoding varchar(24) NOT NULL, - pass_crypted varchar(128), - pass_temp varchar(128), -- temporary password when asked for forget password - fk_soc integer, + pass_encoding varchar(24) NOT NULL, + pass_crypted varchar(128), + pass_temp varchar(128), -- temporary password when asked for forget password + fk_soc integer, site varchar(128), -- name of external web site fk_website integer, -- id of local web site note_private text, - key_account varchar(128), - date_last_login datetime, - date_previous_login datetime, + date_last_login datetime, + date_previous_login datetime, date_creation datetime NOT NULL, tms timestamp NOT NULL, fk_user_creat integer NOT NULL,