kamctl: regenerated db script files

utils/kamctl/db_berkeley/kamailio/topos_t

@@ -1,10 +1,10 @@
 METADATA_COLUMNS
-id(int) rectime(datetime) a_callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str) x_tag(str)
+id(int) rectime(datetime) a_callid(str) a_uuid(str) b_uuid(str) direction(int) x_via(str) x_tag(str) x_vbranch(str)
 METADATA_KEY
-2 3 4 5 
+2 3 4 5 8
 METADATA_READONLY
 0
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|NIL|''|''|''|0|''|''
+NIL|NIL|''|''|''|0|''|''|''

utils/kamctl/db_sqlite/topos-create.sql

@@ -33,7 +33,8 @@ CREATE TABLE topos_t (
     b_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     direction INTEGER DEFAULT 0 NOT NULL,
     x_via TEXT DEFAULT '' NOT NULL,
-    x_tag VARCHAR(64) DEFAULT '' NOT NULL
+    x_tag VARCHAR(64) DEFAULT '' NOT NULL,
+    x_vbranch VARCHAR(255) DEFAULT '' NOT NULL
 );
 
 CREATE INDEX topos_t_rectime_idx ON topos_t (rectime);

utils/kamctl/db_sqlite/usrloc-create.sql

@@ -22,7 +22,8 @@ CREATE TABLE location (
     connection_id INTEGER DEFAULT 0 NOT NULL,
     keepalive INTEGER DEFAULT 0 NOT NULL,
     partition INTEGER DEFAULT 0 NOT NULL,
-    CONSTRAINT location_ruid_idx UNIQUE (ruid)
+    CONSTRAINT location_ruid_idx UNIQUE (ruid),
+    CONSTRAINT location_connection_idx UNIQUE (server_id, connection_id)
 );
 
 CREATE INDEX location_account_contact_idx ON location (username, domain, contact);

utils/kamctl/dbtext/kamailio/topos_t

@@ -1 +1 @@
-id(int,auto) rectime(int) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string) x_tag(string) 
+id(int,auto) rectime(int) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string) x_tag(string) x_vbranch(string) 

utils/kamctl/mysql/topos-create.sql

@@ -33,7 +33,8 @@ CREATE TABLE `topos_t` (
     `b_uuid` VARCHAR(255) DEFAULT '' NOT NULL,
     `direction` INT DEFAULT 0 NOT NULL,
     `x_via` MEDIUMTEXT DEFAULT '' NOT NULL,
-    `x_tag` VARCHAR(64) DEFAULT '' NOT NULL
+    `x_tag` VARCHAR(64) DEFAULT '' NOT NULL,
+    `x_vbranch` VARCHAR(255) DEFAULT '' NOT NULL
 );
 
 CREATE INDEX rectime_idx ON topos_t (`rectime`);

utils/kamctl/mysql/usrloc-create.sql

@@ -22,7 +22,8 @@ CREATE TABLE `location` (
     `connection_id` INT(11) DEFAULT 0 NOT NULL,
     `keepalive` INT(11) DEFAULT 0 NOT NULL,
     `partition` INT(11) DEFAULT 0 NOT NULL,
-    CONSTRAINT ruid_idx UNIQUE (`ruid`)
+    CONSTRAINT ruid_idx UNIQUE (`ruid`),
+    CONSTRAINT connection_idx UNIQUE (`server_id`, `connection_id`)
 );
 
 CREATE INDEX account_contact_idx ON location (`username`, `domain`, `contact`);

utils/kamctl/oracle/topos-create.sql

@@ -41,7 +41,8 @@ CREATE TABLE topos_t (
     b_uuid VARCHAR2(255) DEFAULT '',
     direction NUMBER(10) DEFAULT 0 NOT NULL,
     x_via CLOB DEFAULT '',
-    x_tag VARCHAR2(64) DEFAULT ''
+    x_tag VARCHAR2(64) DEFAULT '',
+    x_vbranch VARCHAR2(255) DEFAULT ''
 );
 
 CREATE OR REPLACE TRIGGER topos_t_tr

