From 322fe4d5ba90113834beae6608e2dad74e08763e Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Sat, 31 Mar 2012 09:27:30 +0000 Subject: [PATCH] do not use "create table .. like" statement due to the order of operations in the installer the database is already updated to the latest state at the point we run ngcp-update-db-schema this is not what we want, because then not_replicated statements fail: Applying revision script /usr/share/ngcp-db-schema/db_scripts/base/6435_not_replicated.up: ERROR 1060 (42S21) at line 3: Duplicate column name 'time_hires' failed. :( --- db_scripts/base/0070_not_replicated.up | 83 ++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 4 deletions(-) diff --git a/db_scripts/base/0070_not_replicated.up b/db_scripts/base/0070_not_replicated.up index 11d9a66b..3ec0a594 100644 --- a/db_scripts/base/0070_not_replicated.up +++ b/db_scripts/base/0070_not_replicated.up @@ -1,8 +1,83 @@ USE accounting; -create table acc_backup like kamailio.acc; -create table acc_trash like kamailio.acc; +create table acc_backup ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `method` varchar(16) NOT NULL DEFAULT '', + `from_tag` varchar(64) NOT NULL DEFAULT '', + `to_tag` varchar(64) NOT NULL DEFAULT '', + `callid` varchar(64) NOT NULL DEFAULT '', + `sip_code` varchar(3) NOT NULL DEFAULT '', + `sip_reason` varchar(128) NOT NULL DEFAULT '', + `time` datetime NOT NULL, + `src_leg` varchar(255) default NULL, + `dst_leg` varchar(255) default NULL, + `dst_user` varchar(64) NOT NULL default '', + `dst_ouser` varchar(64) NOT NULL default '', + `dst_domain` varchar(128) NOT NULL default '', + `src_user` varchar(64) NOT NULL default '', + `src_domain` varchar(128) NOT NULL default '', + PRIMARY KEY (`id`), + KEY `callid_idx` (`callid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +create table acc_trash ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `method` varchar(16) NOT NULL DEFAULT '', + `from_tag` varchar(64) NOT NULL DEFAULT '', + `to_tag` varchar(64) NOT NULL DEFAULT '', + `callid` varchar(64) NOT NULL DEFAULT '', + `sip_code` varchar(3) NOT NULL DEFAULT '', + `sip_reason` varchar(128) NOT NULL DEFAULT '', + `time` datetime NOT NULL, + `src_leg` varchar(255) default NULL, + `dst_leg` varchar(255) default NULL, + `dst_user` varchar(64) NOT NULL default '', + `dst_ouser` varchar(64) NOT NULL default '', + `dst_domain` varchar(128) NOT NULL default '', + `src_user` varchar(64) NOT NULL default '', + `src_domain` varchar(128) NOT NULL default '', + PRIMARY KEY (`id`), + KEY `callid_idx` (`callid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + USE kamailio; -create table acc_backup like kamailio.acc; -create table acc_trash like kamailio.acc; +create table acc_backup ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `method` varchar(16) NOT NULL DEFAULT '', + `from_tag` varchar(64) NOT NULL DEFAULT '', + `to_tag` varchar(64) NOT NULL DEFAULT '', + `callid` varchar(64) NOT NULL DEFAULT '', + `sip_code` varchar(3) NOT NULL DEFAULT '', + `sip_reason` varchar(128) NOT NULL DEFAULT '', + `time` datetime NOT NULL, + `src_leg` varchar(255) default NULL, + `dst_leg` varchar(255) default NULL, + `dst_user` varchar(64) NOT NULL default '', + `dst_ouser` varchar(64) NOT NULL default '', + `dst_domain` varchar(128) NOT NULL default '', + `src_user` varchar(64) NOT NULL default '', + `src_domain` varchar(128) NOT NULL default '', + PRIMARY KEY (`id`), + KEY `callid_idx` (`callid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +create table acc_trash ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `method` varchar(16) NOT NULL DEFAULT '', + `from_tag` varchar(64) NOT NULL DEFAULT '', + `to_tag` varchar(64) NOT NULL DEFAULT '', + `callid` varchar(64) NOT NULL DEFAULT '', + `sip_code` varchar(3) NOT NULL DEFAULT '', + `sip_reason` varchar(128) NOT NULL DEFAULT '', + `time` datetime NOT NULL, + `src_leg` varchar(255) default NULL, + `dst_leg` varchar(255) default NULL, + `dst_user` varchar(64) NOT NULL default '', + `dst_ouser` varchar(64) NOT NULL default '', + `dst_domain` varchar(128) NOT NULL default '', + `src_user` varchar(64) NOT NULL default '', + `src_domain` varchar(128) NOT NULL default '', + PRIMARY KEY (`id`), + KEY `callid_idx` (`callid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8;