From 317cd4c70a3042c4e16424cafb4a8b34c8cd8c3c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 6 Dec 2012 17:49:35 +0100
Subject: [PATCH] catch error if old filecache table is not present during
 upgrade

---
 lib/files/cache/upgrade.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php
index 899f6f7ac8..ebac387de9 100644
--- a/lib/files/cache/upgrade.php
+++ b/lib/files/cache/upgrade.php
@@ -15,13 +15,17 @@ class Upgrade {
 		$insertQuery = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache`( `fileid`, `storage`, `path`, `path_hash`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted` )
 			VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)');
 
-		$oldEntriesQuery = \OC_DB::prepare('SELECT * FROM `*PREFIX*fscache` ORDER BY `id` ASC'); //sort ascending to ensure the parent gets inserted before a child
-		try{
+		try {
+			$oldEntriesQuery = \OC_DB::prepare('SELECT * FROM `*PREFIX*fscache` ORDER BY `id` ASC'); //sort ascending to ensure the parent gets inserted before a child
+		} catch (\Exception $e) {
+			return;
+		}
+		try {
 			$oldEntriesResult = $oldEntriesQuery->execute();
-		}catch(\Exception $e){
+		} catch (\Exception $e) {
 			return;
 		}
-		if(!$oldEntriesResult){
+		if (!$oldEntriesResult) {
 			return;
 		}
 
-- 
GitLab