From 3dbcc2ee68b16a6c7dab7c7d62cc480916fea9c8 Mon Sep 17 00:00:00 2001
From: Sergey Safarov <s.safarov@gmail.com>
Date: Tue, 6 Mar 2018 21:33:29 +0000
Subject: [PATCH] Fixed mysql db_scripts

---
 kamailio/db_scripts/create-kazoodb-sql.sh |  1 -
 kamailio/db_scripts/db_kazoo-specific     |  1 +
 kamailio/db_scripts/mysql-specific        | 21 ++++++++++++++++++---
 kamailio/db_scripts/postgres-specific     |  1 +
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/kamailio/db_scripts/create-kazoodb-sql.sh b/kamailio/db_scripts/create-kazoodb-sql.sh
index cb5a1e5..0663a0e 100755
--- a/kamailio/db_scripts/create-kazoodb-sql.sh
+++ b/kamailio/db_scripts/create-kazoodb-sql.sh
@@ -58,7 +58,6 @@ EOF
 
 sql_all_header() {
 cat << EOF
-BEGIN TRANSACTION;
 CREATE TABLE version (
     table_name VARCHAR(32) NOT NULL,
     table_version INTEGER DEFAULT 0 NOT NULL,
diff --git a/kamailio/db_scripts/db_kazoo-specific b/kamailio/db_scripts/db_kazoo-specific
index d6e0427..fa2fe2a 100644
--- a/kamailio/db_scripts/db_kazoo-specific
+++ b/kamailio/db_scripts/db_kazoo-specific
@@ -7,6 +7,7 @@ PRAGMA foreign_keys=OFF;
 PRAGMA wal=on;
 PRAGMA journal_mode=WAL;
 
+BEGIN TRANSACTION;
 EOF
 }
 
diff --git a/kamailio/db_scripts/mysql-specific b/kamailio/db_scripts/mysql-specific
index 26c3c43..cbcc993 100644
--- a/kamailio/db_scripts/mysql-specific
+++ b/kamailio/db_scripts/mysql-specific
@@ -2,6 +2,7 @@
 
 sql_db_pre_setup() {
 cat << EOF
+START TRANSACTION;
 EOF
 }
 
@@ -17,13 +18,27 @@ EOF
 
 sql_extra_tables() {
 cat << EOF
--- Please add MySQL commnad for extra tables
--- Need to add "active_watchers_log"
+CREATE TABLE active_watchers_log (
+    id SERIAL PRIMARY KEY NOT NULL,
+    presentity_uri VARCHAR(128) NOT NULL,
+    watcher_username VARCHAR(64) NOT NULL,
+    watcher_domain VARCHAR(64) NOT NULL,
+    to_user VARCHAR(64) NOT NULL,
+    to_domain VARCHAR(64) NOT NULL,
+    event VARCHAR(64) DEFAULT 'presence' NOT NULL,
+    callid VARCHAR(255) NOT NULL,
+    time INTEGER NOT NULL,
+    result INTEGER NOT NULL,
+    sent_msg BLOB NOT NULL,
+    received_msg BLOB NOT NULL,
+    user_agent VARCHAR(255) DEFAULT '' NOT NULL,
+    CONSTRAINT active_watchers_active_watchers_log_idx UNIQUE (presentity_uri, watcher_username, watcher_domain, event)
+);
 EOF
 }
 
 sql_footer() {
 cat << EOF
-ALTER TABLE location_attrs ALTER COLUMN avalue TYPE varchar(512);
+ALTER TABLE location_attrs MODIFY avalue varchar(512);
 EOF
 }
diff --git a/kamailio/db_scripts/postgres-specific b/kamailio/db_scripts/postgres-specific
index 66a08ce..7401e46 100644
--- a/kamailio/db_scripts/postgres-specific
+++ b/kamailio/db_scripts/postgres-specific
@@ -2,6 +2,7 @@
 
 sql_db_pre_setup() {
 cat << EOF
+BEGIN TRANSACTION;
 EOF
 }