mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9515 from owncloud/update-sharecleanupfix 

Fix update cleanup to only affect file and folders
This commit is contained in:
Vincent Petry 2014-07-08 18:09:26 +02:00
parent 10978a80c2 f4f52cf242
commit 87adbf1c6e
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/lib/updater.php
View File

@ -204,8 +204,8 @@ class Shared_Updater {
static public function fixBrokenSharesOnAppUpdate() { static public function fixBrokenSharesOnAppUpdate() {
// delete all shares where the original file no longer exists // delete all shares where the original file no longer exists
$findAndRemoveShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share` ' . $findAndRemoveShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share` ' .
'WHERE `file_source` NOT IN ( ' . 'WHERE `item_type` IN (\'file\', \'folder\') ' .
'SELECT `fileid` FROM `*PREFIX*filecache` WHERE `item_type` IN (\'file\', \'folder\'))' 'AND `file_source` NOT IN (SELECT `fileid` FROM `*PREFIX*filecache`)'
); );
$findAndRemoveShares->execute(array()); $findAndRemoveShares->execute(array());
} }

30
apps/files_sharing/tests/update.php
View File

@ -87,13 +87,18 @@ class Test_Files_Sharing_Update_Routine extends Test_Files_Sharing_Base {
/** /**
* @medium * @medium
*/ */
function testRemoveBrokenShares() { function testRemoveBrokenFileShares() {
$this->prepareFileCache(); $this->prepareFileCache();
// check if there are just 3 shares (see setUp - precondition: empty table) // check if there are just 4 shares (see setUp - precondition: empty table)
$countShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share`'); $countAllShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share`');
$result = $countShares->execute()->fetchOne(); $result = $countAllShares->execute()->fetchOne();
$this->assertEquals(4, $result);
// check if there are just 3 file shares (see setUp - precondition: empty table)
$countFileShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share` WHERE `item_type` IN (\'file\', \'folder\')');
$result = $countFileShares->execute()->fetchOne();
$this->assertEquals(3, $result); $this->assertEquals(3, $result);
// check if there are just 2 items (see setUp - precondition: empty table) // check if there are just 2 items (see setUp - precondition: empty table)
@ -105,19 +110,23 @@ class Test_Files_Sharing_Update_Routine extends Test_Files_Sharing_Base {
\OC\Files\Cache\Shared_Updater::fixBrokenSharesOnAppUpdate(); \OC\Files\Cache\Shared_Updater::fixBrokenSharesOnAppUpdate();
// check if there are just 2 shares (one gets killed by the code as there is no filecache entry for this) // check if there are just 2 shares (one gets killed by the code as there is no filecache entry for this)
$countShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share`'); $result = $countFileShares->execute()->fetchOne();
$result = $countShares->execute()->fetchOne();
$this->assertEquals(2, $result); $this->assertEquals(2, $result);
// check if the share of file '200' is removed as there is no entry for this in filecache table // check if the share of file '200' is removed as there is no entry for this in filecache table
$countShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share` WHERE `file_source` = 200'); $countFileShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share` WHERE `file_source` = 200');
$result = $countShares->execute()->fetchOne(); $result = $countFileShares->execute()->fetchOne();
$this->assertEquals(0, $result); $this->assertEquals(0, $result);
// check if there are just 2 items // check if there are just 2 items
$countItems = \OC_DB::prepare('SELECT COUNT(`fileid`) FROM `*PREFIX*filecache`'); $countItems = \OC_DB::prepare('SELECT COUNT(`fileid`) FROM `*PREFIX*filecache`');
$result = $countItems->execute()->fetchOne(); $result = $countItems->execute()->fetchOne();
$this->assertEquals(2, $result); $this->assertEquals(2, $result);
// the calendar share survived
$countOtherShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share` WHERE `item_source` = \'999\'');
$result = $countOtherShares->execute()->fetchOne();
$this->assertEquals(1, $result);
} }
/** /**
@ -228,6 +237,11 @@ class Test_Files_Sharing_Update_Routine extends Test_Files_Sharing_Base {
$addShares->execute(array($fileIds[0])); $addShares->execute(array($fileIds[0]));
$addShares->execute(array(200)); // id of "deleted" file $addShares->execute(array(200)); // id of "deleted" file
$addShares->execute(array($fileIds[1])); $addShares->execute(array($fileIds[1]));
// add a few unrelated shares, calendar share that must be left untouched
$addShares = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_source`, `item_type`, `uid_owner`) VALUES (?, \'calendar\', 1)');
// the number is used as item_source
$addShares->execute(array(999));
} }
} }