drouting: Change dr_rules.gwlist to NULL by default

OpenSIPS · Jan 29, 2021 · 2d9b513 · 2d9b513
1 parent a764ea3
commit 2d9b513
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/db/schema/dr_carriers.xml b/db/schema/dr_carriers.xml
@@ -41,7 +41,7 @@
 		<name>gwlist</name>
 		<type>string</type>
 		<size>255</size>
-		<description>Reference to the GWs/destinations from the list.
+		<description>A comma-separated list of GW unique IDs (e.g. GW-5).
 		</description>
 	</column>
 

diff --git a/db/schema/dr_rules.xml b/db/schema/dr_rules.xml
@@ -78,8 +78,9 @@
 		<name>gwlist</name>
 		<type>string</type>
 		<size>255</size>
-		<description>Reference to the GWs/destinations to be used when
-		rule matches.</description>
+		<null/>
+		<description>A comma-separated list of GW unique IDs (e.g. GW-5)
+			and/or hash-prefixed ("#") Carrier unique IDs (e.g. #CR-2).</description>
 	</column>
 
 	<column id="sorting_alg">

diff --git a/scripts/dbtext/opensips/dr_rules b/scripts/dbtext/opensips/dr_rules
@@ -1 +1 @@
-ruleid(int,auto) groupid(string) prefix(string) timerec(string,null) priority(int) routeid(string,null) gwlist(string) sort_alg(string) sort_profile(int,null) attrs(string,null) description(string,null) 
+ruleid(int,auto) groupid(string) prefix(string) timerec(string,null) priority(int) routeid(string,null) gwlist(string,null) sort_alg(string) sort_profile(int,null) attrs(string,null) description(string,null) 
diff --git a/scripts/mysql/drouting-create.sql b/scripts/mysql/drouting-create.sql
@@ -22,7 +22,7 @@ CREATE TABLE dr_rules (
     timerec CHAR(255) DEFAULT NULL,
     priority INT(11) DEFAULT 0 NOT NULL,
     routeid CHAR(255) DEFAULT NULL,
-    gwlist CHAR(255) NOT NULL,
+    gwlist CHAR(255),
     sort_alg CHAR(1) DEFAULT 'N' NOT NULL,
     sort_profile INT(10) UNSIGNED DEFAULT NULL,
     attrs CHAR(255) DEFAULT NULL,

diff --git a/scripts/postgres/drouting-create.sql b/scripts/postgres/drouting-create.sql
@@ -23,7 +23,7 @@ CREATE TABLE dr_rules (
     timerec VARCHAR(255) DEFAULT NULL,
     priority INTEGER DEFAULT 0 NOT NULL,
     routeid VARCHAR(255) DEFAULT NULL,
-    gwlist VARCHAR(255) NOT NULL,
+    gwlist VARCHAR(255),
     sort_alg VARCHAR(1) DEFAULT 'N' NOT NULL,
     sort_profile INTEGER DEFAULT NULL,
     attrs VARCHAR(255) DEFAULT NULL,

diff --git a/scripts/sqlite/drouting-create.sql b/scripts/sqlite/drouting-create.sql
@@ -22,7 +22,7 @@ CREATE TABLE dr_rules (
     timerec CHAR(255) DEFAULT NULL,
     priority INTEGER DEFAULT 0 NOT NULL,
     routeid CHAR(255) DEFAULT NULL,
-    gwlist CHAR(255) NOT NULL,
+    gwlist CHAR(255),
     sort_alg CHAR(1) DEFAULT 'N' NOT NULL,
     sort_profile INTEGER DEFAULT NULL,
     attrs CHAR(255) DEFAULT NULL,