diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-12-06 17:49:35 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-12-06 17:49:35 +0100 |
| commit | 317cd4c70a3042c4e16424cafb4a8b34c8cd8c3c (patch) | |
| tree | e0a322a774432260008b07fc9dddb5444e93df00 /lib | |
| parent | 98f42d314ce290002dc2e54ff08992e2cf792777 (diff) | |
| download | nextcloud-server-317cd4c70a3042c4e16424cafb4a8b34c8cd8c3c.tar.gz nextcloud-server-317cd4c70a3042c4e16424cafb4a8b34c8cd8c3c.zip | |
catch error if old filecache table is not present during upgrade
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/files/cache/upgrade.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php index 899f6f7ac83..ebac387de96 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; } |