From a4034c1d087b1c87f4dd712554a2a6f6fa184d86 Mon Sep 17 00:00:00 2001 From: Charles Chance Date: Wed, 24 Jan 2018 14:20:53 +0000 Subject: [PATCH] kamctl: regenerated db scripts to include presentity ruid column --- utils/kamctl/db_berkeley/kamailio/presentity | 4 ++-- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/presence-create.sql | 6 ++++-- utils/kamctl/dbtext/kamailio/presentity | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mongodb/kamailio/presentity.json | 7 ++++++- utils/kamctl/mongodb/kamailio/version-create.mongo | 2 +- utils/kamctl/mysql/presence-create.sql | 6 ++++-- utils/kamctl/oracle/presence-create.sql | 6 ++++-- utils/kamctl/postgres/presence-create.sql | 6 ++++-- utils/kamctl/xhttp_pi/pi_framework.xml | 4 ++++ utils/kamctl/xhttp_pi/presence-mod | 3 +++ utils/kamctl/xhttp_pi/presence-table | 1 + 13 files changed, 36 insertions(+), 15 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/presentity b/utils/kamctl/db_berkeley/kamailio/presentity index c3ffcf313b8..179b77b7c34 100644 --- a/utils/kamctl/db_berkeley/kamailio/presentity +++ b/utils/kamctl/db_berkeley/kamailio/presentity @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) username(str) domain(str) event(str) etag(str) expires(int) received_time(int) body(str) sender(str) priority(int) +id(int) username(str) domain(str) event(str) etag(str) expires(int) received_time(int) body(str) sender(str) priority(int) ruid(str) METADATA_KEY 1 2 3 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|0 +NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|0|NIL diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 98b9aeccc63..df0b4a40241 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -91,7 +91,7 @@ pdt|1 pl_pipes| pl_pipes|1 presentity| -presentity|4 +presentity|5 pua| pua|7 purplemap| diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index c4d01296a77..637ff14b62a 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -9,13 +9,15 @@ CREATE TABLE presentity ( body BLOB NOT NULL, sender VARCHAR(128) NOT NULL, priority INTEGER DEFAULT 0 NOT NULL, - CONSTRAINT presentity_presentity_idx UNIQUE (username, domain, event, etag) + ruid VARCHAR(64), + CONSTRAINT presentity_presentity_idx UNIQUE (username, domain, event, etag), + CONSTRAINT presentity_ruid_idx UNIQUE (ruid) ); CREATE INDEX presentity_presentity_expires ON presentity (expires); CREATE INDEX presentity_account_idx ON presentity (username, domain, event); -INSERT INTO version (table_name, table_version) values ('presentity','4'); +INSERT INTO version (table_name, table_version) values ('presentity','5'); CREATE TABLE active_watchers ( id INTEGER PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/presentity b/utils/kamctl/dbtext/kamailio/presentity index 106289f300e..8a353689315 100644 --- a/utils/kamctl/dbtext/kamailio/presentity +++ b/utils/kamctl/dbtext/kamailio/presentity @@ -1 +1 @@ -id(int,auto) username(string) domain(string) event(string) etag(string) expires(int) received_time(int) body(string) sender(string) priority(int) +id(int,auto) username(string) domain(string) event(string) etag(string) expires(int) received_time(int) body(string) sender(string) priority(int) ruid(string,null) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index c85eb0b55e0..c61ffc70edc 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -40,7 +40,7 @@ mtree:1 mtrees:2 pdt:1 pl_pipes:1 -presentity:4 +presentity:5 pua:7 purplemap:1 re_grp:1 diff --git a/utils/kamctl/mongodb/kamailio/presentity.json b/utils/kamctl/mongodb/kamailio/presentity.json index cab9bccc1f4..10ae833e256 100644 --- a/utils/kamctl/mongodb/kamailio/presentity.json +++ b/utils/kamctl/mongodb/kamailio/presentity.json @@ -1,6 +1,6 @@ { "name": "presentity", - "version": 4, + "version": 5, "columns": [ "id": { "type": "int", @@ -51,6 +51,11 @@ "type": "int", "default": 0, "null": false + }, + "ruid": { + "type": "string", + "default": null, + "null": true } ] } \ No newline at end of file diff --git a/utils/kamctl/mongodb/kamailio/version-create.mongo b/utils/kamctl/mongodb/kamailio/version-create.mongo index bfb16490922..ed6d9e2cfd3 100644 --- a/utils/kamctl/mongodb/kamailio/version-create.mongo +++ b/utils/kamctl/mongodb/kamailio/version-create.mongo @@ -40,7 +40,7 @@ db.getCollection("version").insert({ table_name: "mtree", table_version: NumberI db.getCollection("version").insert({ table_name: "mtrees", table_version: NumberInt(2) }); db.getCollection("version").insert({ table_name: "pdt", table_version: NumberInt(1) }); db.getCollection("version").insert({ table_name: "pl_pipes", table_version: NumberInt(1) }); -db.getCollection("version").insert({ table_name: "presentity", table_version: NumberInt(4) }); +db.getCollection("version").insert({ table_name: "presentity", table_version: NumberInt(5) }); db.getCollection("version").insert({ table_name: "pua", table_version: NumberInt(7) }); db.getCollection("version").insert({ table_name: "purplemap", table_version: NumberInt(1) }); db.getCollection("version").insert({ table_name: "re_grp", table_version: NumberInt(1) }); diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 95d85cdc198..9e7e71c138a 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -9,13 +9,15 @@ CREATE TABLE `presentity` ( `body` BLOB NOT NULL, `sender` VARCHAR(128) NOT NULL, `priority` INT(11) DEFAULT 0 NOT NULL, - CONSTRAINT presentity_idx UNIQUE (`username`, `domain`, `event`, `etag`) + `ruid` VARCHAR(64), + CONSTRAINT presentity_idx UNIQUE (`username`, `domain`, `event`, `etag`), + CONSTRAINT ruid_idx UNIQUE (`ruid`) ); CREATE INDEX presentity_expires ON presentity (`expires`); CREATE INDEX account_idx ON presentity (`username`, `domain`, `event`); -INSERT INTO version (table_name, table_version) values ('presentity','4'); +INSERT INTO version (table_name, table_version) values ('presentity','5'); CREATE TABLE `active_watchers` ( `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index f7a595dfe06..ddcf6dcb63f 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -9,7 +9,9 @@ CREATE TABLE presentity ( body BLOB, sender VARCHAR2(128), priority NUMBER(10) DEFAULT 0 NOT NULL, - CONSTRAINT presentity_presentity_idx UNIQUE (username, domain, event, etag) + ruid VARCHAR2(64), + CONSTRAINT presentity_presentity_idx UNIQUE (username, domain, event, etag), + CONSTRAINT presentity_ruid_idx UNIQUE (ruid) ); CREATE OR REPLACE TRIGGER presentity_tr @@ -23,7 +25,7 @@ BEGIN map2users('presentity'); END; CREATE INDEX presentity_presentity_expires ON presentity (expires); CREATE INDEX presentity_account_idx ON presentity (username, domain, event); -INSERT INTO version (table_name, table_version) values ('presentity','4'); +INSERT INTO version (table_name, table_version) values ('presentity','5'); CREATE TABLE active_watchers ( id NUMBER(10) PRIMARY KEY, diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 698352ca16b..2259c260a82 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -9,13 +9,15 @@ CREATE TABLE presentity ( body BYTEA NOT NULL, sender VARCHAR(128) NOT NULL, priority INTEGER DEFAULT 0 NOT NULL, - CONSTRAINT presentity_presentity_idx UNIQUE (username, domain, event, etag) + ruid VARCHAR(64), + CONSTRAINT presentity_presentity_idx UNIQUE (username, domain, event, etag), + CONSTRAINT presentity_ruid_idx UNIQUE (ruid) ); CREATE INDEX presentity_presentity_expires ON presentity (expires); CREATE INDEX presentity_account_idx ON presentity (username, domain, event); -INSERT INTO version (table_name, table_version) values ('presentity','4'); +INSERT INTO version (table_name, table_version) values ('presentity','5'); CREATE TABLE active_watchers ( id SERIAL PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml index 486d8d6c1ac..2987ec8c4c6 100644 --- a/utils/kamctl/xhttp_pi/pi_framework.xml +++ b/utils/kamctl/xhttp_pi/pi_framework.xml @@ -507,6 +507,7 @@ bodyDB1_BLOB senderDB1_STR priorityDB1_INT + ruidDB1_STR @@ -2970,6 +2971,7 @@ body sender priority + ruid add @@ -2985,6 +2987,7 @@ body sender priority + ruid update @@ -3003,6 +3006,7 @@ body sender priority + ruid delete diff --git a/utils/kamctl/xhttp_pi/presence-mod b/utils/kamctl/xhttp_pi/presence-mod index f2b2f607ff6..59a58fa07ab 100644 --- a/utils/kamctl/xhttp_pi/presence-mod +++ b/utils/kamctl/xhttp_pi/presence-mod @@ -14,6 +14,7 @@ body sender priority + ruid add @@ -29,6 +30,7 @@ body sender priority + ruid update @@ -47,6 +49,7 @@ body sender priority + ruid delete diff --git a/utils/kamctl/xhttp_pi/presence-table b/utils/kamctl/xhttp_pi/presence-table index 450c24c996d..b76ce885361 100644 --- a/utils/kamctl/xhttp_pi/presence-table +++ b/utils/kamctl/xhttp_pi/presence-table @@ -12,6 +12,7 @@ bodyDB1_BLOB senderDB1_STR priorityDB1_INT + ruidDB1_STR