From 4295f7977a5696be9f381058cc2dcdbb6d6af3d6 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 21 Apr 2015 16:15:19 +0200 Subject: [PATCH 1/4] lib/srdb1/schema: fix defaults acc_cdrs introduced by 045e2f5 --- lib/srdb1/schema/acc_cdrs.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/srdb1/schema/acc_cdrs.xml b/lib/srdb1/schema/acc_cdrs.xml index 84bb678fa98..1fe7447cd03 100644 --- a/lib/srdb1/schema/acc_cdrs.xml +++ b/lib/srdb1/schema/acc_cdrs.xml @@ -30,14 +30,14 @@ start_time datetime Start date and time - + 2000-01-01 00:00:00 end_time datetime End date and time - + 2000-01-01 00:00:00 @@ -45,7 +45,7 @@ float 10,3 Duration - + 0 From b847ff224ac8e738e07f9631cb7ba27091d9b22b Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 21 Apr 2015 16:18:39 +0200 Subject: [PATCH 2/4] kamctl: upgrade schema for acc --- utils/kamctl/db_berkeley/kamailio/acc_cdrs | 2 +- utils/kamctl/db_sqlite/acc-create.sql | 6 +++--- utils/kamctl/mysql/acc-create.sql | 6 +++--- utils/kamctl/oracle/acc-create.sql | 6 +++--- utils/kamctl/postgres/acc-create.sql | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/acc_cdrs b/utils/kamctl/db_berkeley/kamailio/acc_cdrs index 8eb3cbbb5ac..57ab533c9e7 100644 --- a/utils/kamctl/db_berkeley/kamailio/acc_cdrs +++ b/utils/kamctl/db_berkeley/kamailio/acc_cdrs @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|'' +NIL|'2000-01-01 00:00:00'|'2000-01-01 00:00:00'|0 diff --git a/utils/kamctl/db_sqlite/acc-create.sql b/utils/kamctl/db_sqlite/acc-create.sql index d27d3076f61..60b4193f14c 100644 --- a/utils/kamctl/db_sqlite/acc-create.sql +++ b/utils/kamctl/db_sqlite/acc-create.sql @@ -15,9 +15,9 @@ CREATE INDEX acc_callid_idx ON acc (callid); INSERT INTO version (table_name, table_version) values ('acc_cdrs','2'); CREATE TABLE acc_cdrs ( id INTEGER PRIMARY KEY NOT NULL, - start_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '' NOT NULL, - end_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '' NOT NULL, - duration REAL DEFAULT '' NOT NULL + start_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:00' NOT NULL, + end_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:00' NOT NULL, + duration REAL DEFAULT 0 NOT NULL ); CREATE INDEX acc_cdrs_start_time_idx ON acc_cdrs (start_time); diff --git a/utils/kamctl/mysql/acc-create.sql b/utils/kamctl/mysql/acc-create.sql index c088ca45a0e..0d02811dc12 100644 --- a/utils/kamctl/mysql/acc-create.sql +++ b/utils/kamctl/mysql/acc-create.sql @@ -15,9 +15,9 @@ CREATE INDEX callid_idx ON acc (callid); INSERT INTO version (table_name, table_version) values ('acc_cdrs','2'); CREATE TABLE acc_cdrs ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - start_time DATETIME DEFAULT '' NOT NULL, - end_time DATETIME DEFAULT '' NOT NULL, - duration FLOAT(10,3) DEFAULT '' NOT NULL + start_time DATETIME DEFAULT '2000-01-01 00:00:00' NOT NULL, + end_time DATETIME DEFAULT '2000-01-01 00:00:00' NOT NULL, + duration FLOAT(10,3) DEFAULT 0 NOT NULL ); CREATE INDEX start_time_idx ON acc_cdrs (start_time); diff --git a/utils/kamctl/oracle/acc-create.sql b/utils/kamctl/oracle/acc-create.sql index b84a97b3a81..2a71e852f28 100644 --- a/utils/kamctl/oracle/acc-create.sql +++ b/utils/kamctl/oracle/acc-create.sql @@ -23,9 +23,9 @@ CREATE INDEX acc_callid_idx ON acc (callid); INSERT INTO version (table_name, table_version) values ('acc_cdrs','2'); CREATE TABLE acc_cdrs ( id NUMBER(10) PRIMARY KEY, - start_time DATE DEFAULT '', - end_time DATE DEFAULT '', - duration NUMBER(10,3) DEFAULT '' + start_time DATE DEFAULT '2000-01-01 00:00:00', + end_time DATE DEFAULT '2000-01-01 00:00:00', + duration NUMBER(10,3) DEFAULT 0 NOT NULL ); CREATE OR REPLACE TRIGGER acc_cdrs_tr diff --git a/utils/kamctl/postgres/acc-create.sql b/utils/kamctl/postgres/acc-create.sql index 8ae4336c097..713514f059c 100644 --- a/utils/kamctl/postgres/acc-create.sql +++ b/utils/kamctl/postgres/acc-create.sql @@ -15,9 +15,9 @@ CREATE INDEX acc_callid_idx ON acc (callid); INSERT INTO version (table_name, table_version) values ('acc_cdrs','2'); CREATE TABLE acc_cdrs ( id SERIAL PRIMARY KEY NOT NULL, - start_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '' NOT NULL, - end_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '' NOT NULL, - duration REAL DEFAULT '' NOT NULL + start_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:00' NOT NULL, + end_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:00' NOT NULL, + duration REAL DEFAULT 0 NOT NULL ); CREATE INDEX acc_cdrs_start_time_idx ON acc_cdrs (start_time); From f5e02f7be4fcf629728254afff2e1c4c257d563c Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 21 Apr 2015 16:23:00 +0200 Subject: [PATCH 3/4] lib/srdb1/schema: silo removed BLOB/TEXT defaults From https://dev.mysql.com/doc/refman/5.0/en/blob.html "BLOB and TEXT columns cannot have DEFAULT values." --- lib/srdb1/schema/silo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/srdb1/schema/silo.xml b/lib/srdb1/schema/silo.xml index 67eeb671ad4..37021738df7 100644 --- a/lib/srdb1/schema/silo.xml +++ b/lib/srdb1/schema/silo.xml @@ -92,14 +92,14 @@ body binary - + Body of the message extra_hdrs text - + Extra headers that must be restored From a4a9b6d27ae35ee651840a683a5d70ba52ec232f Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 21 Apr 2015 16:24:02 +0200 Subject: [PATCH 4/4] kamctl: upgrade silo schema --- utils/kamctl/db_berkeley/kamailio/silo | 2 +- utils/kamctl/db_sqlite/msilo-create.sql | 4 ++-- utils/kamctl/dbtext/kamailio/silo | 2 +- utils/kamctl/mysql/msilo-create.sql | 4 ++-- utils/kamctl/oracle/msilo-create.sql | 4 ++-- utils/kamctl/postgres/msilo-create.sql | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/silo b/utils/kamctl/db_berkeley/kamailio/silo index fe5d41978ad..41ff819455c 100644 --- a/utils/kamctl/db_berkeley/kamailio/silo +++ b/utils/kamctl/db_berkeley/kamailio/silo @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|''|''|0|0|0|'text/plain'|''|''|''|0 +NIL|''|''|''|''|0|0|0|'text/plain'|NIL|NIL|''|0 diff --git a/utils/kamctl/db_sqlite/msilo-create.sql b/utils/kamctl/db_sqlite/msilo-create.sql index af2fdaa35dd..693955a2e33 100644 --- a/utils/kamctl/db_sqlite/msilo-create.sql +++ b/utils/kamctl/db_sqlite/msilo-create.sql @@ -9,8 +9,8 @@ CREATE TABLE silo ( exp_time INTEGER DEFAULT 0 NOT NULL, snd_time INTEGER DEFAULT 0 NOT NULL, ctype VARCHAR(32) DEFAULT 'text/plain' NOT NULL, - body BLOB DEFAULT '' NOT NULL, - extra_hdrs TEXT DEFAULT '' NOT NULL, + body BLOB, + extra_hdrs TEXT, callid VARCHAR(128) DEFAULT '' NOT NULL, status INTEGER DEFAULT 0 NOT NULL ); diff --git a/utils/kamctl/dbtext/kamailio/silo b/utils/kamctl/dbtext/kamailio/silo index fe19d9be25e..6e1f609a2f5 100644 --- a/utils/kamctl/dbtext/kamailio/silo +++ b/utils/kamctl/dbtext/kamailio/silo @@ -1 +1 @@ -id(int,auto) src_addr(string) dst_addr(string) username(string) domain(string) inc_time(int) exp_time(int) snd_time(int) ctype(string) body(string) extra_hdrs(string) callid(string) status(int) +id(int,auto) src_addr(string) dst_addr(string) username(string) domain(string) inc_time(int) exp_time(int) snd_time(int) ctype(string) body(string,null) extra_hdrs(string,null) callid(string) status(int) diff --git a/utils/kamctl/mysql/msilo-create.sql b/utils/kamctl/mysql/msilo-create.sql index 58c0f5c7914..32cd4782b07 100644 --- a/utils/kamctl/mysql/msilo-create.sql +++ b/utils/kamctl/mysql/msilo-create.sql @@ -9,8 +9,8 @@ CREATE TABLE silo ( exp_time INT DEFAULT 0 NOT NULL, snd_time INT DEFAULT 0 NOT NULL, ctype VARCHAR(32) DEFAULT 'text/plain' NOT NULL, - body BLOB DEFAULT '' NOT NULL, - extra_hdrs TEXT DEFAULT '' NOT NULL, + body BLOB, + extra_hdrs TEXT, callid VARCHAR(128) DEFAULT '' NOT NULL, status INT DEFAULT 0 NOT NULL ); diff --git a/utils/kamctl/oracle/msilo-create.sql b/utils/kamctl/oracle/msilo-create.sql index 25c4293ce4e..b11a9d5fcff 100644 --- a/utils/kamctl/oracle/msilo-create.sql +++ b/utils/kamctl/oracle/msilo-create.sql @@ -9,8 +9,8 @@ CREATE TABLE silo ( exp_time NUMBER(10) DEFAULT 0 NOT NULL, snd_time NUMBER(10) DEFAULT 0 NOT NULL, ctype VARCHAR2(32) DEFAULT 'text/plain', - body BLOB DEFAULT '', - extra_hdrs CLOB DEFAULT '', + body BLOB, + extra_hdrs CLOB, callid VARCHAR2(128) DEFAULT '', status NUMBER(10) DEFAULT 0 NOT NULL ); diff --git a/utils/kamctl/postgres/msilo-create.sql b/utils/kamctl/postgres/msilo-create.sql index 9dd4deb1821..e228c99a965 100644 --- a/utils/kamctl/postgres/msilo-create.sql +++ b/utils/kamctl/postgres/msilo-create.sql @@ -9,8 +9,8 @@ CREATE TABLE silo ( exp_time INTEGER DEFAULT 0 NOT NULL, snd_time INTEGER DEFAULT 0 NOT NULL, ctype VARCHAR(32) DEFAULT 'text/plain' NOT NULL, - body BYTEA DEFAULT '' NOT NULL, - extra_hdrs TEXT DEFAULT '' NOT NULL, + body BYTEA, + extra_hdrs TEXT, callid VARCHAR(128) DEFAULT '' NOT NULL, status INTEGER DEFAULT 0 NOT NULL );