utils/kamctl/oracle/usrloc-create.sql

@@ -22,7 +22,8 @@ CREATE TABLE location (
     connection_id NUMBER(10) DEFAULT 0 NOT NULL,
     keepalive NUMBER(10) DEFAULT 0 NOT NULL,
     partition NUMBER(10) DEFAULT 0 NOT NULL,
-    CONSTRAINT location_ruid_idx  UNIQUE (ruid)
+    CONSTRAINT location_ruid_idx  UNIQUE (ruid),
+    CONSTRAINT location_connection_idx  UNIQUE (server_id, connection_id)
 );
 
 CREATE OR REPLACE TRIGGER location_tr

utils/kamctl/postgres/topos-create.sql

@@ -33,7 +33,8 @@ CREATE TABLE topos_t (
     b_uuid VARCHAR(255) DEFAULT '' NOT NULL,
     direction INTEGER DEFAULT 0 NOT NULL,
     x_via TEXT DEFAULT '' NOT NULL,
-    x_tag VARCHAR(64) DEFAULT '' NOT NULL
+    x_tag VARCHAR(64) DEFAULT '' NOT NULL,
+    x_vbranch VARCHAR(255) DEFAULT '' NOT NULL
 );
 
 CREATE INDEX topos_t_rectime_idx ON topos_t (rectime);

utils/kamctl/postgres/usrloc-create.sql

@@ -22,7 +22,8 @@ CREATE TABLE location (
     connection_id INTEGER DEFAULT 0 NOT NULL,
     keepalive INTEGER DEFAULT 0 NOT NULL,
     partition INTEGER DEFAULT 0 NOT NULL,
-    CONSTRAINT location_ruid_idx UNIQUE (ruid)
+    CONSTRAINT location_ruid_idx UNIQUE (ruid),
+    CONSTRAINT location_connection_idx UNIQUE (server_id, connection_id)
 );
 
 CREATE INDEX location_account_contact_idx ON location (username, domain, contact);

utils/kamctl/xhttp_pi/pi_framework.xml

@@ -784,6 +784,7 @@
 		<column><field>direction</field><type>DB1_INT</type></column>
 		<column><field>x_via</field><type>DB1_BLOB</type></column>
 		<column><field>x_tag</field><type>DB1_STR</type></column>
+		<column><field>x_vbranch</field><type>DB1_STR</type></column>
 	</db_table>
 	<!-- Declaration of uacreg table-->
 	<db_table id="uacreg">
@@ -3968,6 +3969,7 @@
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
 				<col><field>x_tag</field></col>
+				<col><field>x_vbranch</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
@@ -3981,6 +3983,7 @@
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
 				<col><field>x_tag</field></col>
+				<col><field>x_vbranch</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
@@ -3997,6 +4000,7 @@
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
 				<col><field>x_tag</field></col>
+				<col><field>x_vbranch</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>

utils/kamctl/xhttp_pi/topos-mod

@@ -98,6 +98,7 @@
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
 				<col><field>x_tag</field></col>
+				<col><field>x_vbranch</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
@@ -111,6 +112,7 @@
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
 				<col><field>x_tag</field></col>
+				<col><field>x_vbranch</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
@@ -127,6 +129,7 @@
 				<col><field>direction</field></col>
 				<col><field>x_via</field></col>
 				<col><field>x_tag</field></col>
+				<col><field>x_vbranch</field></col>
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>

utils/kamctl/xhttp_pi/topos-table

@@ -34,4 +34,5 @@
 		<column><field>direction</field><type>DB1_INT</type></column>
 		<column><field>x_via</field><type>DB1_BLOB</type></column>
 		<column><field>x_tag</field><type>DB1_STR</type></column>
+		<column><field>x_vbranch</field><type>DB1_STR</type></column>
 	</db_table>