diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql index df4a3e45c75..994e5d89495 100644 --- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql +++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql @@ -74,7 +74,11 @@ create table llx_mrp_mo_extrafields import_key varchar(14) -- import key ) ENGINE=innodb; -ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_fk_object(fk_object); +ALTER TABLE llx_mrp_mo_extrafields DROP INDEX idx_fk_object; + +ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_mrp_mo_fk_object(fk_object); + + -- This var is per entity now, so we remove const if global if exists delete from llx_const where name in ('PROJECT_HIDE_TASKS', 'MAIN_BUGTRACK_ENABLELINK', 'MAIN_HELP_DISABLELINK') and entity = 0; diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql index 322b1bee322..ca01a0d1b5e 100644 --- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql +++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql @@ -35,9 +35,23 @@ ALTER TABLE llx_prelevement_bons ADD COLUMN type varchar(16) DEFAULT 'debit-orde ALTER TABLE llx_prelevement_facture_demande ADD INDEX idx_prelevement_facture_demande_fk_facture (fk_facture); ALTER TABLE llx_prelevement_facture_demande ADD INDEX idx_prelevement_facture_demande_fk_facture_fourn (fk_facture_fourn); +ALTER TABLE llx_document_model MODIFY COLUMN type varchar(64); + ALTER TABLE llx_bom_bom MODIFY COLUMN duration double(24,8); -ALTER TABLE llx_document_model MODIFY COLUMN type varchar(64); +ALTER TABLE llx_bom_bom_extrafields ADD INDEX idx_bom_bom_extrafields_fk_object (fk_object); + +create table llx_mrp_mo_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=innodb; + +ALTER TABLE llx_mrp_mo_extrafields DROP INDEX idx_fk_object; + +ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_mrp_mo_fk_object(fk_object); -- For v13 @@ -138,7 +152,7 @@ create table llx_recruitment_recruitmentjobposition_extrafields import_key varchar(14) -- import key ) ENGINE=innodb; -ALTER TABLE llx_recruitment_recruitmentjobposition_extrafields ADD INDEX idx_fk_object(fk_object); +ALTER TABLE llx_recruitment_recruitmentjobposition_extrafields ADD INDEX idx_recruitmentjobposition_fk_object(fk_object); @@ -186,12 +200,13 @@ create table llx_recruitment_recruitmentcandidature_extrafields import_key varchar(14) -- import key ) ENGINE=innodb; -ALTER TABLE llx_recruitment_recruitmentcandidature_extrafields ADD INDEX idx_fk_object(fk_object); +ALTER TABLE llx_recruitment_recruitmentcandidature_extrafields ADD INDEX idx_recruitmentcandidature_fk_object(fk_object); ALTER TABLE llx_recruitment_recruitmentcandidature ADD UNIQUE INDEX uk_recruitmentcandidature_email_msgid(email_msgid); + CREATE TABLE llx_product_attribute_combination_price_level ( rowid INTEGER PRIMARY KEY NOT NULL AUTO_INCREMENT, diff --git a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql new file mode 100644 index 00000000000..e0b217c2917 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql @@ -0,0 +1,21 @@ +-- =================================================================== +-- Copyright (C) 2014 Florian Henry +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + + +ALTER TABLE llx_bom_bom_extrafields ADD INDEX idx_bom_bom_extrafields_fk_object (fk_object); + diff --git a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.key.sql b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.key.sql index 5b280acc41f..b77c81aa7f1 100644 --- a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.key.sql @@ -15,5 +15,5 @@ -- BEGIN MODULEBUILDER INDEXES -ALTER TABLE llx_mrp_myobject_extrafields ADD INDEX idx_fk_object(fk_object); +ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_mrp_mo_fk_object(fk_object); -- END MODULEBUILDER INDEXES diff --git a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql index 9245ac1c341..97eab584cc7 100644 --- a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql @@ -13,7 +13,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see http://www.gnu.org/licenses/. -create table llx_mrp_myobject_extrafields +create table llx_mrp_mo_extrafields ( rowid integer AUTO_INCREMENT PRIMARY KEY, tms timestamp, diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.key.sql index fb1522bf6f1..72a90391471 100644 --- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.key.sql @@ -15,5 +15,5 @@ -- BEGIN MODULEBUILDER INDEXES -ALTER TABLE llx_recruitment_recruitmentcandidature_extrafields ADD INDEX idx_fk_object(fk_object); +ALTER TABLE llx_recruitment_recruitmentcandidature_extrafields ADD INDEX idx_recruitmentcandidature_fk_object(fk_object); -- END MODULEBUILDER INDEXES diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.key.sql index eaf00f0fd2e..dfb495c3efc 100644 --- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.key.sql @@ -15,5 +15,5 @@ -- BEGIN MODULEBUILDER INDEXES -ALTER TABLE llx_recruitment_recruitmentjobposition_extrafields ADD INDEX idx_fk_object(fk_object); +ALTER TABLE llx_recruitment_recruitmentjobposition_extrafields ADD INDEX idx_recruitmentjobposition_fk_object(fk_object); -- END MODULEBUILDER INDEXES diff --git a/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql index e9a612dca91..fc6b7b0d243 100644 --- a/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql +++ b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql @@ -15,7 +15,7 @@ -- BEGIN MODULEBUILDER INDEXES -ALTER TABLE llx_mymodule_myobject ADD INDEX idx_fieldobject (fieldobject); +ALTER TABLE llx_mymodule_myobject ADD INDEX idx_mymodule_myobject_fieldobject (fieldobject); -- END MODULEBUILDER INDEXES --ALTER TABLE llx_mymodule_myobject ADD UNIQUE INDEX uk_mymodule_myobject_fieldxy(fieldx, fieldy); diff --git a/htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.key.sql b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.key.sql index 6cb6bd48ca1..4c005e9d170 100644 --- a/htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.key.sql +++ b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.key.sql @@ -15,5 +15,5 @@ -- BEGIN MODULEBUILDER INDEXES -ALTER TABLE llx_mymodule_myobject_extrafields ADD INDEX idx_fk_object(fk_object); +ALTER TABLE llx_mymodule_myobject_extrafields ADD INDEX idx_myobject_fk_object(fk_object); -- END MODULEBUILDER INDEXES