From 131dc881396560780540654561ca27c31127df47 Mon Sep 17 00:00:00 2001 From: fhenry Date: Sat, 8 Dec 2012 18:14:13 +0100 Subject: [PATCH 1/3] prepare module for "Single login at one time" --- htdocs/install/mysql/tables/llx_element_lock.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index ac4e18d6a1a..f78380d9658 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -23,7 +23,8 @@ create table llx_element_lock elementtype varchar(16) NOT NULL, datel datetime, -- date of lock datem datetime, -- date of unlock/modif - fk_user_modif integer, - status tinyint DEFAULT 0 -- 0 unlock, 1 lock + fk_user_modif integer, + status tinyint DEFAULT 0, -- 0 unlock, 1 lock + sessionid varchar(255) )ENGINE=innodb; From 4570c57bfd322637cf6ef5f0e377c177a4cdc56b Mon Sep 17 00:00:00 2001 From: fhenry Date: Sat, 8 Dec 2012 18:28:19 +0100 Subject: [PATCH 2/3] Change-Id: I003fa45e6e932350b9d21b00ed4817b943470223 --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index e48e81b2051..6a02c65abad 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -813,7 +813,7 @@ CREATE TABLE llx_product_price_by_qty qty_min real DEFAULT 0 )ENGINE=innodb; -ALTER TABLE llx_product_price ADD price_by_qty INT NOT NULL DEFAULT 0; +ALTER TABLE llx_product_price ADD COLUMN price_by_qty INT NOT NULL DEFAULT 0; ALTER TABLE llx_product_price_by_qty ADD UNIQUE INDEX uk_product_price_by_qty_level (fk_product_price, qty_min); @@ -880,3 +880,5 @@ create table llx_user_extrafields )ENGINE=innodb; ALTER TABLE llx_user_extrafields ADD INDEX idx_user_extrafields (fk_object); + +ALTER TABLE llx_element_lock ADD COLUMN sessionid varchar(255) AFTER status; From 0e76875e9cdcdc85b55d01c1b9de7e913a13b59a Mon Sep 17 00:00:00 2001 From: fhenry Date: Sat, 8 Dec 2012 18:41:32 +0100 Subject: [PATCH 3/3] prepare single login at one time --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 5 ++++- htdocs/install/mysql/tables/llx_element_lock.sql | 7 ++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index 6a02c65abad..7c594ef77af 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -881,4 +881,7 @@ create table llx_user_extrafields ALTER TABLE llx_user_extrafields ADD INDEX idx_user_extrafields (fk_object); -ALTER TABLE llx_element_lock ADD COLUMN sessionid varchar(255) AFTER status; +ALTER TABLE llx_element_lock ADD COLUMN sessionid varchar(255) AFTER datem; +ALTER TABLE llx_element_lock MODIFY COLUMN elementtype varchar(32) NOT NULL; +ALTER TABLE llx_element_lock DROP COLUMN fk_user_modif; +ALTER TABLE llx_element_lock DROP COLUMN status; diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index f78380d9658..fd51f1f2118 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -20,11 +20,8 @@ create table llx_element_lock ( rowid integer AUTO_INCREMENT PRIMARY KEY, fk_element integer NOT NULL, - elementtype varchar(16) NOT NULL, + elementtype varchar(32) NOT NULL, datel datetime, -- date of lock datem datetime, -- date of unlock/modif - fk_user_modif integer, - status tinyint DEFAULT 0, -- 0 unlock, 1 lock - sessionid varchar(255) - + sessionid varchar(255) )ENGINE=innodb;