[owncloud] backport upstream PR #14119 to fix OC for DBAL 2.5.1

[Adam Williamson]

commit 0d9eaf761394a2d5b0617ae50b9088621fc066df
Author: Adam Williamson <awilliam at redhat.com>
Date:   Mon Feb 23 10:45:31 2015 -0800

    backport upstream PR #14119 to fix OC for DBAL 2.5.1

 owncloud-8.0.0-dbal_251.patch | 24 ++++++++++++++++++++++++
 owncloud.spec                 |  4 ++++
 2 files changed, 28 insertions(+)
---
diff --git a/owncloud-8.0.0-dbal_251.patch b/owncloud-8.0.0-dbal_251.patch
new file mode 100644
index 0000000..53421b5
--- /dev/null
+++ b/owncloud-8.0.0-dbal_251.patch
@@ -0,0 +1,24 @@
+From bdfc9b57bdf6d7660ac30341d7ca4c4a3419d34b Mon Sep 17 00:00:00 2001
+From: Victor Dubiniuk <victor.dubiniuk at gmail.com>
+Date: Wed, 11 Feb 2015 19:35:46 +0300
+Subject: [PATCH] Skip primary index if the table has one
+
+---
+ lib/private/db/mdb2schemareader.php | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
+index 7dd4168..23104b1 100644
+--- a/lib/private/db/mdb2schemareader.php
++++ b/lib/private/db/mdb2schemareader.php
+@@ -293,6 +293,9 @@ private function loadIndex($table, $xml) {
+ 		}
+ 		if (!empty($fields)) {
+ 			if (isset($primary) && $primary) {
++				if ($table->hasPrimaryKey()) {
++					return;
++				}
+ 				$table->setPrimaryKey($fields, $name);
+ 			} else {
+ 				if (isset($unique) && $unique) {
+
diff --git a/owncloud.spec b/owncloud.spec
index 8183ce3..a285ee0 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -61,6 +61,8 @@ Patch7:        owncloud-8.0.0-disable_minify.patch
 # Stop OC from trying to do stuff to .htaccess files. Just calm down, OC.
 # Distributors are on the case.
 Patch8:         0001-setup-allow-disabling-all-htaccess-fiddling.patch
+# Fix OC for DBAL 2.5.1: https://github.com/owncloud/core/pull/14119
+Patch9:         owncloud-8.0.0-dbal_251.patch
 
 BuildArch:      noarch
 
@@ -241,6 +243,7 @@ sed -i 's/\r$//' apps/files_encryption/lib/crypt.php
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 # prepare package doc
 cp %{SOURCE3} README.fedora
@@ -459,6 +462,7 @@ fi
 %changelog
 * Mon Feb 23 2015 Adam Williamson <awilliam at redhat.com> - 8.0.0-3
 - merge second version of Apache/Nginx config changes into 8.x build
+- backport upstream PR #14119 to fix OC for DBAL 2.5.1
 
 * Sun Feb 22 2015 Adam Williamson <awilliam at redhat.com> - 7.0.4-3
 - revise and strengthen Apache configuration layout, fix external apps