[sr-dev] git:carstenbock/ims: - renamed columns in the table to "dialog_key" and " dialog_value", key and value may be reserved keywords by the database

[Carsten Bock]

Module: sip-router
Branch: carstenbock/ims
Commit: 57ce90d509d80b0454be6ec65a7b3a22ea412e46
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=57ce90d509d80b0454be6ec65a7b3a22ea412e46

Author: Carsten Bock <carsten at bock.info>
Committer: Carsten Bock <carsten at bock.info>
Date:   Sun Jan 23 03:13:12 2011 +0100

- renamed columns in the table to "dialog_key" and "dialog_value", key and value may be reserved keywords by the database

---

 modules_k/dialog/dlg_db_handler.h             |    4 ++--
 modules_k/dialog/doc/dialog_admin.xml         |    4 ++--
 utils/kamctl/db_berkeley/kamailio/dialog_vars |    2 +-
 utils/kamctl/dbtext/kamailio/dialog_vars      |    2 +-
 utils/kamctl/mysql/dialog-create.sql          |    4 ++--
 utils/kamctl/oracle/dialog-create.sql         |    4 ++--
 utils/kamctl/postgres/dialog-create.sql       |    4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules_k/dialog/dlg_db_handler.h b/modules_k/dialog/dlg_db_handler.h
index 89e0061..89b4cc7 100644
--- a/modules_k/dialog/dlg_db_handler.h
+++ b/modules_k/dialog/dlg_db_handler.h
@@ -60,8 +60,8 @@
 
 #define VARS_HASH_ID_COL 		"hash_id"
 #define VARS_HASH_ENTRY_COL		"hash_entry"
-#define VARS_KEY_COL			"key"
-#define VARS_VALUE_COL			"value"
+#define VARS_KEY_COL			"dialog_key"
+#define VARS_VALUE_COL			"dialog_value"
 #define DIALOG_VARS_TABLE_NAME		"dialog_vars"
 #define DLG_VARS_TABLE_VERSION		1
 
diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml
index 00980d2..34ac2ac 100644
--- a/modules_k/dialog/doc/dialog_admin.xml
+++ b/modules_k/dialog/doc/dialog_admin.xml
@@ -961,7 +961,7 @@ modparam("dialog", "vars_h_entry_column", "vars_h_entry_name")
 		</para>
 		<para>
 		<emphasis>
-			Default value is <quote>key</quote>.
+			Default value is <quote>dialog_key</quote>.
 		</emphasis>
 		</para>
 		<example>
@@ -981,7 +981,7 @@ modparam("dialog", "vars_key_column", "vars_key_name")
 		</para>
 		<para>
 		<emphasis>
-			Default value is <quote>key</quote>.
+			Default value is <quote>dialog_value</quote>.
 		</emphasis>
 		</para>
 		<example>
diff --git a/utils/kamctl/db_berkeley/kamailio/dialog_vars b/utils/kamctl/db_berkeley/kamailio/dialog_vars
index 3c9ebe2..e15e813 100644
--- a/utils/kamctl/db_berkeley/kamailio/dialog_vars
+++ b/utils/kamctl/db_berkeley/kamailio/dialog_vars
@@ -1,5 +1,5 @@
 METADATA_COLUMNS
-hash_entry(int) hash_id(int) key(str) value(str)
+hash_entry(int) hash_id(int) dialog_key(str) dialog_value(str)
 METADATA_KEY
 1 2 
 METADATA_READONLY
diff --git a/utils/kamctl/dbtext/kamailio/dialog_vars b/utils/kamctl/dbtext/kamailio/dialog_vars
index 5160a40..3392a20 100644
--- a/utils/kamctl/dbtext/kamailio/dialog_vars
+++ b/utils/kamctl/dbtext/kamailio/dialog_vars
@@ -1 +1 @@
-hash_entry(int) hash_id(int) key(string) value(string)
+hash_entry(int) hash_id(int) dialog_key(string) dialog_value(string)
diff --git a/utils/kamctl/mysql/dialog-create.sql b/utils/kamctl/mysql/dialog-create.sql
index 4f4e18b..4af16b0 100644
--- a/utils/kamctl/mysql/dialog-create.sql
+++ b/utils/kamctl/mysql/dialog-create.sql
@@ -29,7 +29,7 @@ INSERT INTO version (table_name, table_version) values ('dialog_vars','1');
 CREATE TABLE dialog_vars (
     hash_entry INT(10) UNSIGNED NOT NULL,
     hash_id INT(10) UNSIGNED NOT NULL,
-    key VARCHAR(255) NOT NULL,
-    value VARCHAR(255) NOT NULL,
+    dialog_key VARCHAR(255) NOT NULL,
+    dialog_value VARCHAR(255) NOT NULL
 ) ENGINE=MyISAM;
 
diff --git a/utils/kamctl/oracle/dialog-create.sql b/utils/kamctl/oracle/dialog-create.sql
index ed2fd3f..c9c5d3a 100644
--- a/utils/kamctl/oracle/dialog-create.sql
+++ b/utils/kamctl/oracle/dialog-create.sql
@@ -39,7 +39,7 @@ INSERT INTO version (table_name, table_version) values ('dialog_vars','1');
 CREATE TABLE dialog_vars (
     hash_entry INT(10) UNSIGNED NOT NULL,
     hash_id INT(10) UNSIGNED NOT NULL,
-    key VARCHAR(255) NOT NULL,
-    value VARCHAR(255) NOT NULL,
+    dialog_key VARCHAR(255) NOT NULL,
+    dialog_value VARCHAR(255) NOT NULL,
 );
 
diff --git a/utils/kamctl/postgres/dialog-create.sql b/utils/kamctl/postgres/dialog-create.sql
index f2cdf6b..c4f7161 100644
--- a/utils/kamctl/postgres/dialog-create.sql
+++ b/utils/kamctl/postgres/dialog-create.sql
@@ -31,7 +31,7 @@ INSERT INTO version (table_name, table_version) values ('dialog_vars','1');
 CREATE TABLE dialog_vars (
     hash_entry INT(10) UNSIGNED NOT NULL,
     hash_id INT(10) UNSIGNED NOT NULL,
-    key VARCHAR(255) NOT NULL,
-    value VARCHAR(255) NOT NULL,
+    dialog_key VARCHAR(255) NOT NULL,
+    dialog_value VARCHAR(255) NOT NULL,
 );