From 20816f33050af39b27f107f7227319dadf3df8a7 Mon Sep 17 00:00:00 2001 From: Jon Bonilla Date: Thu, 30 Aug 2012 15:38:39 +0000 Subject: [PATCH] Try to fix kamailio.lcr_gw.group_id It's dropped an recreated. That makes the group_id values are generated with the default ones and that's not what we have in provisioning database. The triggers fail as those fields don't match. --- db_scripts/diff/10180.down | 1 - db_scripts/diff/9868.down | 2 +- db_scripts/diff/9868.up | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/db_scripts/diff/10180.down b/db_scripts/diff/10180.down index ef5228fb..99cbb6ce 100644 --- a/db_scripts/diff/10180.down +++ b/db_scripts/diff/10180.down @@ -3,4 +3,3 @@ use kamailio; ALTER TABLE lcr_rule DROP KEY `lcr_id_prefix_from_uri_idx`; #ALTER TABLE lcr_rule ADD UNIQUE KEY `lcr_id_prefix_from_uri_idx` (`lcr_id`,`prefix`,`from_uri`); -ALTER TABLE lcr_gw DROP `group_id`; diff --git a/db_scripts/diff/9868.down b/db_scripts/diff/9868.down index 262b0fc7..239abb7e 100644 --- a/db_scripts/diff/9868.down +++ b/db_scripts/diff/9868.down @@ -2,7 +2,7 @@ use kamailio ALTER TABLE dispatcher DROP column `attrs`; ALTER TABLE lcr_gw CHANGE column `gw_name` `gw_name` varchar(128) NOT NULL; -ALTER TABLE lcr_gw ADD column `group_id` int(11) unsigned NOT NULL AFTER defunct; +#ALTER TABLE lcr_gw ADD column `group_id` int(11) unsigned NOT NULL AFTER defunct; ALTER TABLE lcr_rule ADD KEY `lcr_id_idx` (`lcr_id`); #ALTER TABLE lcr_rule DROP KEY `lcr_id_prefix_from_uri_idx`; diff --git a/db_scripts/diff/9868.up b/db_scripts/diff/9868.up index b5de9baf..a16dc2db 100644 --- a/db_scripts/diff/9868.up +++ b/db_scripts/diff/9868.up @@ -3,8 +3,8 @@ use kamailio ALTER TABLE dispatcher ADD column `attrs` varchar(128) NOT NULL DEFAULT '' AFTER priority; ALTER TABLE lcr_gw CHANGE column `gw_name` `gw_name` varchar(128) DEFAULT NULL; -#moved to lcr_rule table -ALTER TABLE lcr_gw DROP column `group_id`; +#Edited because it drops an in-use column to create it later with different values +#ALTER TABLE lcr_gw DROP column `group_id`; ALTER TABLE lcr_rule DROP KEY lcr_id_idx;