From cec9f02ffe2d1232f36b2a769bb8854bec85ace4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 2 Dec 2007 14:46:08 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Si=20toutes=20les=20box=20ont=20=E9t=E9?= =?UTF-8?q?=20mise=20du=20meme=20cot=E9=20on=20peut=20a=20nouveau=20en=20r?= =?UTF-8?q?emettre=20de=20l'autre=20cot=E9.=20Qual:=20Simplification=20du?= =?UTF-8?q?=20code=20de=20gestion=20des=20boxes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysql/migration/2.1.0-2.2.0.sql | 4 ++++ mysql/tables/llx_boxes.key.sql | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql index f6133a777d6..4bfafc4f829 100644 --- a/mysql/migration/2.1.0-2.2.0.sql +++ b/mysql/migration/2.1.0-2.2.0.sql @@ -1120,3 +1120,7 @@ insert into llx_c_pays (rowid,code,libelle) values (243, 'JE', 'Jersey' ) insert into llx_c_pays (rowid,code,libelle) values (244, 'ME', 'Monténégro' ); insert into llx_c_pays (rowid,code,libelle) values (245, 'BL', 'Saint-Barthélemy'); insert into llx_c_pays (rowid,code,libelle) values (246, 'MF', 'Saint-Martin' ); + + +ALTER TABLE llx_boxes ADD UNIQUE INDEX uk_boxes (box_id, position, fk_user); + diff --git a/mysql/tables/llx_boxes.key.sql b/mysql/tables/llx_boxes.key.sql index 4a3c57a4e3e..1b0530c37e5 100644 --- a/mysql/tables/llx_boxes.key.sql +++ b/mysql/tables/llx_boxes.key.sql @@ -1,5 +1,5 @@ -- =================================================================== --- Copyright (C) 2006 Laurent Destailleur +-- Copyright (C) 2006-2007 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -16,14 +16,14 @@ -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- -- $Id$ --- $Source$ -- =================================================================== --- Supprimme orphelins pour permettre montée de la clé --- V4 DELETE llx_boxes FROM llx_boxes LEFT JOIN llx_boxes_def ON llx_boxes.box_id = llx_boxes_def.rowid WHERE llx_boxes_def.rowid IS NULL; +ALTER TABLE llx_boxes ADD UNIQUE INDEX uk_boxes (box_id, position, fk_user); +-- Supprime orphelins pour permettre montée de la clé +-- V4 DELETE llx_boxes FROM llx_boxes LEFT JOIN llx_boxes_def ON llx_boxes.box_id = llx_boxes_def.rowid WHERE llx_boxes_def.rowid IS NULL; ALTER TABLE llx_boxes ADD INDEX idx_boxes_boxid (box_id); ALTER TABLE llx_boxes ADD CONSTRAINT fk_boxes_box_id FOREIGN KEY (box_id) REFERENCES llx_boxes_def (rowid); -ALTER TABLE llx_boxes ADD INDEX idx_boxes_fk_user (fk_user); \ No newline at end of file +ALTER TABLE llx_boxes ADD INDEX idx_boxes_fk_user (fk_user);