Yair Zaslavsky has uploaded a new change for review.

Change subject: core: Fix temproaral disabling foreign keys
......................................................................

core: Fix temproaral disabling foreign keys

The temporal disabling of foreign keys did not work
causing upgrade to fail

Change-Id: I32867ef58f179428c69e74d61a89dc6b2b9c2e89
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1091227
Signed-off-by: Yair Zaslavsky <[email protected]>
---
M packaging/dbscripts/upgrade/03_05_0210_change_group_ids.sql
M packaging/dbscripts/upgrade/03_05_0220_update_user_ids.sql
2 files changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/27195/1

diff --git a/packaging/dbscripts/upgrade/03_05_0210_change_group_ids.sql 
b/packaging/dbscripts/upgrade/03_05_0210_change_group_ids.sql
index f357897..8efd085 100644
--- a/packaging/dbscripts/upgrade/03_05_0210_change_group_ids.sql
+++ b/packaging/dbscripts/upgrade/03_05_0210_change_group_ids.sql
@@ -16,7 +16,7 @@
        substring(encode(external_id,'hex') FROM 21 FOR 12) AS uuid);
 
 --2. Changing relevant group_id appearances in other tables
-ALTER TABLE tags_user_group_map DISABLE TRIGGER ALL;
+ALTER TABLE tags_user_group_map drop constraint tags_user_map_user_group;
 
 UPDATE tags_user_group_map m set group_id = (
        SELECT temp_id FROM ad_groups WHERE id = m.group_id
@@ -43,7 +43,8 @@
 --4. Cleanup
 --DROP TABLE tmp_users_group_ids;
 --DROP TABLE tmp_users_groups;
-ALTER TABLE tags_user_group_map ENABLE TRIGGER ALL;
+ALTER TABLE tags_user_group_map add constraint "tags_user_map_user_group" 
FOREIGN KEY (group_id) REFERENCES ad_groups(id);
+
 PERFORM fn_db_drop_column('ad_groups','temp_id');
 RETURN;
 END; $procedure$
diff --git a/packaging/dbscripts/upgrade/03_05_0220_update_user_ids.sql 
b/packaging/dbscripts/upgrade/03_05_0220_update_user_ids.sql
index d5e9edb..4849237 100644
--- a/packaging/dbscripts/upgrade/03_05_0220_update_user_ids.sql
+++ b/packaging/dbscripts/upgrade/03_05_0220_update_user_ids.sql
@@ -16,7 +16,7 @@
        substring(encode(external_id,'hex') FROM 21 FOR 12) AS uuid);
 
 --2. Changing relevant group_id appearances in other tables
-ALTER TABLE tags_user_map DISABLE TRIGGER ALL;
+ALTER TABLE tags_user_map drop constraint "tags_user_map_user";
 UPDATE tags_user_map m set user_id = (
        SELECT temp_id FROM users WHERE user_id = m.user_id);
 
@@ -28,7 +28,7 @@
 
 UPDATE users SET user_id = temp_id;
 --3. Cleanup
-ALTER TABLE tags_user_map ENABLE TRIGGER ALL;
+ALTER TABLE tags_user_map add constraint "tags_user_map_user" FOREIGN KEY 
(user_id) REFERENCES users(user_id);
 PERFORM fn_db_drop_column('users','temp_id');
 RETURN;
 END; $procedure$


-- 
To view, visit http://gerrit.ovirt.org/27195
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32867ef58f179428c69e74d61a89dc6b2b9c2e89
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to