From fba524fe5a7a3ddb1e292a7b2ea257d06223edcc Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 19 Jun 2011 14:07:19 +0000
Subject: [PATCH] Fix: uniformize table name
---
...ra_fields.key.sql => llx_advanced_extrafields.key.sql} | 2 +-
...nced_extra_fields.sql => llx_advanced_extrafields.sql} | 8 +++-----
...s.key.sql => llx_advanced_extrafields_options.key.sql} | 4 ++--
...s_options.sql => llx_advanced_extrafields_options.sql} | 6 +++---
...ns.key.sql => llx_advanced_extrafields_values.key.sql} | 4 ++--
...lds_values.sql => llx_advanced_extrafields_values.sql} | 6 +++---
6 files changed, 14 insertions(+), 16 deletions(-)
rename htdocs/install/mysql/tables/{llx_advanced_extra_fields.key.sql => llx_advanced_extrafields.key.sql} (89%)
rename htdocs/install/mysql/tables/{llx_advanced_extra_fields.sql => llx_advanced_extrafields.sql} (85%)
rename htdocs/install/mysql/tables/{llx_advanced_extra_fields_values.key.sql => llx_advanced_extrafields_options.key.sql} (74%)
rename htdocs/install/mysql/tables/{llx_advanced_extra_fields_options.sql => llx_advanced_extrafields_options.sql} (91%)
rename htdocs/install/mysql/tables/{llx_advanced_extra_fields_options.key.sql => llx_advanced_extrafields_values.key.sql} (74%)
rename htdocs/install/mysql/tables/{llx_advanced_extra_fields_values.sql => llx_advanced_extrafields_values.sql} (84%)
diff --git a/htdocs/install/mysql/tables/llx_advanced_extra_fields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql
similarity index 89%
rename from htdocs/install/mysql/tables/llx_advanced_extra_fields.key.sql
rename to htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql
index ae81e25819b..3c2a6257b38 100755
--- a/htdocs/install/mysql/tables/llx_advanced_extra_fields.key.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql
@@ -19,4 +19,4 @@
-- ============================================================================
-ALTER TABLE llx_extra_fields ADD UNIQUE INDEX idx_extra_fields_name (object, entity, name);
+ALTER TABLE llx_advanced_extrafields ADD UNIQUE INDEX idx_advanced_extrafields_name (object, entity, name);
diff --git a/htdocs/install/mysql/tables/llx_advanced_extra_fields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql
similarity index 85%
rename from htdocs/install/mysql/tables/llx_advanced_extra_fields.sql
rename to htdocs/install/mysql/tables/llx_advanced_extrafields.sql
index 94f98f85198..2b2db5af657 100755
--- a/htdocs/install/mysql/tables/llx_advanced_extra_fields.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql
@@ -18,20 +18,18 @@
-- $Id$
-- ===================================================================
-create table llx_extra_fields
+create table llx_advanced_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp,
entity integer DEFAULT 1 NOT NULL, -- multi company id
- object varchar(64) NOT NULL, -- type of link 'invoice', 'order', 'proposal', 'invoice_supplier', 'order_supplier'
+ elementtype varchar(64) NOT NULL, -- type of link 'invoice', 'order', 'proposal', 'invoice_supplier', 'order_supplier'
name varchar(64) NOT NULL, -- code name of field
label varchar(64) NOT NULL,
format varchar(8) NOT NULL, -- date, string, integer, float
fieldsize integer,
maxlength integer,
options varchar(255),
- rank integer,
-
- assign integer -- ???
+ rang integer
)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_advanced_extra_fields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql
similarity index 74%
rename from htdocs/install/mysql/tables/llx_advanced_extra_fields_values.key.sql
rename to htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql
index aa19918a05c..b5c9175202b 100755
--- a/htdocs/install/mysql/tables/llx_advanced_extra_fields_values.key.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql
@@ -19,6 +19,6 @@
-- ============================================================================
-ALTER TABLE llx_extra_fields_values ADD INDEX idx_extra_fields_values_fk_extra_fields (fk_extra_fields, entity);
+ALTER TABLE llx_advanced_extrafields_options ADD INDEX idx_advanced_extrafields_options_fk_advanced_extrafields (fk_extrafields);
-ALTER TABLE llx_extra_fields_values ADD CONSTRAINT fk_extra_fields_values_fk_extra_fields FOREIGN KEY (fk_extra_fields) REFERENCES llx_extra_fields (rowid);
+ALTER TABLE llx_advanced_extrafields_options ADD CONSTRAINT fk_advanced_extrafields_options_fk_advanced_extrafields FOREIGN KEY (fk_extrafields) REFERENCES llx_advanced_extrafields (rowid);
diff --git a/htdocs/install/mysql/tables/llx_advanced_extra_fields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql
similarity index 91%
rename from htdocs/install/mysql/tables/llx_advanced_extra_fields_options.sql
rename to htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql
index 16aa83ff534..6ed1e00dd88 100755
--- a/htdocs/install/mysql/tables/llx_advanced_extra_fields_options.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql
@@ -18,14 +18,14 @@
-- $Id$
-- ===================================================================
-create table llx_extra_fields_options
+create table llx_advanced_extrafields_options
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp,
- fk_extra_fields integer NOT NULL,
+ fk_extrafields integer NOT NULL,
value varchar(255) NOT NULL,
- rank integer
+ rang integer
)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_advanced_extra_fields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql
similarity index 74%
rename from htdocs/install/mysql/tables/llx_advanced_extra_fields_options.key.sql
rename to htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql
index 5fadd148797..d1279c21eb2 100755
--- a/htdocs/install/mysql/tables/llx_advanced_extra_fields_options.key.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql
@@ -19,6 +19,6 @@
-- ============================================================================
-ALTER TABLE llx_extra_fields_options ADD INDEX idx_extra_fields_options_fk_extra_fields (fk_extra_fields);
+ALTER TABLE llx_advanced_extrafields_values ADD INDEX idx_advanced_extrafields_values_fk_advanced_extrafields (fk_extrafields, entity);
-ALTER TABLE llx_extra_fields_options ADD CONSTRAINT fk_extra_fields_options_fk_extra_fields FOREIGN KEY (fk_extra_fields) REFERENCES llx_extra_fields (rowid);
+ALTER TABLE llx_advanced_extrafields_values ADD CONSTRAINT fk_advanced_extrafields_values_fk_advanced_extrafields FOREIGN KEY (fk_extrafields) REFERENCES llx_advanced_extrafields (rowid);
diff --git a/htdocs/install/mysql/tables/llx_advanced_extra_fields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql
similarity index 84%
rename from htdocs/install/mysql/tables/llx_advanced_extra_fields_values.sql
rename to htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql
index e46eb892913..822a69bc4ec 100755
--- a/htdocs/install/mysql/tables/llx_advanced_extra_fields_values.sql
+++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql
@@ -18,7 +18,7 @@
-- $Id$
-- ===================================================================
-create table llx_extra_fields_values
+create table llx_advanced_extrafields_values
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp,
@@ -26,8 +26,8 @@ create table llx_extra_fields_values
datec datetime,
datem datetime,
- fk_object integer NOT NULL, -- id of object (rowid of proposal, order, invoice...)
- fk_extra_fields integer NOT NULL, -- key to attribute definition
+ fk_element integer NOT NULL, -- id of object (rowid of proposal, order, invoice...)
+ fk_extrafields integer NOT NULL, -- key to attribute definition
value varchar(255), -- value of attribute
fk_user_create integer,
--
GitLab