From 4830cf41f7a0460c08491f0f14adf8fa84ebe639 Mon Sep 17 00:00:00 2001
From: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Sat, 14 Mar 2020 18:34:10 +0100
Subject: [PATCH] kamctl: db creation scripts regenerated

---
 utils/kamctl/db_berkeley/kamailio/version  |  8 ++---
 utils/kamctl/db_redis/kamailio/version     |  2 +-
 utils/kamctl/db_sqlite/standard-create.sql |  1 +
 utils/kamctl/dbtext/kamailio/version       |  2 +-
 utils/kamctl/mongodb/kamailio/version.json |  5 +++
 utils/kamctl/mysql/standard-create.sql     |  1 +
 utils/kamctl/oracle/standard-create.sql    |  1 +
 utils/kamctl/postgres/standard-create.sql  |  1 +
 utils/kamctl/xhttp_pi/pi_framework.xml     | 42 ++++++++++++++++------
 utils/kamctl/xhttp_pi/standard-mod         | 19 ++++++++++
 utils/kamctl/xhttp_pi/standard-table       |  1 +
 11 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version
index 22177bf84c4..5a5d5bdb6af 100644
--- a/utils/kamctl/db_berkeley/kamailio/version
+++ b/utils/kamctl/db_berkeley/kamailio/version
@@ -1,13 +1,13 @@
 METADATA_COLUMNS
-table_name(str) table_version(int)
+id(int) table_name(str) table_version(int)
 METADATA_KEY
-0 
+1 
 METADATA_READONLY
 0
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|0
+NIL|NIL|0
 version|
 version|1
 acc|
@@ -64,8 +64,6 @@ imc_members|
 imc_members|1
 imc_rooms|
 imc_rooms|1
-METADATA_DEFAULTS
-NIL|NIL|''|NIL|NIL|NULL|NULL|NULL|NULL|'2030-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'2000-01-01 00:00:01'|0|0|''|NULL|NULL|NULL
 lcr_gw|
 lcr_gw|3
 lcr_rule|
diff --git a/utils/kamctl/db_redis/kamailio/version b/utils/kamctl/db_redis/kamailio/version
index b9353c0679a..0b78f3a5113 100644
--- a/utils/kamctl/db_redis/kamailio/version
+++ b/utils/kamctl/db_redis/kamailio/version
@@ -1,2 +1,2 @@
-table_name/string,table_version/int,
+id/int,table_name/string,table_version/int,
 1
