[Pkg-nagios-changes] [icinga] 01/01: Add patch to fix database upgrade to 1.13.0. (closes: #861077)

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository icinga.

commit d3a2389ba2b392a676aa32fe2167bb77b09de3d1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 28 10:32:08 2017 +0200

    Add patch to fix database upgrade to 1.13.0. (closes: #861077)
---
 debian/changelog                          |  8 ++++++++
 debian/patches/pgsql-upgrade-1.13.0.patch | 22 ++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 10a3edf..2eec068 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+icinga (1.13.4-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add patch to fix database upgrade to 1.13.0.
+    (closes: #861077)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Apr 2017 10:31:31 +0200
+
 icinga (1.13.4-1) unstable; urgency=high
 
   * Team upload.
diff --git a/debian/patches/pgsql-upgrade-1.13.0.patch b/debian/patches/pgsql-upgrade-1.13.0.patch
new file mode 100644
index 0000000..1445e4e
--- /dev/null
+++ b/debian/patches/pgsql-upgrade-1.13.0.patch
@@ -0,0 +1,22 @@
+Description: Fix database upgrade to 1.13.0.
+ error encountered processing /usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.13.0:
+ ERROR: constraint "uq_servicedependencies" of relation "icinga_servicedependencies" does not exist
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/861077
+
+--- a/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.13.0.sql
++++ b/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.13.0.sql
+@@ -11,8 +11,11 @@
+ -- #7765 drop unique constraint
+ -- -----------------------------------------
+ 
+-ALTER TABLE icinga_servicedependencies DROP CONSTRAINT uq_servicedependencies;
+-ALTER TABLE icinga_hostdependencies DROP CONSTRAINT uq_hostdependencies;
++ALTER TABLE icinga_servicedependencies DROP CONSTRAINT IF EXISTS icinga_servicedependencies_instance_id_key;
++ALTER TABLE icinga_hostdependencies DROP CONSTRAINT IF EXISTS icinga_hostdependencies_instance_id_key;
++
++ALTER TABLE icinga_servicedependencies DROP CONSTRAINT IF EXISTS UQ_servicedependencies;
++ALTER TABLE icinga_hostdependencies DROP CONSTRAINT IF EXISTS UQ_hostdependencies;
+ 
+ CREATE INDEX idx_servicedependencies ON icinga_servicedependencies(instance_id,config_type,service_object_id,dependent_service_object_id,dependency_type,inherits_parent,fail_on_ok,fail_on_warning,fail_on_unknown,fail_on_critical);
+ CREATE INDEX idx_hostdependencies ON icinga_hostdependencies(instance_id,config_type,host_object_id,dependent_host_object_id,dependency_type,inherits_parent,fail_on_up,fail_on_down,fail_on_unreachable);
diff --git a/debian/patches/series b/debian/patches/series
index eb7817e..c3aeb02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 99_CVE-2015-8010.patch
 spelling-errors.patch
 53_jquery-ui.patch
+pgsql-upgrade-1.13.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/icinga.git