From 91dcaafcc02af38754e8ceab3f7164595975a6d7 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Tue, 29 Nov 2016 15:14:52 +0100 Subject: [PATCH] kamctl: regenerated database schema --- utils/kamctl/db_berkeley/kamailio/topos_d | 2 +- utils/kamctl/db_berkeley/kamailio/topos_t | 2 +- utils/kamctl/db_sqlite/topos-create.sql | 14 +++++++------- utils/kamctl/dbtext/kamailio/topos_d | 2 +- utils/kamctl/dbtext/kamailio/topos_t | 2 +- utils/kamctl/mysql/topos-create.sql | 14 +++++++------- utils/kamctl/oracle/topos-create.sql | 14 +++++++------- utils/kamctl/postgres/topos-create.sql | 14 +++++++------- utils/kamctl/xhttp_pi/pi_framework.xml | 3 --- 9 files changed, 32 insertions(+), 35 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/topos_d b/utils/kamctl/db_berkeley/kamailio/topos_d index 557f3810ceb..5cfb4ab630e 100644 --- a/utils/kamctl/db_berkeley/kamailio/topos_d +++ b/utils/kamctl/db_berkeley/kamailio/topos_d @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|''|''|''|0|''|''|''|''|''|''|'' +NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|NIL|NIL|NIL|0|''|''|''|''|''|''|'' diff --git a/utils/kamctl/db_berkeley/kamailio/topos_t b/utils/kamctl/db_berkeley/kamailio/topos_t index 7e1164c4dce..ff197134c29 100644 --- a/utils/kamctl/db_berkeley/kamailio/topos_t +++ b/utils/kamctl/db_berkeley/kamailio/topos_t @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|''|''|''|''|''|0|''|''|''|''|''|''|''|''|''|''|''|''|''|''|''|''|'' +NIL|NIL|''|''|''|''|''|0|NIL|''|NIL|NIL|NIL|''|''|''|''|''|''|''|''|''|''|''|'' diff --git a/utils/kamctl/db_sqlite/topos-create.sql b/utils/kamctl/db_sqlite/topos-create.sql index a74c81758d6..d36c5b62ac4 100644 --- a/utils/kamctl/db_sqlite/topos-create.sql +++ b/utils/kamctl/db_sqlite/topos-create.sql @@ -12,9 +12,9 @@ CREATE TABLE topos_d ( bs_contact VARCHAR(128) DEFAULT '' NOT NULL, a_tag VARCHAR(255) DEFAULT '' NOT NULL, b_tag VARCHAR(255) DEFAULT '' NOT NULL, - a_rr TEXT DEFAULT '' NOT NULL, - b_rr TEXT DEFAULT '' NOT NULL, - s_rr TEXT DEFAULT '' NOT NULL, + a_rr TEXT, + b_rr TEXT, + s_rr TEXT, iflags INTEGER DEFAULT 0 NOT NULL, a_uri VARCHAR(128) DEFAULT '' NOT NULL, b_uri VARCHAR(128) DEFAULT '' NOT NULL, @@ -39,11 +39,11 @@ CREATE TABLE topos_t ( a_uuid VARCHAR(255) DEFAULT '' NOT NULL, b_uuid VARCHAR(255) DEFAULT '' NOT NULL, direction INTEGER DEFAULT 0 NOT NULL, - x_via TEXT DEFAULT '' NOT NULL, + x_via TEXT, x_vbranch VARCHAR(255) DEFAULT '' NOT NULL, - x_rr TEXT DEFAULT '' NOT NULL, - y_rr TEXT DEFAULT '' NOT NULL, - s_rr TEXT DEFAULT '' NOT NULL, + x_rr TEXT, + y_rr TEXT, + s_rr TEXT, x_uri VARCHAR(128) DEFAULT '' NOT NULL, a_contact VARCHAR(128) DEFAULT '' NOT NULL, b_contact VARCHAR(128) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/topos_d b/utils/kamctl/dbtext/kamailio/topos_d index ff0cb58b6dd..aa4edb0ac14 100644 --- a/utils/kamctl/dbtext/kamailio/topos_d +++ b/utils/kamctl/dbtext/kamailio/topos_d @@ -1 +1 @@ -id(int,auto) rectime(int) s_method(string) s_cseq(string) a_callid(string) a_uuid(string) b_uuid(string) a_contact(string) b_contact(string) as_contact(string) bs_contact(string) a_tag(string) b_tag(string) a_rr(string) b_rr(string) s_rr(string) iflags(int) a_uri(string) b_uri(string) r_uri(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) +id(int,auto) rectime(int) s_method(string) s_cseq(string) a_callid(string) a_uuid(string) b_uuid(string) a_contact(string) b_contact(string) as_contact(string) bs_contact(string) a_tag(string) b_tag(string) a_rr(string,null) b_rr(string,null) s_rr(string,null) iflags(int) a_uri(string) b_uri(string) r_uri(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) diff --git a/utils/kamctl/dbtext/kamailio/topos_t b/utils/kamctl/dbtext/kamailio/topos_t index dbb28aa6113..c74edbb62a0 100644 --- a/utils/kamctl/dbtext/kamailio/topos_t +++ b/utils/kamctl/dbtext/kamailio/topos_t @@ -1 +1 @@ -id(int,auto) rectime(int) s_method(string) s_cseq(string) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string) x_vbranch(string) x_rr(string) y_rr(string) s_rr(string) x_uri(string) a_contact(string) b_contact(string) as_contact(string) bs_contact(string) x_tag(string) a_tag(string) b_tag(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) +id(int,auto) rectime(int) s_method(string) s_cseq(string) a_callid(string) a_uuid(string) b_uuid(string) direction(int) x_via(string,null) x_vbranch(string) x_rr(string,null) y_rr(string,null) s_rr(string,null) x_uri(string) a_contact(string) b_contact(string) as_contact(string) bs_contact(string) x_tag(string) a_tag(string) b_tag(string) a_srcaddr(string) b_srcaddr(string) a_socket(string) b_socket(string) diff --git a/utils/kamctl/mysql/topos-create.sql b/utils/kamctl/mysql/topos-create.sql index b3a61d3c62d..db305752c64 100644 --- a/utils/kamctl/mysql/topos-create.sql +++ b/utils/kamctl/mysql/topos-create.sql @@ -12,9 +12,9 @@ CREATE TABLE `topos_d` ( `bs_contact` VARCHAR(128) DEFAULT '' NOT NULL, `a_tag` VARCHAR(255) DEFAULT '' NOT NULL, `b_tag` VARCHAR(255) DEFAULT '' NOT NULL, - `a_rr` MEDIUMTEXT DEFAULT '' NOT NULL, - `b_rr` MEDIUMTEXT DEFAULT '' NOT NULL, - `s_rr` MEDIUMTEXT DEFAULT '' NOT NULL, + `a_rr` MEDIUMTEXT, + `b_rr` MEDIUMTEXT, + `s_rr` MEDIUMTEXT, `iflags` INT(10) UNSIGNED DEFAULT 0 NOT NULL, `a_uri` VARCHAR(128) DEFAULT '' NOT NULL, `b_uri` VARCHAR(128) DEFAULT '' NOT NULL, @@ -39,11 +39,11 @@ CREATE TABLE `topos_t` ( `a_uuid` VARCHAR(255) DEFAULT '' NOT NULL, `b_uuid` VARCHAR(255) DEFAULT '' NOT NULL, `direction` INT DEFAULT 0 NOT NULL, - `x_via` MEDIUMTEXT DEFAULT '' NOT NULL, + `x_via` MEDIUMTEXT, `x_vbranch` VARCHAR(255) DEFAULT '' NOT NULL, - `x_rr` MEDIUMTEXT DEFAULT '' NOT NULL, - `y_rr` MEDIUMTEXT DEFAULT '' NOT NULL, - `s_rr` MEDIUMTEXT DEFAULT '' NOT NULL, + `x_rr` MEDIUMTEXT, + `y_rr` MEDIUMTEXT, + `s_rr` MEDIUMTEXT, `x_uri` VARCHAR(128) DEFAULT '' NOT NULL, `a_contact` VARCHAR(128) DEFAULT '' NOT NULL, `b_contact` VARCHAR(128) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/oracle/topos-create.sql b/utils/kamctl/oracle/topos-create.sql index 5ad40c3268c..b0f0aa47d59 100644 --- a/utils/kamctl/oracle/topos-create.sql +++ b/utils/kamctl/oracle/topos-create.sql @@ -12,9 +12,9 @@ CREATE TABLE topos_d ( bs_contact VARCHAR2(128) DEFAULT '', a_tag VARCHAR2(255) DEFAULT '', b_tag VARCHAR2(255) DEFAULT '', - a_rr CLOB DEFAULT '', - b_rr CLOB DEFAULT '', - s_rr CLOB DEFAULT '', + a_rr CLOB, + b_rr CLOB, + s_rr CLOB, iflags NUMBER(10) DEFAULT 0 NOT NULL, a_uri VARCHAR2(128) DEFAULT '', b_uri VARCHAR2(128) DEFAULT '', @@ -47,11 +47,11 @@ CREATE TABLE topos_t ( a_uuid VARCHAR2(255) DEFAULT '', b_uuid VARCHAR2(255) DEFAULT '', direction NUMBER(10) DEFAULT 0 NOT NULL, - x_via CLOB DEFAULT '', + x_via CLOB, x_vbranch VARCHAR2(255) DEFAULT '', - x_rr CLOB DEFAULT '', - y_rr CLOB DEFAULT '', - s_rr CLOB DEFAULT '', + x_rr CLOB, + y_rr CLOB, + s_rr CLOB, x_uri VARCHAR2(128) DEFAULT '', a_contact VARCHAR2(128) DEFAULT '', b_contact VARCHAR2(128) DEFAULT '', diff --git a/utils/kamctl/postgres/topos-create.sql b/utils/kamctl/postgres/topos-create.sql index 1a52b33f883..d98dda3fad4 100644 --- a/utils/kamctl/postgres/topos-create.sql +++ b/utils/kamctl/postgres/topos-create.sql @@ -12,9 +12,9 @@ CREATE TABLE topos_d ( bs_contact VARCHAR(128) DEFAULT '' NOT NULL, a_tag VARCHAR(255) DEFAULT '' NOT NULL, b_tag VARCHAR(255) DEFAULT '' NOT NULL, - a_rr TEXT DEFAULT '' NOT NULL, - b_rr TEXT DEFAULT '' NOT NULL, - s_rr TEXT DEFAULT '' NOT NULL, + a_rr TEXT, + b_rr TEXT, + s_rr TEXT, iflags INTEGER DEFAULT 0 NOT NULL, a_uri VARCHAR(128) DEFAULT '' NOT NULL, b_uri VARCHAR(128) DEFAULT '' NOT NULL, @@ -39,11 +39,11 @@ CREATE TABLE topos_t ( a_uuid VARCHAR(255) DEFAULT '' NOT NULL, b_uuid VARCHAR(255) DEFAULT '' NOT NULL, direction INTEGER DEFAULT 0 NOT NULL, - x_via TEXT DEFAULT '' NOT NULL, + x_via TEXT, x_vbranch VARCHAR(255) DEFAULT '' NOT NULL, - x_rr TEXT DEFAULT '' NOT NULL, - y_rr TEXT DEFAULT '' NOT NULL, - s_rr TEXT DEFAULT '' NOT NULL, + x_rr TEXT, + y_rr TEXT, + s_rr TEXT, x_uri VARCHAR(128) DEFAULT '' NOT NULL, a_contact VARCHAR(128) DEFAULT '' NOT NULL, b_contact VARCHAR(128) DEFAULT '' NOT NULL, diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml index ddf2b2e36f9..bb5ba7e1b41 100644 --- a/utils/kamctl/xhttp_pi/pi_framework.xml +++ b/utils/kamctl/xhttp_pi/pi_framework.xml @@ -679,7 +679,6 @@ urlDB1_STR weightDB1_INT disabledDB1_INT - stampDB1_DATETIME @@ -3620,7 +3619,6 @@ url weight disabled - stamp add @@ -3631,7 +3629,6 @@ url weight disabled - stamp