diff --git a/utils/kamctl/db_sqlite/standard-create.sql b/utils/kamctl/db_sqlite/standard-create.sql
index 0c8cc02a3b2..b11235d1a4c 100644
--- a/utils/kamctl/db_sqlite/standard-create.sql
+++ b/utils/kamctl/db_sqlite/standard-create.sql
@@ -1,4 +1,5 @@
 CREATE TABLE version (
+    id INTEGER PRIMARY KEY NOT NULL,
     table_name VARCHAR(32) NOT NULL,
     table_version INTEGER DEFAULT 0 NOT NULL,
     CONSTRAINT version_table_name_idx UNIQUE (table_name)
diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version
index 03a4501cf9b..c639c5bcd17 100644
--- a/utils/kamctl/dbtext/kamailio/version
+++ b/utils/kamctl/dbtext/kamailio/version
@@ -1,4 +1,4 @@
-table_name(string) table_version(int) 
+id(int,auto) table_name(string) table_version(int) 
 version:1
 acc:5
 acc_cdrs:2
diff --git a/utils/kamctl/mongodb/kamailio/version.json b/utils/kamctl/mongodb/kamailio/version.json
index 2caa283deee..aeda13a81cd 100644
--- a/utils/kamctl/mongodb/kamailio/version.json
+++ b/utils/kamctl/mongodb/kamailio/version.json
@@ -2,6 +2,11 @@
   "name": "version",
   "version": 1,
   "columns": [
+    "id": {
+      "type": "int",
+      "default": null,
+      "null": false
+    },
     "table_name": {
       "type": "string",
       "default": null,
diff --git a/utils/kamctl/mysql/standard-create.sql b/utils/kamctl/mysql/standard-create.sql
index ae16e0ed4e0..f41975339cf 100644
--- a/utils/kamctl/mysql/standard-create.sql
+++ b/utils/kamctl/mysql/standard-create.sql
@@ -1,4 +1,5 @@
 CREATE TABLE `version` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     `table_name` VARCHAR(32) NOT NULL,
     `table_version` INT UNSIGNED DEFAULT 0 NOT NULL,
     CONSTRAINT table_name_idx UNIQUE (`table_name`)
diff --git a/utils/kamctl/oracle/standard-create.sql b/utils/kamctl/oracle/standard-create.sql
index a6672e63b2e..e36f4205faf 100644
--- a/utils/kamctl/oracle/standard-create.sql
+++ b/utils/kamctl/oracle/standard-create.sql
@@ -1,4 +1,5 @@
 CREATE TABLE version (
+    id NUMBER(10) PRIMARY KEY,
     table_name VARCHAR2(32),
     table_version NUMBER(10) DEFAULT 0 NOT NULL,
     CONSTRAINT version_table_name_idx  UNIQUE (table_name)
diff --git a/utils/kamctl/postgres/standard-create.sql b/utils/kamctl/postgres/standard-create.sql
index 0c8cc02a3b2..5e62aa2875a 100644
--- a/utils/kamctl/postgres/standard-create.sql
+++ b/utils/kamctl/postgres/standard-create.sql
@@ -1,4 +1,5 @@
 CREATE TABLE version (
+    id SERIAL PRIMARY KEY NOT NULL,
     table_name VARCHAR(32) NOT NULL,
     table_version INTEGER DEFAULT 0 NOT NULL,
     CONSTRAINT version_table_name_idx UNIQUE (table_name)
diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml
index f53e4a14cf9..de448e3f66f 100644
--- a/utils/kamctl/xhttp_pi/pi_framework.xml
+++ b/utils/kamctl/xhttp_pi/pi_framework.xml
@@ -219,17 +219,6 @@
 		<column><field>attrs</field><type>DB1_STR</type></column>
 		<column><field>description</field><type>DB1_STR</type></column>
 	</db_table>
-	<!-- Declaration of domainpolicy table-->
-	<db_table id="domainpolicy">
-		<table_name>domainpolicy</table_name>
-		<db_url_id>mysql</db_url_id>
-		<column><field>id</field><type>DB1_INT</type></column>
-		<column><field>rule</field><type>DB1_STR</type></column>
-		<column><field>type</field><type>DB1_STR</type></column>
-		<column><field>att</field><type>DB1_STR</type></column>
-		<column><field>val</field><type>DB1_STR</type></column>
-		<column><field>description</field><type>DB1_STR</type></column>
-	</db_table>
 	<!-- Declaration of domain table-->
 	<db_table id="domain">
 		<table_name>domain</table_name>
@@ -250,6 +239,17 @@
 		<column><field>value</field><type>DB1_STR</type></column>
 		<column><field>last_modified</field><type>DB1_DATETIME</type></column>
 	</db_table>
+	<!-- Declaration of domainpolicy table-->
+	<db_table id="domainpolicy">
+		<table_name>domainpolicy</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>rule</field><type>DB1_STR</type></column>
+		<column><field>type</field><type>DB1_STR</type></column>
+		<column><field>att</field><type>DB1_STR</type></column>
+		<column><field>val</field><type>DB1_STR</type></column>
+		<column><field>description</field><type>DB1_STR</type></column>
+	</db_table>
 	<!-- Declaration of dr_gateways table-->
 	<db_table id="dr_gateways">
 		<table_name>dr_gateways</table_name>
@@ -748,6 +748,7 @@
 	<db_table id="version">
 		<table_name>version</table_name>
 		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
 		<column><field>table_name</field><type>DB1_STR</type></column>
 		<column><field>table_version</field><type>DB1_INT</type></column>
 	</db_table>
@@ -3909,6 +3910,7 @@
 			<db_table_id>version</db_table_id>
 			<cmd_type>DB1_QUERY</cmd_type>
 			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>table_name</field></col>
 				<col><field>table_version</field></col>
 			</query_cols>
@@ -3921,6 +3923,24 @@
 				<col><field>table_version</field></col>
 			</query_cols>
 		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>version</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>table_name</field></col>
+				<col><field>table_version</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>version</db_table_id>
+			<cmd_type>DB1_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
 	</mod>
 	<!-- topos_d provisionning -->
 	<mod><mod_name>topos_d</mod_name>
diff --git a/utils/kamctl/xhttp_pi/standard-mod b/utils/kamctl/xhttp_pi/standard-mod
index f3bcbf69568..11d90d2a3da 100644
--- a/utils/kamctl/xhttp_pi/standard-mod
+++ b/utils/kamctl/xhttp_pi/standard-mod
@@ -4,6 +4,7 @@
 			<db_table_id>version</db_table_id>
 			<cmd_type>DB1_QUERY</cmd_type>
 			<query_cols>
+				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>table_name</field></col>
 				<col><field>table_version</field></col>
 			</query_cols>
@@ -16,4 +17,22 @@
 				<col><field>table_version</field></col>
 			</query_cols>
 		</cmd>
+		<cmd><cmd_name>update</cmd_name>
+			<db_table_id>version</db_table_id>
+			<cmd_type>DB1_UPDATE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+			<query_cols>
+				<col><field>table_name</field></col>
+				<col><field>table_version</field></col>
+			</query_cols>
+		</cmd>
+		<cmd><cmd_name>delete</cmd_name>
+			<db_table_id>version</db_table_id>
+			<cmd_type>DB1_DELETE</cmd_type>
+			<clause_cols>
+				<col><field>id</field><operator>=</operator></col>
+			</clause_cols>
+		</cmd>
 	</mod>
diff --git a/utils/kamctl/xhttp_pi/standard-table b/utils/kamctl/xhttp_pi/standard-table
index 826ac24907a..d53453460db 100644
--- a/utils/kamctl/xhttp_pi/standard-table
+++ b/utils/kamctl/xhttp_pi/standard-table
@@ -2,6 +2,7 @@
 	<db_table id="version">
 		<table_name>version</table_name>
 		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
 		<column><field>table_name</field><type>DB1_STR</type></column>
 		<column><field>table_version</field><type>DB1_INT</type></column>
 	</db_table>