From 74982edb02b17b486e9734aa7407ac99886f2276 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 15 Dec 2009 15:44:32 +0000
Subject: [PATCH] Fix: rename field "key" to "cryptkey" Fix: rename
 "llx_ecm_document" to "llx_ecm_documents"

---
 dev/initdemo/initdemo.sql                         | 14 +++++++-------
 htdocs/install/mysql/migration/2.2.0-2.4.0.sql    |  2 +-
 htdocs/install/mysql/migration/2.7.0-2.8.0.sql    |  7 ++++---
 htdocs/install/mysql/tables/llx_ecm_documents.sql |  5 ++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dev/initdemo/initdemo.sql b/dev/initdemo/initdemo.sql
index 663cba0dde8..f1b37f65cec 100644
--- a/dev/initdemo/initdemo.sql
+++ b/dev/initdemo/initdemo.sql
@@ -2230,13 +2230,13 @@ LOCK TABLES `llx_ecm_directories` WRITE;
 UNLOCK TABLES;
 
 --
--- Table structure for table `llx_ecm_document`
+-- Table structure for table `llx_ecm_documents`
 --
 
-DROP TABLE IF EXISTS `llx_ecm_document`;
+DROP TABLE IF EXISTS `llx_ecm_documents`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-CREATE TABLE `llx_ecm_document` (
+CREATE TABLE `llx_ecm_documents` (
   `rowid` int(11) NOT NULL auto_increment,
   `ref` varchar(16) NOT NULL default '',
   `filename` varchar(255) NOT NULL default '',
@@ -2258,12 +2258,12 @@ CREATE TABLE `llx_ecm_document` (
 SET character_set_client = @saved_cs_client;
 
 --
--- Dumping data for table `llx_ecm_document`
+-- Dumping data for table `llx_ecm_documents`
 --
 
-LOCK TABLES `llx_ecm_document` WRITE;
-/*!40000 ALTER TABLE `llx_ecm_document` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_ecm_document` ENABLE KEYS */;
+LOCK TABLES `llx_ecm_documents` WRITE;
+/*!40000 ALTER TABLE `llx_ecm_documents` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_ecm_documents` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
diff --git a/htdocs/install/mysql/migration/2.2.0-2.4.0.sql b/htdocs/install/mysql/migration/2.2.0-2.4.0.sql
index cd286148b3d..f70e6e565a0 100644
--- a/htdocs/install/mysql/migration/2.2.0-2.4.0.sql
+++ b/htdocs/install/mysql/migration/2.2.0-2.4.0.sql
@@ -279,7 +279,7 @@ create table llx_ecm_directories
   fk_user_m		  integer
 ) type=innodb;
 
-create table llx_ecm_document
+create table llx_ecm_documents
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(16)  NOT NULL,
diff --git a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql b/htdocs/install/mysql/migration/2.7.0-2.8.0.sql
index ce7a5fdc1fc..61f8b4f8fa0 100755
--- a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql
+++ b/htdocs/install/mysql/migration/2.7.0-2.8.0.sql
@@ -22,7 +22,8 @@ ALTER TABLE llx_element_element CHANGE targetid fk_target integer NOT NULL;
 ALTER TABLE llx_element_element ADD UNIQUE INDEX idx_element_element_idx1 (fk_source, sourcetype, fk_target, targettype);
 ALTER TABLE llx_element_element ADD INDEX idx_element_element_fk_target (fk_target);
 
+ALTER TABLE llx_ecm_document RENAME TO llx_ecm_documents;
 ALTER TABLE llx_ecm_documents ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_ecm_documents ADD COLUMN crc varchar(32) NOT NULL DEFAULT '' AFTER private;
-ALTER TABLE llx_ecm_documents ADD COLUMN key varchar(50) NOT NULL DEFAULT '' AFTER crc;
-ALTER TABLE llx_ecm_documents ADD COLUMN cipher varchar(50) NOT NULL DEFAULT 'twofish' AFTER key;
\ No newline at end of file
+ALTER TABLE llx_ecm_documents ADD COLUMN crc varchar(32) DEFAULT '' NOT NULL AFTER private;
+ALTER TABLE llx_ecm_documents ADD COLUMN cryptkey varchar(50) DEFAULT '' NOT NULL AFTER crc;
+ALTER TABLE llx_ecm_documents ADD COLUMN cipher varchar(50) DEFAULT 'twofish' NOT NULL AFTER cryptkey;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql
index 12ef5d0ae0c..5981728a1a5 100644
--- a/htdocs/install/mysql/tables/llx_ecm_documents.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql
@@ -19,9 +19,8 @@
 -- $Id$
 -- ===================================================================
 
--- drop table llx_ecm_document;
 
-create table llx_ecm_document
+create table llx_ecm_documents
 (
   rowid           	integer AUTO_INCREMENT PRIMARY KEY,
   ref             	varchar(16)  NOT NULL,
@@ -41,6 +40,6 @@ create table llx_ecm_document
   fk_status		  	smallint DEFAULT 0,
   private         	smallint DEFAULT 0,
   crc 				varchar(32) NOT NULL DEFAULT '',  		-- checksum
-  key				varchar(50) NOT NULL DEFAULT '',  		-- crypt key
+  cryptkey			varchar(50) NOT NULL DEFAULT '',  		-- crypt key
   cipher 			varchar(50) NOT NULL DEFAULT 'twofish'  -- crypt cipher
 ) type=innodb;