[sr-dev] git:master: lib/srdb1: allow null for instance column in location

Module: sip-router Branch: master Commit: fc7090be626304145813e90eb6a86f2200db31f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc7090b… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Sun Apr 15 22:36:14 2012 +0200 lib/srdb1: allow null for instance column in location --- lib/srdb1/schema/aliases.xml | 3 ++- lib/srdb1/schema/location.xml | 3 ++- utils/kamctl/db_berkeley/kamailio/aliases | 2 +- utils/kamctl/db_berkeley/kamailio/location | 2 +- utils/kamctl/db_sqlite/registrar-create.sql | 2 +- utils/kamctl/db_sqlite/usrloc-create.sql | 2 +- utils/kamctl/dbtext/kamailio/aliases | 2 +- utils/kamctl/dbtext/kamailio/location | 2 +- utils/kamctl/mysql/registrar-create.sql | 2 +- utils/kamctl/mysql/usrloc-create.sql | 2 +- utils/kamctl/oracle/registrar-create.sql | 2 +- utils/kamctl/oracle/usrloc-create.sql | 2 +- utils/kamctl/postgres/registrar-create.sql | 2 +- utils/kamctl/postgres/usrloc-create.sql | 2 +- 14 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/srdb1/schema/aliases.xml b/lib/srdb1/schema/aliases.xml index 42d7353..d5bad5a 100644 --- a/lib/srdb1/schema/aliases.xml +++ b/lib/srdb1/schema/aliases.xml @@ -166,7 +166,8 @@ <name>instance</name> <type>string</type> <size>&hf_len;</size> - <default/> + <null/> + <default><null/></default> <description>The value of SIP instance parameter for GRUU.</description> </column> diff --git a/lib/srdb1/schema/location.xml b/lib/srdb1/schema/location.xml index 8446a7e..ddf0b48 100644 --- a/lib/srdb1/schema/location.xml +++ b/lib/srdb1/schema/location.xml @@ -166,7 +166,8 @@ <name>instance</name> <type>string</type> <size>&hf_len;</size> - <default/> + <null/> + <default><null/></default> <description>The value of SIP instance parameter for GRUU.</description> </column> diff --git a/utils/kamctl/db_berkeley/kamailio/aliases b/utils/kamctl/db_berkeley/kamailio/aliases index 4c52503..87bf7d5 100644 --- a/utils/kamctl/db_berkeley/kamailio/aliases +++ b/utils/kamctl/db_berkeley/kamailio/aliases @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 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 diff --git a/utils/kamctl/db_berkeley/kamailio/location b/utils/kamctl/db_berkeley/kamailio/location index 4c52503..87bf7d5 100644 --- a/utils/kamctl/db_berkeley/kamailio/location +++ b/utils/kamctl/db_berkeley/kamailio/location @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 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 diff --git a/utils/kamctl/db_sqlite/registrar-create.sql b/utils/kamctl/db_sqlite/registrar-create.sql index 12dc621..27a4d8f 100644 --- a/utils/kamctl/db_sqlite/registrar-create.sql +++ b/utils/kamctl/db_sqlite/registrar-create.sql @@ -17,7 +17,7 @@ CREATE TABLE aliases ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) 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); diff --git a/utils/kamctl/db_sqlite/usrloc-create.sql b/utils/kamctl/db_sqlite/usrloc-create.sql index e771f9c..5d80120 100644 --- a/utils/kamctl/db_sqlite/usrloc-create.sql +++ b/utils/kamctl/db_sqlite/usrloc-create.sql @@ -17,7 +17,7 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) 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); diff --git a/utils/kamctl/dbtext/kamailio/aliases b/utils/kamctl/dbtext/kamailio/aliases index 290e75a..29c4968 100644 --- a/utils/kamctl/dbtext/kamailio/aliases +++ b/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) diff --git a/utils/kamctl/dbtext/kamailio/location b/utils/kamctl/dbtext/kamailio/location index 290e75a..29c4968 100644 --- a/utils/kamctl/dbtext/kamailio/location +++ b/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) diff --git a/utils/kamctl/mysql/registrar-create.sql b/utils/kamctl/mysql/registrar-create.sql index 63f6ac5..54d143f 100644 --- a/utils/kamctl/mysql/registrar-create.sql +++ b/utils/kamctl/mysql/registrar-create.sql @@ -17,7 +17,7 @@ CREATE TABLE aliases ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INT(11) DEFAULT NULL, - instance VARCHAR(255) DEFAULT '' NOT NULL + instance VARCHAR(255) DEFAULT NULL ) ENGINE=MyISAM; CREATE INDEX alias_idx ON aliases (username, domain, contact); diff --git a/utils/kamctl/mysql/usrloc-create.sql b/utils/kamctl/mysql/usrloc-create.sql index 9223a12..3e86737 100644 --- a/utils/kamctl/mysql/usrloc-create.sql +++ b/utils/kamctl/mysql/usrloc-create.sql @@ -17,7 +17,7 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INT(11) DEFAULT NULL, - instance VARCHAR(255) DEFAULT '' NOT NULL + instance VARCHAR(255) DEFAULT NULL ) ENGINE=MyISAM; CREATE INDEX account_contact_idx ON location (username, domain, contact); diff --git a/utils/kamctl/oracle/registrar-create.sql b/utils/kamctl/oracle/registrar-create.sql index fcb2a3f..9ba6898 100644 --- a/utils/kamctl/oracle/registrar-create.sql +++ b/utils/kamctl/oracle/registrar-create.sql @@ -17,7 +17,7 @@ CREATE TABLE aliases ( user_agent VARCHAR2(255) DEFAULT '', socket VARCHAR2(64) DEFAULT NULL, methods NUMBER(10) DEFAULT NULL, - instance VARCHAR2(255) DEFAULT '' + instance VARCHAR2(255) DEFAULT NULL ); CREATE OR REPLACE TRIGGER aliases_tr diff --git a/utils/kamctl/oracle/usrloc-create.sql b/utils/kamctl/oracle/usrloc-create.sql index 1394f77..144c859 100644 --- a/utils/kamctl/oracle/usrloc-create.sql +++ b/utils/kamctl/oracle/usrloc-create.sql @@ -17,7 +17,7 @@ CREATE TABLE location ( user_agent VARCHAR2(255) DEFAULT '', socket VARCHAR2(64) DEFAULT NULL, methods NUMBER(10) DEFAULT NULL, - instance VARCHAR2(255) DEFAULT '' + instance VARCHAR2(255) DEFAULT NULL ); CREATE OR REPLACE TRIGGER location_tr diff --git a/utils/kamctl/postgres/registrar-create.sql b/utils/kamctl/postgres/registrar-create.sql index 4ce36a0..b8889a2 100644 --- a/utils/kamctl/postgres/registrar-create.sql +++ b/utils/kamctl/postgres/registrar-create.sql @@ -17,7 +17,7 @@ CREATE TABLE aliases ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) 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); diff --git a/utils/kamctl/postgres/usrloc-create.sql b/utils/kamctl/postgres/usrloc-create.sql index f4b1e82..c972d71 100644 --- a/utils/kamctl/postgres/usrloc-create.sql +++ b/utils/kamctl/postgres/usrloc-create.sql @@ -17,7 +17,7 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) 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);