fix update to remove shares where file doesn't exist on postgres
Without patch, breaks with: Failed to upgrade "files_sharing". Exception="SQLSTATE[22P02]: Invalid text representation: 7 ERROR: invalid input syntax for integer: "5,179"" See: https://github.com/owncloud/core/issues/5758 removing unnecessary cruft - no parameter is set, none to pass. https://github.com/owncloud/core/issues/5758 removing subquery, making more readable See: https://github.com/owncloud/core/pull/6016#issuecomment-29510979 parameters to sql calls should be arrays https://github.com/owncloud/core/pull/6016 boosting version to ensure fix gets executed properly escaping the sql select statement removing extraneous closing paren.
This commit is contained in:
parent
9fa9c791eb
commit
d58fda7ff3
|
@ -71,19 +71,18 @@ if (version_compare($installedVersion, '0.3', '<')) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// clean up oc_share table from files which are no longer exists
|
// clean up oc_share table from files which are no longer exists
|
||||||
if (version_compare($installedVersion, '0.3.5', '<')) {
|
if (version_compare($installedVersion, '0.3.5.6', '<')) {
|
||||||
|
// delete all shares where the original file no longer exists
|
||||||
// get all shares where the original file no longer exists
|
$findShares = \OC_DB::prepare('SELECT `*PREFIX*share`.`id` ' .
|
||||||
$findShares = \OC_DB::prepare('SELECT `file_source` FROM `*PREFIX*share` LEFT JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*filecache`.`fileid` IS NULL AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\')');
|
'FROM `*PREFIX*share` LEFT JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` ' .
|
||||||
|
'WHERE `*PREFIX*filecache`.`fileid` IS NULL AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\')');
|
||||||
$sharesFound = $findShares->execute(array())->fetchAll();
|
$sharesFound = $findShares->execute(array())->fetchAll();
|
||||||
|
|
||||||
// delete those shares from the oc_share table
|
// delete those shares from the oc_share table
|
||||||
if (is_array($sharesFound) && !empty($sharesFound)) {
|
if (is_array($sharesFound) && !empty($sharesFound)) {
|
||||||
$delArray = array();
|
$removeShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `id` = ? ');
|
||||||
foreach ($sharesFound as $share) {
|
foreach ($sharesFound as $share) {
|
||||||
$delArray[] = $share['file_source'];
|
$result = $removeShares->execute(array($share['id']));
|
||||||
}
|
}
|
||||||
$removeShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `file_source` IN (?)');
|
|
||||||
$result = $removeShares->execute(array(implode(',', $delArray)));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
0.3.5
|
0.3.5.6
|
||||||
|
|
Loading…
Reference in New Issue