domain: Bump table version (3>4); Regen DB schemas

liviuchircu · liviuchircu · commit 7223b8403f1c · 2025-05-20T16:20:33.000+03:00
diff --git a/db/schema/domain.xml b/db/schema/domain.xml
@@ -9,7 +9,7 @@
 
 <table id="domain" xmlns:db="http://docbook.org/ns/docbook">
     <name>domain</name>
-    <version>3</version>
+    <version>4</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
         <db:para>This table is used by the domain module to determine if a host part of a URI is "local" or not. More information about the domain module can be found at: &OPENSIPS_MOD_DOC;domain.html
diff --git a/modules/domain/domain.c b/modules/domain/domain.c
@@ -39,7 +39,7 @@
 #include "../../str.h"
 #include "../../name_alias.h"
 
-#define DOMAIN_TABLE_VERSION 3
+#define DOMAIN_TABLE_VERSION 4
 
 static db_con_t* db_handle=0;
 static db_func_t domain_dbf;
diff --git a/scripts/db_berkeley/opensips/domain b/scripts/db_berkeley/opensips/domain
@@ -1,10 +1,10 @@
 METADATA_COLUMNS
-id(int) domain(str) attrs(str) last_modified(datetime)
+id(int) domain(str) attrs(str) accept_subdomain(int) last_modified(datetime)
 METADATA_KEY
 1 
 METADATA_READONLY
 0
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|''|NULL|'1900-01-01 00:00:01'
+NIL|''|NULL|0|'1900-01-01 00:00:01'
diff --git a/scripts/db_berkeley/opensips/dr_partitions b/scripts/db_berkeley/opensips/dr_partitions
@@ -1,10 +1,10 @@
 METADATA_COLUMNS
-id(int) partition_name(str) db_url(str) trie_table(str)
+id(int) partition_name(str) db_url(str) drd_table(str) drr_table(str) drg_table(str) drc_table(str) ruri_avp(str) gw_id_avp(str) gw_priprefix_avp(str) gw_sock_avp(str) rule_id_avp(str) rule_prefix_avp(str) carrier_id_avp(str)
 METADATA_KEY
 0 
 METADATA_READONLY
 0
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|NIL|NIL|NIL
+NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL
diff --git a/scripts/db_berkeley/opensips/trie_partitions b/scripts/db_berkeley/opensips/trie_partitions
@@ -0,0 +1,12 @@
+METADATA_COLUMNS
+id(int) partition_name(str) db_url(str) trie_table(str)
+METADATA_KEY
+0 
+METADATA_READONLY
+0
+METADATA_LOGFLAGS
+0
+METADATA_DEFAULTS
+NIL|NIL|NIL|NIL
+trie_partitions|
+trie_partitions|1
diff --git a/scripts/db_berkeley/opensips/version b/scripts/db_berkeley/opensips/version
@@ -53,7 +53,7 @@ dialplan|5
 dispatcher|
 dispatcher|9
 domain|
-domain|3
+domain|4
 domainpolicy|
 domainpolicy|3
 dr_carriers|
diff --git a/scripts/dbtext/opensips/domain b/scripts/dbtext/opensips/domain
@@ -1 +1 @@
-id(int,auto) domain(string) attrs(string,null) last_modified(int) 
+id(int,auto) domain(string) attrs(string,null) accept_subdomain(int) last_modified(int) 
diff --git a/scripts/dbtext/opensips/dr_partitions b/scripts/dbtext/opensips/dr_partitions
@@ -1 +1 @@
-id(int,auto) partition_name(string) db_url(string) trie_table(string,null) 
+id(int,auto) partition_name(string) db_url(string) drd_table(string,null) drr_table(string,null) drg_table(string,null) drc_table(string,null) ruri_avp(string,null) gw_id_avp(string,null) gw_priprefix_avp(string,null) gw_sock_avp(string,null) rule_id_avp(string,null) rule_prefix_avp(string,null) carrier_id_avp(string,null) 
diff --git a/scripts/dbtext/opensips/trie_partitions b/scripts/dbtext/opensips/trie_partitions
@@ -0,0 +1,2 @@
+id(int,auto) partition_name(string) db_url(string) trie_table(string,null) 
+trie_partitions:1
diff --git a/scripts/dbtext/opensips/version b/scripts/dbtext/opensips/version
@@ -20,7 +20,7 @@ dbaliases:2
 dialog:12
 dialplan:5
 dispatcher:9
