diff --git a/mysql/migration/2.4.0-2.5.0.sql b/mysql/migration/2.4.0-2.5.0.sql index e4caf1e921a..34691577ec5 100644 --- a/mysql/migration/2.4.0-2.5.0.sql +++ b/mysql/migration/2.4.0-2.5.0.sql @@ -20,4 +20,17 @@ alter table llx_expedition add tracking_number varchar(50) after fk_expedition_m alter table llx_actioncomm add column location varchar(128) after percent; +-- remove enum type +alter table llx_adherent_type modify column cotisation varchar(3) NOT NULL DEFAULT 'yes'; +alter table llx_adherent_type modify column vote varchar(3) NOT NULL DEFAULT 'yes'; +alter table llx_adherent modify column morphy varchar(3) NOT NULL; +alter table llx_c_paper_format modify column unit varchar(5) NOT NULL; +alter table llx_const modify column type varchar(6); +alter table llx_menu modify column type varchar(4) NOT NULL; +alter table llx_notify modify column objet_type varchar(24) NOT NULL; +alter table llx_projet_task_actors modify column role varchar(5) DEFAULT 'admin'; +alter table llx_projet_task modify column statut varchar(6) DEFAULT 'open'; +alter table llx_rights_def modify column type varchar(1); + + diff --git a/mysql/tables/llx_adherent.sql b/mysql/tables/llx_adherent.sql index 420b8507864..f1239164b21 100644 --- a/mysql/tables/llx_adherent.sql +++ b/mysql/tables/llx_adherent.sql @@ -33,7 +33,7 @@ create table llx_adherent login varchar(50) NOT NULL, -- login pass varchar(50), -- password fk_adherent_type smallint, - morphy enum('mor','phy') NOT NULL, -- personne morale / personne physique + morphy varchar(3) NOT NULL, -- personne morale / personne physique societe varchar(50), adresse text, cp varchar(30), diff --git a/mysql/tables/llx_adherent_type.sql b/mysql/tables/llx_adherent_type.sql index 192eca5371c..1862515277a 100644 --- a/mysql/tables/llx_adherent_type.sql +++ b/mysql/tables/llx_adherent_type.sql @@ -29,8 +29,8 @@ create table llx_adherent_type tms timestamp, statut smallint NOT NULL DEFAULT 0, libelle varchar(50) NOT NULL, - cotisation enum('yes','no') NOT NULL DEFAULT 'yes', - vote enum('yes','no') NOT NULL DEFAULT 'yes', + cotisation varchar(3) NOT NULL DEFAULT 'yes', + vote varchar(3) NOT NULL DEFAULT 'yes', note text, mail_valid text -- mail envoye a la validation )type=innodb; diff --git a/mysql/tables/llx_c_paper_format.sql b/mysql/tables/llx_c_paper_format.sql index 2515c40c89a..3256ac07ffb 100644 --- a/mysql/tables/llx_c_paper_format.sql +++ b/mysql/tables/llx_c_paper_format.sql @@ -25,7 +25,7 @@ create table llx_c_paper_format label varchar(50) NOT NULL, width float(6,2) DEFAULT 0, -- Largeur du papier height float(6,2) DEFAULT 0, -- Hauteur du papier - unit enum('mm','cm','point','inch') NOT NULL, -- Unité de mesure + unit varchar(5) NOT NULL, -- Unité de mesure active tinyint DEFAULT 1 NOT NULL )type=innodb; diff --git a/mysql/tables/llx_const.sql b/mysql/tables/llx_const.sql index 2c0455a70fa..f7fe2dc6c5d 100644 --- a/mysql/tables/llx_const.sql +++ b/mysql/tables/llx_const.sql @@ -29,7 +29,7 @@ create table llx_const rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(255), value text, -- max 65535 caracteres - type enum('yesno','texte','chaine'), + type varchar(6), visible tinyint DEFAULT 1 NOT NULL, note text, tms timestamp, diff --git a/mysql/tables/llx_menu.sql b/mysql/tables/llx_menu.sql index 83c9db194b6..372a34f4e4b 100644 --- a/mysql/tables/llx_menu.sql +++ b/mysql/tables/llx_menu.sql @@ -25,11 +25,11 @@ CREATE TABLE `llx_menu` ( menu_handler varchar(16) NOT NULL, -- Menu handler name module varchar(64), -- Module name if record is added by a module - type enum('top','left') NOT NULL, -- Menu top or left + type varchar(4) NOT NULL, -- Menu top or left mainmenu varchar(100) NOT NULL, -- Name family/module (home, companies, ...) fk_menu int(11) NOT NULL, -- 0 or Id of mother menu line - position integer NOT NULL, -- Sort order of entry + position integer NOT NULL, -- Sort order of entry url varchar(255) NOT NULL, -- Relative (or absolute) url to go target varchar(100) NULL, -- Target of Url link diff --git a/mysql/tables/llx_notify.sql b/mysql/tables/llx_notify.sql index b655cdc2b62..bca09e5a19e 100644 --- a/mysql/tables/llx_notify.sql +++ b/mysql/tables/llx_notify.sql @@ -25,6 +25,6 @@ create table llx_notify daten datetime, -- date de la notification fk_action integer NOT NULL, fk_contact integer NOT NULL, - objet_type enum('ficheinter','facture','propale'), + objet_type varchar(24) NOT NULL, objet_id integer NOT NULL )type=innodb; diff --git a/mysql/tables/llx_projet_task.sql b/mysql/tables/llx_projet_task.sql index 74db517c152..d0e80abc39b 100644 --- a/mysql/tables/llx_projet_task.sql +++ b/mysql/tables/llx_projet_task.sql @@ -26,6 +26,6 @@ create table llx_projet_task title varchar(255), duration_effective real NOT NULL, fk_user_creat integer, -- createur - statut enum('open','closed') DEFAULT 'open', + statut varchar(6) DEFAULT 'open', note text )type=innodb; diff --git a/mysql/tables/llx_projet_task_actors.sql b/mysql/tables/llx_projet_task_actors.sql index 00feb6cca99..017a227d1c0 100644 --- a/mysql/tables/llx_projet_task_actors.sql +++ b/mysql/tables/llx_projet_task_actors.sql @@ -22,7 +22,7 @@ create table llx_projet_task_actors ( fk_projet_task integer NOT NULL, fk_user integer NOT NULL, - role enum ('admin','read','acto','info') DEFAULT 'admin', + role varchar(5) DEFAULT 'admin', UNIQUE (fk_projet_task, fk_user) )type=innodb; diff --git a/mysql/tables/llx_rights_def.sql b/mysql/tables/llx_rights_def.sql index 04b1e3756c0..19acea69b20 100644 --- a/mysql/tables/llx_rights_def.sql +++ b/mysql/tables/llx_rights_def.sql @@ -25,7 +25,7 @@ create table llx_rights_def module varchar(12), perms varchar(50), subperms varchar(50), - type enum('r','w','m','d','a'), + type varchar(1), bydefault tinyint DEFAULT 0 )type=innodb; diff --git a/mysql/tables/llx_societe_consult.sql b/mysql/tables/llx_societe_consult.sql deleted file mode 100644 index 31ada9efd16..00000000000 --- a/mysql/tables/llx_societe_consult.sql +++ /dev/null @@ -1,31 +0,0 @@ --- ======================================================================== --- Copyright (C) 2005 Rodolphe Quiedeville --- --- 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 2 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, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --- --- $Id$ --- ======================================================================== - --- --- Le type InnoDB n'est pas nécessaire pour cette table --- -create table llx_societe_consult -( - fk_soc integer, - fk_user integer, - datec timestamp, - action enum('w','r') -)type=innodb; -