Procházet zdrojové kódy

lib/srdb1: allow null for instance column in location

Daniel-Constantin Mierla před 13 roky
rodič
revize
fc7090be62

+ 2 - 1
lib/srdb1/schema/aliases.xml

@@ -166,7 +166,8 @@
         <name>instance</name>
         <name>instance</name>
         <type>string</type>
         <type>string</type>
         <size>&hf_len;</size>
         <size>&hf_len;</size>
-        <default/>
+        <null/>
+        <default><null/></default>
         <description>The value of SIP instance parameter for GRUU.</description>
         <description>The value of SIP instance parameter for GRUU.</description>
     </column>
     </column>
 
 

+ 2 - 1
lib/srdb1/schema/location.xml

@@ -166,7 +166,8 @@
         <name>instance</name>
         <name>instance</name>
         <type>string</type>
         <type>string</type>
         <size>&hf_len;</size>
         <size>&hf_len;</size>
-        <default/>
+        <null/>
+        <default><null/></default>
         <description>The value of SIP instance parameter for GRUU.</description>
         <description>The value of SIP instance parameter for GRUU.</description>
     </column>
     </column>
 
 

+ 1 - 1
utils/kamctl/db_berkeley/kamailio/aliases

@@ -7,4 +7,4 @@ METADATA_READONLY
 METADATA_LOGFLAGS
 METADATA_LOGFLAGS
 0
 0
 METADATA_DEFAULTS
 METADATA_DEFAULTS
-NIL|''|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|''
+NIL|''|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL

+ 1 - 1
utils/kamctl/db_berkeley/kamailio/location

@@ -7,4 +7,4 @@ METADATA_READONLY
 METADATA_LOGFLAGS
 METADATA_LOGFLAGS
 0
 0
 METADATA_DEFAULTS
 METADATA_DEFAULTS
-NIL|''|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|''
+NIL|''|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL

+ 1 - 1
utils/kamctl/db_sqlite/registrar-create.sql

@@ -17,7 +17,7 @@ CREATE TABLE aliases (
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     methods INTEGER DEFAULT NULL,
     methods INTEGER DEFAULT NULL,
-    instance VARCHAR(255) DEFAULT '' NOT NULL
+    instance VARCHAR(255) DEFAULT NULL
 );
 );
 
 
 CREATE INDEX aliases_alias_idx ON aliases (username, domain, contact);
 CREATE INDEX aliases_alias_idx ON aliases (username, domain, contact);

+ 1 - 1
utils/kamctl/db_sqlite/usrloc-create.sql

@@ -17,7 +17,7 @@ CREATE TABLE location (
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     methods INTEGER DEFAULT NULL,
     methods INTEGER DEFAULT NULL,
-    instance VARCHAR(255) DEFAULT '' NOT NULL
+    instance VARCHAR(255) DEFAULT NULL
 );
 );
 
 
 CREATE INDEX location_account_contact_idx ON location (username, domain, contact);
 CREATE INDEX location_account_contact_idx ON location (username, domain, contact);

+ 1 - 1
utils/kamctl/dbtext/kamailio/aliases

@@ -1 +1 @@
-id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string) 
+id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string,null) 

+ 1 - 1
utils/kamctl/dbtext/kamailio/location

@@ -1 +1 @@
-id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string) 
+id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string,null) 

+ 1 - 1
utils/kamctl/mysql/registrar-create.sql

@@ -17,7 +17,7 @@ CREATE TABLE aliases (
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     methods INT(11) DEFAULT NULL,
     methods INT(11) DEFAULT NULL,
-    instance VARCHAR(255) DEFAULT '' NOT NULL
+    instance VARCHAR(255) DEFAULT NULL
 ) ENGINE=MyISAM;
 ) ENGINE=MyISAM;
 
 
 CREATE INDEX alias_idx ON aliases (username, domain, contact);
 CREATE INDEX alias_idx ON aliases (username, domain, contact);

+ 1 - 1
utils/kamctl/mysql/usrloc-create.sql

@@ -17,7 +17,7 @@ CREATE TABLE location (
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     methods INT(11) DEFAULT NULL,
     methods INT(11) DEFAULT NULL,
-    instance VARCHAR(255) DEFAULT '' NOT NULL
+    instance VARCHAR(255) DEFAULT NULL
 ) ENGINE=MyISAM;
 ) ENGINE=MyISAM;
 
 
 CREATE INDEX account_contact_idx ON location (username, domain, contact);
 CREATE INDEX account_contact_idx ON location (username, domain, contact);

+ 1 - 1
utils/kamctl/oracle/registrar-create.sql

@@ -17,7 +17,7 @@ CREATE TABLE aliases (
     user_agent VARCHAR2(255) DEFAULT '',
     user_agent VARCHAR2(255) DEFAULT '',
     socket VARCHAR2(64) DEFAULT NULL,
     socket VARCHAR2(64) DEFAULT NULL,
     methods NUMBER(10) DEFAULT NULL,
     methods NUMBER(10) DEFAULT NULL,
-    instance VARCHAR2(255) DEFAULT ''
+    instance VARCHAR2(255) DEFAULT NULL
 );
 );
 
 
 CREATE OR REPLACE TRIGGER aliases_tr
 CREATE OR REPLACE TRIGGER aliases_tr

+ 1 - 1
utils/kamctl/oracle/usrloc-create.sql

@@ -17,7 +17,7 @@ CREATE TABLE location (
     user_agent VARCHAR2(255) DEFAULT '',
     user_agent VARCHAR2(255) DEFAULT '',
     socket VARCHAR2(64) DEFAULT NULL,
     socket VARCHAR2(64) DEFAULT NULL,
     methods NUMBER(10) DEFAULT NULL,
     methods NUMBER(10) DEFAULT NULL,
-    instance VARCHAR2(255) DEFAULT ''
+    instance VARCHAR2(255) DEFAULT NULL
 );
 );
 
 
 CREATE OR REPLACE TRIGGER location_tr
 CREATE OR REPLACE TRIGGER location_tr

+ 1 - 1
utils/kamctl/postgres/registrar-create.sql

@@ -17,7 +17,7 @@ CREATE TABLE aliases (
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     methods INTEGER DEFAULT NULL,
     methods INTEGER DEFAULT NULL,
-    instance VARCHAR(255) DEFAULT '' NOT NULL
+    instance VARCHAR(255) DEFAULT NULL
 );
 );
 
 
 CREATE INDEX aliases_alias_idx ON aliases (username, domain, contact);
 CREATE INDEX aliases_alias_idx ON aliases (username, domain, contact);

+ 1 - 1
utils/kamctl/postgres/usrloc-create.sql

@@ -17,7 +17,7 @@ CREATE TABLE location (
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     user_agent VARCHAR(255) DEFAULT '' NOT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     socket VARCHAR(64) DEFAULT NULL,
     methods INTEGER DEFAULT NULL,
     methods INTEGER DEFAULT NULL,
-    instance VARCHAR(255) DEFAULT '' NOT NULL
+    instance VARCHAR(255) DEFAULT NULL
 );
 );
 
 
 CREATE INDEX location_account_contact_idx ON location (username, domain, contact);
 CREATE INDEX location_account_contact_idx ON location (username, domain, contact);