[sr-dev] git:master: dbschema: dialog table structure updated

Module: sip-router Branch: master Commit: 50e3f0644b3b044f8d02e724cd1e742b88d91606 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50e3f06… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Fri Oct 1 18:15:16 2010 +0200 dbschema: dialog table structure updated - toroute column was changed in string type and renamed to toroute_name --- lib/srdb1/schema/dialog.xml | 14 ++++++++++++-- utils/kamctl/db_berkeley/kamailio/dialog | 4 ++-- utils/kamctl/db_berkeley/kamailio/version | 12 +++++++++++- utils/kamctl/dbtext/kamailio/dialog | 2 +- utils/kamctl/dbtext/kamailio/version | 7 ++++++- utils/kamctl/mysql/dialog-create.sql | 3 ++- utils/kamctl/oracle/dialog-create.sql | 3 ++- utils/kamctl/postgres/dialog-create.sql | 3 ++- 8 files changed, 38 insertions(+), 10 deletions(-) diff --git a/lib/srdb1/schema/dialog.xml b/lib/srdb1/schema/dialog.xml index 9e69cf7..1bc3807 100644 --- a/lib/srdb1/schema/dialog.xml +++ b/lib/srdb1/schema/dialog.xml @@ -9,7 +9,7 @@ <table id="dialog" xmlns:db="http://docbook.org/ns/docbook"> <name>dialog</name> - <version>4</version> + <version>5</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Persistent dialog information for the dialog module. More @@ -181,7 +181,17 @@ <type>unsigned int</type> <size>10</size> <default>0</default> - <description>The route to be executed at dialog timeout. + <description>The ID of route to be executed at dialog timeout (ignored from v3.1, + using instead toroute_name). + </description> + </column> + + <column> + <name>toroute_name</name> + <type>string</type> + <size>32</size> + <null/> + <description>The name of route to be executed at dialog timeout. </description> </column> diff --git a/utils/kamctl/db_berkeley/kamailio/dialog b/utils/kamctl/db_berkeley/kamailio/dialog index 0a1420c..8eb740b 100644 --- a/utils/kamctl/db_berkeley/kamailio/dialog +++ b/utils/kamctl/db_berkeley/kamailio/dialog @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) hash_entry(int) hash_id(int) callid(str) from_uri(str) from_tag(str) to_uri(str) to_tag(str) caller_cseq(str) callee_cseq(str) caller_route_set(str) callee_route_set(str) caller_contact(str) callee_contact(str) caller_sock(str) callee_sock(str) state(int) start_time(int) timeout(int) sflags(int) toroute(int) req_uri(str) +id(int) hash_entry(int) hash_id(int) callid(str) from_uri(str) from_tag(str) to_uri(str) to_tag(str) caller_cseq(str) callee_cseq(str) caller_route_set(str) callee_route_set(str) caller_contact(str) callee_contact(str) caller_sock(str) callee_sock(str) state(int) start_time(int) timeout(int) sflags(int) toroute(int) toroute_name(str) req_uri(str) METADATA_KEY 1 2 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|0|0|0|NIL +NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|0|0|0|NIL|NIL diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 93da593..93e3eb1 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -27,7 +27,7 @@ cpl|1 dbaliases| dbaliases|1 dialog| -dialog|4 +dialog|5 dialplan| dialplan|1 dispatcher| @@ -60,12 +60,20 @@ imc_rooms| imc_rooms|1 METADATA_DEFAULTS NIL|NIL|NULL|NULL|NIL|NIL +lcr_gw| +lcr_gw|1 +lcr_rule| +lcr_rule|1 +lcr_rule_target| +lcr_rule_target|1 location| location|1004 matrix| matrix|1 missed_calls| missed_calls|3 +mtree| +mtree|1 pdt| pdt|1 presentity| @@ -90,6 +98,8 @@ subscriber| subscriber|6 trusted| trusted|5 +uacreg| +uacreg|1 uri| uri|1 userblacklist| diff --git a/utils/kamctl/dbtext/kamailio/dialog b/utils/kamctl/dbtext/kamailio/dialog index 0b852ca..f58f905 100644 --- a/utils/kamctl/dbtext/kamailio/dialog +++ b/utils/kamctl/dbtext/kamailio/dialog @@ -1 +1 @@ -id(int,auto) hash_entry(int) hash_id(int) callid(string) from_uri(string) from_tag(string) to_uri(string) to_tag(string) caller_cseq(string) callee_cseq(string) caller_route_set(string,null) callee_route_set(string,null) caller_contact(string) callee_contact(string) caller_sock(string) callee_sock(string) state(int) start_time(int) timeout(int) sflags(int) toroute(int) req_uri(string) +id(int,auto) hash_entry(int) hash_id(int) callid(string) from_uri(string) from_tag(string) to_uri(string) to_tag(string) caller_cseq(string) callee_cseq(string) caller_route_set(string,null) callee_route_set(string,null) caller_contact(string) callee_contact(string) caller_sock(string) callee_sock(string) state(int) start_time(int) timeout(int) sflags(int) toroute(int) toroute_name(string,null) req_uri(string) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index b80c2e7..60a7a5f 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -8,7 +8,7 @@ carrier_name:1 carrierroute:3 cpl:1 dbaliases:1 -dialog:4 +dialog:5 dialplan:1 dispatcher:4 domain:1 @@ -25,9 +25,13 @@ 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_rule:1 +lcr_rule_target:1 location:1004 matrix:1 missed_calls:3 +mtree:1 pdt:1 presentity:3 pua:6 @@ -40,6 +44,7 @@ sip_trace:2 speed_dial:2 subscriber:6 trusted:5 +uacreg:1 uri:1 userblacklist:1 usr_preferences:2 diff --git a/utils/kamctl/mysql/dialog-create.sql b/utils/kamctl/mysql/dialog-create.sql index b89f3a3..77ba968 100644 --- a/utils/kamctl/mysql/dialog-create.sql +++ b/utils/kamctl/mysql/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','4'); +INSERT INTO version (table_name, table_version) values ('dialog','5'); CREATE TABLE dialog ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, hash_entry INT(10) UNSIGNED NOT NULL, @@ -21,6 +21,7 @@ CREATE TABLE dialog ( timeout INT(10) UNSIGNED DEFAULT 0 NOT NULL, sflags INT(10) UNSIGNED DEFAULT 0 NOT NULL, toroute INT(10) UNSIGNED DEFAULT 0 NOT NULL, + toroute_name VARCHAR(32), req_uri VARCHAR(128) NOT NULL ) ENGINE=MyISAM; diff --git a/utils/kamctl/oracle/dialog-create.sql b/utils/kamctl/oracle/dialog-create.sql index 4911fa1..f06cbc4 100644 --- a/utils/kamctl/oracle/dialog-create.sql +++ b/utils/kamctl/oracle/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','4'); +INSERT INTO version (table_name, table_version) values ('dialog','5'); CREATE TABLE dialog ( id NUMBER(10) PRIMARY KEY, hash_entry NUMBER(10), @@ -21,6 +21,7 @@ CREATE TABLE dialog ( timeout NUMBER(10) DEFAULT 0 NOT NULL, sflags NUMBER(10) DEFAULT 0 NOT NULL, toroute NUMBER(10) DEFAULT 0 NOT NULL, + toroute_name VARCHAR2(32), req_uri VARCHAR2(128) ); diff --git a/utils/kamctl/postgres/dialog-create.sql b/utils/kamctl/postgres/dialog-create.sql index 90faadf..3ee4d2e 100644 --- a/utils/kamctl/postgres/dialog-create.sql +++ b/utils/kamctl/postgres/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','4'); +INSERT INTO version (table_name, table_version) values ('dialog','5'); CREATE TABLE dialog ( id SERIAL PRIMARY KEY NOT NULL, hash_entry INTEGER NOT NULL, @@ -21,6 +21,7 @@ CREATE TABLE dialog ( timeout INTEGER DEFAULT 0 NOT NULL, sflags INTEGER DEFAULT 0 NOT NULL, toroute INTEGER DEFAULT 0 NOT NULL, + toroute_name VARCHAR(32), req_uri VARCHAR(128) NOT NULL );