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..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 @@ -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,8 @@ 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 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 ac4e18d6a1a..fd51f1f2118 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -20,10 +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) )ENGINE=innodb;