From: Michael Friedrich <michael.friedrich@netways.de>
Date: Mon, 1 Aug 2016 13:04:47 +0000 (+0200)
Subject: Fix incorrect session_token index for PostgreSQL
X-Git-Tag: v2.5.0~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d78c53dd8fc7567a1b9d8f8aa4d0ea825494d34;p=icinga2

Fix incorrect session_token index for PostgreSQL

refs #12210
---

diff --git a/lib/db_ido_pgsql/schema/pgsql.sql b/lib/db_ido_pgsql/schema/pgsql.sql
index 9adf64076..f67e6e7c5 100644
--- a/lib/db_ido_pgsql/schema/pgsql.sql
+++ b/lib/db_ido_pgsql/schema/pgsql.sql
@@ -1691,9 +1691,9 @@ CREATE INDEX idx_zones_parent_object_id on icinga_zones(parent_zone_object_id);
 CREATE INDEX idx_zonestatus_parent_object_id on icinga_zonestatus(parent_zone_object_id);
 
 -- #12210
-CREATE INDEX idx_hg_session_del ON icinga_hostgroup_members (session_token);
-CREATE INDEX idx_sg_session_del ON icinga_servicegroup_members (session_token);
-CREATE INDEX idx_cg_session_del ON icinga_contactgroup_members (session_token);
+CREATE INDEX idx_hg_session_del ON icinga_hostgroup_members (instance_id, session_token);
+CREATE INDEX idx_sg_session_del ON icinga_servicegroup_members (instance_id, session_token);
+CREATE INDEX idx_cg_session_del ON icinga_contactgroup_members (instance_id, session_token);
 
 DROP INDEX cv_session_del_idx;
 DROP INDEX cvs_session_del_idx;
diff --git a/lib/db_ido_pgsql/schema/upgrade/2.5.0.sql b/lib/db_ido_pgsql/schema/upgrade/2.5.0.sql
index db05ca4f6..ed52b2b56 100644
--- a/lib/db_ido_pgsql/schema/upgrade/2.5.0.sql
+++ b/lib/db_ido_pgsql/schema/upgrade/2.5.0.sql
@@ -46,9 +46,9 @@ ALTER TABLE icinga_hostgroup_members ADD COLUMN session_token INTEGER default NU
 ALTER TABLE icinga_servicegroup_members ADD COLUMN session_token INTEGER default NULL;
 ALTER TABLE icinga_contactgroup_members ADD COLUMN session_token INTEGER default NULL;
 
-CREATE INDEX idx_hg_session_del ON icinga_hostgroup_members (session_token);
-CREATE INDEX idx_sg_session_del ON icinga_servicegroup_members (session_token);
-CREATE INDEX idx_cg_session_del ON icinga_contactgroup_members (session_token);
+CREATE INDEX idx_hg_session_del ON icinga_hostgroup_members (instance_id, session_token);
+CREATE INDEX idx_sg_session_del ON icinga_servicegroup_members (instance_id, session_token);
+CREATE INDEX idx_cg_session_del ON icinga_contactgroup_members (instance_id, session_token);
 
 DROP INDEX cv_session_del_idx;
 DROP INDEX cvs_session_del_idx;