-domain:3
+domain:4
 domainpolicy:3
 dr_carriers:3
 dr_gateways:6
diff --git a/scripts/mysql/domain-create.sql b/scripts/mysql/domain-create.sql
@@ -1,8 +1,9 @@
-INSERT INTO version (table_name, table_version) values ('domain','3');
+INSERT INTO version (table_name, table_version) values ('domain','4');
 CREATE TABLE domain (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     domain CHAR(64) DEFAULT '' NOT NULL,
     attrs CHAR(255) DEFAULT NULL,
+    accept_subdomain INT(11) UNSIGNED DEFAULT 0 NOT NULL,
     last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
     CONSTRAINT domain_idx UNIQUE (domain)
 ) ENGINE=InnoDB;
diff --git a/scripts/mysql/trie-create.sql b/scripts/mysql/trie-create.sql
@@ -6,8 +6,8 @@ CREATE TABLE trie_table (
     priority INT(11) DEFAULT 1 NOT NULL
 ) ENGINE=InnoDB;
 
-INSERT INTO version (table_name, table_version) values ('dr_partitions','1');
-CREATE TABLE dr_partitions (
+INSERT INTO version (table_name, table_version) values ('trie_partitions','1');
+CREATE TABLE trie_partitions (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     partition_name CHAR(255) NOT NULL,
     db_url CHAR(255) NOT NULL,
diff --git a/scripts/oracle/domain-create.sql b/scripts/oracle/domain-create.sql
@@ -1,8 +1,9 @@
-INSERT INTO version (table_name, table_version) values ('domain','3');
+INSERT INTO version (table_name, table_version) values ('domain','4');
 CREATE TABLE domain (
     id NUMBER(10) PRIMARY KEY,
     domain VARCHAR2(64) DEFAULT '',
     attrs VARCHAR2(255) DEFAULT NULL,
+    accept_subdomain NUMBER(10) DEFAULT 0 NOT NULL,
     last_modified DATE DEFAULT to_date('1900-01-01 00:00:01','yyyy-mm-dd hh24:mi:ss'),
     CONSTRAINT domain_domain_idx  UNIQUE (domain)
 );
diff --git a/scripts/oracle/trie-create.sql b/scripts/oracle/trie-create.sql
@@ -14,19 +14,19 @@ END trie_table_tr;
 /
 BEGIN map2users('trie_table'); END;
 /
-INSERT INTO version (table_name, table_version) values ('dr_partitions','1');
-CREATE TABLE dr_partitions (
+INSERT INTO version (table_name, table_version) values ('trie_partitions','1');
+CREATE TABLE trie_partitions (
     id NUMBER(10) PRIMARY KEY,
     partition_name VARCHAR2(255),
     db_url VARCHAR2(255),
     trie_table VARCHAR2(255)
 );
 
-CREATE OR REPLACE TRIGGER dr_partitions_tr
-before insert on dr_partitions FOR EACH ROW
+CREATE OR REPLACE TRIGGER trie_partitions_tr
+before insert on trie_partitions FOR EACH ROW
 BEGIN
   auto_id(:NEW.id);
-END dr_partitions_tr;
+END trie_partitions_tr;
 /
-BEGIN map2users('dr_partitions'); END;
+BEGIN map2users('trie_partitions'); END;
 /
diff --git a/scripts/pi_http/domain-mod b/scripts/pi_http/domain-mod
@@ -7,6 +7,7 @@
 				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>domain</field></col>
 				<col><field>attrs</field></col>
+				<col><field>accept_subdomain</field></col>
 				<col><field>last_modified</field></col>
 			</query_cols>
 		</cmd>
@@ -16,6 +17,7 @@
 			<query_cols>
 				<col><field>domain</field></col>
 				<col><field>attrs</field></col>
+				<col><field>accept_subdomain</field></col>
 				<col><field>last_modified</field></col>
 			</query_cols>
 		</cmd>
@@ -28,6 +30,7 @@
 			<query_cols>
 				<col><field>domain</field></col>
 				<col><field>attrs</field></col>
+				<col><field>accept_subdomain</field></col>
 				<col><field>last_modified</field></col>
 			</query_cols>
 		</cmd>
diff --git a/scripts/pi_http/domain-table b/scripts/pi_http/domain-table
@@ -5,5 +5,6 @@
 		<column><field>id</field><type>DB_INT</type></column>
 		<column><field>domain</field><type>DB_STR</type></column>
 		<column><field>attrs</field><type>DB_STR</type></column>
+		<column><field>accept_subdomain</field><type>DB_INT</type></column>
 		<column><field>last_modified</field><type>DB_DATETIME</type></column>
 	</db_table>
diff --git a/scripts/pi_http/pi_framework.xml b/scripts/pi_http/pi_framework.xml
@@ -468,6 +468,7 @@
 		<column><field>id</field><type>DB_INT</type></column>
 		<column><field>domain</field><type>DB_STR</type></column>
 		<column><field>attrs</field><type>DB_STR</type></column>
+		<column><field>accept_subdomain</field><type>DB_INT</type></column>
 		<column><field>last_modified</field><type>DB_DATETIME</type></column>
 	</db_table>
 	<!-- Declaration of domainpolicy table-->
@@ -1081,9 +1082,9 @@
 		<column><field>attrs</field><type>DB_STR</type></column>
 		<column><field>priority</field><type>DB_INT</type></column>
 	</db_table>
-	<!-- Declaration of dr_partitions table-->
-	<db_table id="dr_partitions">
-		<table_name>dr_partitions</table_name>
+	<!-- Declaration of trie_partitions table-->
+	<db_table id="trie_partitions">
+		<table_name>trie_partitions</table_name>
 		<db_url_id>mysql</db_url_id>
 		<column><field>id</field><type>DB_INT</type></column>
 		<column><field>partition_name</field><type>DB_STR</type></column>
@@ -2829,6 +2830,7 @@
 				<col><field>id</field><link_cmd>update</link_cmd></col>
 				<col><field>domain</field></col>
 				<col><field>attrs</field></col>
+				<col><field>accept_subdomain</field></col>
 				<col><field>last_modified</field></col>
 			</query_cols>
 		</cmd>
@@ -2838,6 +2840,7 @@
 			<query_cols>
 				<col><field>domain</field></col>
 				<col><field>attrs</field></col>
+				<col><field>accept_subdomain</field></col>
 				<col><field>last_modified</field></col>
 			</query_cols>
 		</cmd>
@@ -2850,6 +2853,7 @@
 			<query_cols>
 				<col><field>domain</field></col>
 				<col><field>attrs</field></col>
+				<col><field>accept_subdomain</field></col>
 				<col><field>last_modified</field></col>
 			</query_cols>
 		</cmd>
@@ -5280,10 +5284,10 @@
 			</clause_cols>
 		</cmd>
 	</mod>
-	<!-- dr_partitions provisionning -->
-	<mod><mod_name>dr_partitions</mod_name>
+	<!-- trie_partitions provisionning -->
+	<mod><mod_name>trie_partitions</mod_name>
 		<cmd><cmd_name>show</cmd_name>
-			<db_table_id>dr_partitions</db_table_id>
+			<db_table_id>trie_partitions</db_table_id>
 			<cmd_type>DB_QUERY</cmd_type>
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
@@ -5293,7 +5297,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
-			<db_table_id>dr_partitions</db_table_id>
+			<db_table_id>trie_partitions</db_table_id>
 			<cmd_type>DB_INSERT</cmd_type>
 			<query_cols>
 				<col><field>partition_name</field></col>
@@ -5302,7 +5306,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
-			<db_table_id>dr_partitions</db_table_id>
+			<db_table_id>trie_partitions</db_table_id>
 			<cmd_type>DB_UPDATE</cmd_type>
 			<clause_cols>
 				<col><field>id</field><operator>=</operator></col>
@@ -5314,7 +5318,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>
-			<db_table_id>dr_partitions</db_table_id>
+			<db_table_id>trie_partitions</db_table_id>
 			<cmd_type>DB_DELETE</cmd_type>
 			<clause_cols>
 				<col><field>id</field><operator>=</operator></col>
diff --git a/scripts/pi_http/trie-mod b/scripts/pi_http/trie-mod
@@ -39,10 +39,10 @@
 			</clause_cols>
 		</cmd>
 	</mod>
-	<!-- dr_partitions provisionning -->
-	<mod><mod_name>dr_partitions</mod_name>
+	<!-- trie_partitions provisionning -->
+	<mod><mod_name>trie_partitions</mod_name>
 		<cmd><cmd_name>show</cmd_name>
-			<db_table_id>dr_partitions</db_table_id>
+			<db_table_id>trie_partitions</db_table_id>
 			<cmd_type>DB_QUERY</cmd_type>
 			<query_cols>
 				<col><field>id</field><link_cmd>update</link_cmd></col>
@@ -52,7 +52,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>add</cmd_name>
-			<db_table_id>dr_partitions</db_table_id>
+			<db_table_id>trie_partitions</db_table_id>
 			<cmd_type>DB_INSERT</cmd_type>
 			<query_cols>
 				<col><field>partition_name</field></col>
@@ -61,7 +61,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>update</cmd_name>
-			<db_table_id>dr_partitions</db_table_id>
+			<db_table_id>trie_partitions</db_table_id>
 			<cmd_type>DB_UPDATE</cmd_type>
 			<clause_cols>
 				<col><field>id</field><operator>=</operator></col>
@@ -73,7 +73,7 @@
 			</query_cols>
 		</cmd>
 		<cmd><cmd_name>delete</cmd_name>
-			<db_table_id>dr_partitions</db_table_id>
+			<db_table_id>trie_partitions</db_table_id>
 			<cmd_type>DB_DELETE</cmd_type>
 			<clause_cols>
 				<col><field>id</field><operator>=</operator></col>
diff --git a/scripts/pi_http/trie-table b/scripts/pi_http/trie-table
@@ -7,9 +7,9 @@
 		<column><field>attrs</field><type>DB_STR</type></column>
 		<column><field>priority</field><type>DB_INT</type></column>
 	</db_table>
-	<!-- Declaration of dr_partitions table-->
-	<db_table id="dr_partitions">
-		<table_name>dr_partitions</table_name>
+	<!-- Declaration of trie_partitions table-->
+	<db_table id="trie_partitions">
+		<table_name>trie_partitions</table_name>
 		<db_url_id>mysql</db_url_id>
 		<column><field>id</field><type>DB_INT</type></column>
 		<column><field>partition_name</field><type>DB_STR</type></column>
diff --git a/scripts/postgres/domain-create.sql b/scripts/postgres/domain-create.sql
@@ -1,8 +1,9 @@
-INSERT INTO version (table_name, table_version) values ('domain','3');
+INSERT INTO version (table_name, table_version) values ('domain','4');
 CREATE TABLE domain (
     id SERIAL PRIMARY KEY NOT NULL,
     domain VARCHAR(64) DEFAULT '' NOT NULL,
     attrs VARCHAR(255) DEFAULT NULL,
+    accept_subdomain INTEGER DEFAULT 0 NOT NULL,
     last_modified TIMESTAMP WITHOUT TIME ZONE DEFAULT '1900-01-01 00:00:01' NOT NULL,
     CONSTRAINT domain_domain_idx UNIQUE (domain)
 );
diff --git a/scripts/postgres/trie-create.sql b/scripts/postgres/trie-create.sql
@@ -7,12 +7,12 @@ CREATE TABLE trie_table (
 );
 
 ALTER SEQUENCE trie_table_ruleid_seq MAXVALUE 2147483647 CYCLE;
-INSERT INTO version (table_name, table_version) values ('dr_partitions','1');
-CREATE TABLE dr_partitions (
+INSERT INTO version (table_name, table_version) values ('trie_partitions','1');
+CREATE TABLE trie_partitions (
     id SERIAL PRIMARY KEY NOT NULL,
     partition_name VARCHAR(255) NOT NULL,
     db_url VARCHAR(255) NOT NULL,
     trie_table VARCHAR(255)
 );
 
-ALTER SEQUENCE dr_partitions_id_seq MAXVALUE 2147483647 CYCLE;
+ALTER SEQUENCE trie_partitions_id_seq MAXVALUE 2147483647 CYCLE;
diff --git a/scripts/sqlite/domain-create.sql b/scripts/sqlite/domain-create.sql
@@ -1,8 +1,9 @@
-INSERT INTO version (table_name, table_version) values ('domain','3');
+INSERT INTO version (table_name, table_version) values ('domain','4');
 CREATE TABLE domain (
     id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
     domain CHAR(64) DEFAULT '' NOT NULL,
     attrs CHAR(255) DEFAULT NULL,
+    accept_subdomain INTEGER DEFAULT 0 NOT NULL,
     last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
     CONSTRAINT domain_domain_idx  UNIQUE (domain)
 );
diff --git a/scripts/sqlite/trie-create.sql b/scripts/sqlite/trie-create.sql
@@ -6,8 +6,8 @@ CREATE TABLE trie_table (
     priority INTEGER DEFAULT 1 NOT NULL
 );
 
-INSERT INTO version (table_name, table_version) values ('dr_partitions','1');
-CREATE TABLE dr_partitions (
+INSERT INTO version (table_name, table_version) values ('trie_partitions','1');
+CREATE TABLE trie_partitions (
     id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
     partition_name CHAR(255) NOT NULL,
     db_url CHAR(255) NOT NULL,

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`METADATA_COLUMNS`
`2`		`-id(int) domain(str) attrs(str) last_modified(datetime)`
	`2`	`+id(int) domain(str) attrs(str) accept_subdomain(int) last_modified(datetime)`
`3`	`3`	`METADATA_KEY`
`4`	`4`	`1`
`5`	`5`	`METADATA_READONLY`
`6`	`6`	`0`
`7`	`7`	`METADATA_LOGFLAGS`
`8`	`8`	`0`
`9`	`9`	`METADATA_DEFAULTS`
`10`		`-NIL\|''\|NULL\|'1900-01-01 00:00:01'`
	`10`	`+NIL\|''\|NULL\|0\|'1900-01-01 00:00:01'`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`METADATA_COLUMNS`
`2`		`-id(int) partition_name(str) db_url(str) trie_table(str)`
	`2`	`+id(int) partition_name(str) db_url(str) drd_table(str) drr_table(str) drg_table(str) drc_table(str) ruri_avp(str) gw_id_avp(str) gw_priprefix_avp(str) gw_sock_avp(str) rule_id_avp(str) rule_prefix_avp(str) carrier_id_avp(str)`
`3`	`3`	`METADATA_KEY`
`4`	`4`	`0`
`5`	`5`	`METADATA_READONLY`
`6`	`6`	`0`
`7`	`7`	`METADATA_LOGFLAGS`
`8`	`8`	`0`
`9`	`9`	`METADATA_DEFAULTS`
`10`		`-NIL\|NIL\|NIL\|NIL`
	`10`	`+NIL\|NIL\|NIL\|NIL\|NIL\|NIL\|NIL\|NIL\|NIL\|NIL\|NIL\|NIL\|NIL\|NIL`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-id(int,auto) domain(string) attrs(string,null) last_modified(int)`
	`1`	`+id(int,auto) domain(string) attrs(string,null) accept_subdomain(int) last_modified(int)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-id(int,auto) partition_name(string) db_url(string) trie_table(string,null)`
	`1`	`+id(int,auto) partition_name(string) db_url(string) drd_table(string,null) drr_table(string,null) drg_table(string,null) drc_table(string,null) ruri_avp(string,null) gw_id_avp(string,null) gw_priprefix_avp(string,null) gw_sock_avp(string,null) rule_id_avp(string,null) rule_prefix_avp(string,null) carrier_id_avp(string,null)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+id(int,auto) partition_name(string) db_url(string) trie_table(string,null)`
	`2`	`+trie_partitions:1`