diff --git a/mysql/migration/2.5.0-2.6.0.sql b/mysql/migration/2.5.0-2.6.0.sql index d66363cea92..131ca3ff749 100644 --- a/mysql/migration/2.5.0-2.6.0.sql +++ b/mysql/migration/2.5.0-2.6.0.sql @@ -125,8 +125,8 @@ ALTER TABLE llx_categorie_association ADD UNIQUE INDEX uk_categorie_association_ -- Multi company ALTER TABLE llx_const ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER tms; -ALTER TABLE llx_user ADD COLUMN entity varchar(20) DEFAULT 1 NOT NULL AFTER lang; -ALTER TABLE llx_usergroup ADD COLUMN entity varchar(20) DEFAULT 1 NOT NULL AFTER note; +ALTER TABLE llx_user ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER lang; +ALTER TABLE llx_usergroup ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER note; ALTER TABLE llx_const DROP INDEX name; ALTER TABLE llx_user DROP INDEX uk_user_login; diff --git a/mysql/tables/llx_user.sql b/mysql/tables/llx_user.sql index 735e64f4f82..5faa9c41dc4 100644 --- a/mysql/tables/llx_user.sql +++ b/mysql/tables/llx_user.sql @@ -51,7 +51,7 @@ create table llx_user ldap_sid varchar(255) DEFAULT NULL, statut tinyint DEFAULT 1, lang varchar(6), - entity varchar(20) DEFAULT 1 NOT NULL -- multi company id + entity integer DEFAULT 1 NOT NULL -- multi company id )type=innodb; -- @@ -60,6 +60,5 @@ create table llx_user -- 0 : common user -- 1 : first company user -- 2 : second company user --- 1,3 : first and third company user --- etc... +-- 3 : etc... -- \ No newline at end of file diff --git a/mysql/tables/llx_usergroup.sql b/mysql/tables/llx_usergroup.sql index 73ac1bde599..fca9b3da33a 100644 --- a/mysql/tables/llx_usergroup.sql +++ b/mysql/tables/llx_usergroup.sql @@ -27,7 +27,7 @@ create table llx_usergroup tms timestamp, nom varchar(255) NOT NULL, note text, - entity varchar(20) DEFAULT 1 NOT NULL -- multi company id + entity integer DEFAULT 1 NOT NULL -- multi company id )type=innodb; -- @@ -36,6 +36,5 @@ create table llx_usergroup -- 0 : common group -- 1 : first company group -- 2 : second company group --- 1,3 : first and third company group --- etc... +-- 3 : etc... -- \ No newline at end of file