Module: sip-router Branch: master Commit: 9a7639cad604640028b930f3e4fb1242ee804499 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a7639c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Mar 29 15:57:43 2011 +0200 db1: update database scheme files after lcr extension (commit 8c0501bfaa27acab9721953) --- utils/kamctl/db_berkeley/kamailio/lcr_gw | 6 ++---- utils/kamctl/db_berkeley/kamailio/lcr_rule | 2 -- utils/kamctl/db_berkeley/kamailio/lcr_rule_target | 2 -- utils/kamctl/db_berkeley/kamailio/version | 6 +----- utils/kamctl/dbtext/kamailio/lcr_gw | 3 +-- utils/kamctl/dbtext/kamailio/lcr_rule | 1 - utils/kamctl/dbtext/kamailio/lcr_rule_target | 1 - utils/kamctl/dbtext/kamailio/version | 4 +--- utils/kamctl/mysql/lcr-create.sql | 5 +++-- utils/kamctl/oracle/lcr-create.sql | 5 +++-- utils/kamctl/postgres/lcr-create.sql | 5 +++-- 11 files changed, 14 insertions(+), 26 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/lcr_gw b/utils/kamctl/db_berkeley/kamailio/lcr_gw index 00df7e4..dd971d1 100644 --- a/utils/kamctl/db_berkeley/kamailio/lcr_gw +++ b/utils/kamctl/db_berkeley/kamailio/lcr_gw @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) lcr_id(int) gw_name(str) ip_addr(str) hostname(str) port(int) params(str) uri_scheme(int) transport(int) strip(int) tag(str) flags(int) defunct(int) +id(int) lcr_id(int) gw_name(str) ip_addr(str) hostname(str) port(int) params(str) uri_scheme(int) transport(int) strip(int) prefix(str) tag(str) flags(int) defunct(int) METADATA_KEY 2 METADATA_READONLY @@ -7,6 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NULL|0|NULL -lcr_gw| -lcr_gw|1 +NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NULL|NULL|0|NULL diff --git a/utils/kamctl/db_berkeley/kamailio/lcr_rule b/utils/kamctl/db_berkeley/kamailio/lcr_rule index dd53806..99a12cf 100644 --- a/utils/kamctl/db_berkeley/kamailio/lcr_rule +++ b/utils/kamctl/db_berkeley/kamailio/lcr_rule @@ -8,5 +8,3 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|NIL|NULL|NULL|0|1 -lcr_rule| -lcr_rule|1 diff --git a/utils/kamctl/db_berkeley/kamailio/lcr_rule_target b/utils/kamctl/db_berkeley/kamailio/lcr_rule_target index 927e537..cffb6eb 100644 --- a/utils/kamctl/db_berkeley/kamailio/lcr_rule_target +++ b/utils/kamctl/db_berkeley/kamailio/lcr_rule_target @@ -8,5 +8,3 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|NIL|NIL|NIL|NIL|1 -lcr_rule_target| -lcr_rule_target|1 diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 93e3eb1..28d3bba 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -50,18 +50,14 @@ globalblacklist| globalblacklist|1 grp| grp|2 -METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NULL|NIL|0|NULL htable| htable|1 imc_members| imc_members|1 imc_rooms| imc_rooms|1 -METADATA_DEFAULTS -NIL|NIL|NULL|NULL|NIL|NIL lcr_gw| -lcr_gw|1 +lcr_gw|2 lcr_rule| lcr_rule|1 lcr_rule_target| diff --git a/utils/kamctl/dbtext/kamailio/lcr_gw b/utils/kamctl/dbtext/kamailio/lcr_gw index 71f1fb9..f4b491f 100644 --- a/utils/kamctl/dbtext/kamailio/lcr_gw +++ b/utils/kamctl/dbtext/kamailio/lcr_gw @@ -1,2 +1 @@ -id(int,auto) lcr_id(int) gw_name(string,null) ip_addr(string,null) hostname(string,null) port(int,null) params(string,null) uri_scheme(int,null) transport(int,null) strip(int,null) tag(string,null) flags(int) defunct(int,null) -lcr_gw:1 +id(int,auto) lcr_id(int) gw_name(string,null) ip_addr(string,null) hostname(string,null) port(int,null) params(string,null) uri_scheme(int,null) transport(int,null) strip(int,null) prefix(string,null) tag(string,null) flags(int) defunct(int,null) diff --git a/utils/kamctl/dbtext/kamailio/lcr_rule b/utils/kamctl/dbtext/kamailio/lcr_rule index 483ce58..f1dcabd 100644 --- a/utils/kamctl/dbtext/kamailio/lcr_rule +++ b/utils/kamctl/dbtext/kamailio/lcr_rule @@ -1,2 +1 @@ id(int,auto) lcr_id(int) prefix(string,null) from_uri(string,null) stopper(int) enabled(int) -lcr_rule:1 diff --git a/utils/kamctl/dbtext/kamailio/lcr_rule_target b/utils/kamctl/dbtext/kamailio/lcr_rule_target index d72e6f0..54dedd8 100644 --- a/utils/kamctl/dbtext/kamailio/lcr_rule_target +++ b/utils/kamctl/dbtext/kamailio/lcr_rule_target @@ -1,2 +1 @@ id(int,auto) lcr_id(int) rule_id(int) gw_id(int) priority(int) weight(int) -lcr_rule_target:1 diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 60a7a5f..0b9aad0 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -20,12 +20,10 @@ dr_gw_lists:1 dr_rules:3 globalblacklist:1 grp:2 -id(int,auto) lcr_id(int) gw_name(string) grp_id(int) ip_addr(string) hostname(string,null) port(int,null) uri_scheme(int,null) transport(int,null) strip(int,null) tag(string,null) weight(int,null) flags(int) defunct(int,null) htable:1 imc_members:1 imc_rooms:1 -id(int,auto) lcr_id(int) prefix(string,null) from_uri(string,null) grp_id(int) priority(int) -lcr_gw:1 +lcr_gw:2 lcr_rule:1 lcr_rule_target:1 location:1004 diff --git a/utils/kamctl/mysql/lcr-create.sql b/utils/kamctl/mysql/lcr-create.sql index fbad865..0c23051 100644 --- a/utils/kamctl/mysql/lcr-create.sql +++ b/utils/kamctl/mysql/lcr-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('lcr_gw','1'); +INSERT INTO version (table_name, table_version) values ('lcr_gw','2'); CREATE TABLE lcr_gw ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, lcr_id SMALLINT UNSIGNED NOT NULL, @@ -10,7 +10,8 @@ CREATE TABLE lcr_gw ( uri_scheme TINYINT UNSIGNED, transport TINYINT UNSIGNED, strip TINYINT UNSIGNED, - tag VARCHAR(16) DEFAULT NULL, + prefix VARCHAR(16) DEFAULT NULL, + tag VARCHAR(64) DEFAULT NULL, flags INT UNSIGNED DEFAULT 0 NOT NULL, defunct INT UNSIGNED DEFAULT NULL, CONSTRAINT lcr_id_ip_addr_port_hostname_idx UNIQUE (lcr_id, ip_addr, port, hostname) diff --git a/utils/kamctl/oracle/lcr-create.sql b/utils/kamctl/oracle/lcr-create.sql index b072818..89e9bbc 100644 --- a/utils/kamctl/oracle/lcr-create.sql +++ b/utils/kamctl/oracle/lcr-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('lcr_gw','1'); +INSERT INTO version (table_name, table_version) values ('lcr_gw','2'); CREATE TABLE lcr_gw ( id NUMBER(10) PRIMARY KEY, lcr_id NUMBER(5), @@ -10,7 +10,8 @@ CREATE TABLE lcr_gw ( uri_scheme NUMBER(5), transport NUMBER(5), strip NUMBER(5), - tag VARCHAR2(16) DEFAULT NULL, + prefix VARCHAR2(16) DEFAULT NULL, + tag VARCHAR2(64) DEFAULT NULL, flags NUMBER(10) DEFAULT 0 NOT NULL, defunct NUMBER(10) DEFAULT NULL, CONSTRAINT ORA_lcr_id_ip_addr_port_hostname_idx UNIQUE (lcr_id, ip_addr, port, hostname) diff --git a/utils/kamctl/postgres/lcr-create.sql b/utils/kamctl/postgres/lcr-create.sql index 0382e69..714615f 100644 --- a/utils/kamctl/postgres/lcr-create.sql +++ b/utils/kamctl/postgres/lcr-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('lcr_gw','1'); +INSERT INTO version (table_name, table_version) values ('lcr_gw','2'); CREATE TABLE lcr_gw ( id SERIAL PRIMARY KEY NOT NULL, lcr_id SMALLINT NOT NULL, @@ -10,7 +10,8 @@ CREATE TABLE lcr_gw ( uri_scheme SMALLINT, transport SMALLINT, strip SMALLINT, - tag VARCHAR(16) DEFAULT NULL, + prefix VARCHAR(16) DEFAULT NULL, + tag VARCHAR(64) DEFAULT NULL, flags INTEGER DEFAULT 0 NOT NULL, defunct INTEGER DEFAULT NULL, CONSTRAINT lcr_gw_lcr_id_ip_addr_port_hostname_idx UNIQUE (lcr_id, ip_addr, port, hostname)