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

Merge pull request #22206 from owncloud/share2_migration_with_federated 

Update the migration step to include federated shares
This commit is contained in:
Thomas Müller 2016-02-08 17:58:26 +01:00
parent a03279a3a8 3c4e511792
commit 698a6b07a8
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/appinfo/info.xml
View File

@ -10,7 +10,7 @@ Turning the feature off removes shared files and folders on the server for all s
<licence>AGPL</licence> <licence>AGPL</licence>
<author>Michael Gapczynski, Bjoern Schiessle</author> <author>Michael Gapczynski, Bjoern Schiessle</author>
<default_enable/> <default_enable/>
<version>0.9.0</version> <version>0.9.1</version>
<types> <types>
<filesystem/> <filesystem/>
</types> </types>

2
apps/files_sharing/appinfo/update.php
View File

@ -25,7 +25,7 @@ use OCA\Files_Sharing\Migration;
$installedVersion = \OC::$server->getConfig()->getAppValue('files_sharing', 'installed_version'); $installedVersion = \OC::$server->getConfig()->getAppValue('files_sharing', 'installed_version');
// Migration OC8.2 -> OC9 // Migration OC8.2 -> OC9
if (version_compare($installedVersion, '0.9.0', '<')) { if (version_compare($installedVersion, '0.9.1', '<')) {
$m = new Migration(\OC::$server->getDatabaseConnection()); $m = new Migration(\OC::$server->getDatabaseConnection());
$m->removeReShares(); $m->removeReShares();
$m->updateInitiatorInfo(); $m->updateInitiatorInfo();

6
apps/files_sharing/lib/migration.php
View File

@ -142,7 +142,8 @@ class Migration {
[ [
\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_USER,
\OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_GROUP,
\OCP\Share::SHARE_TYPE_LINK \OCP\Share::SHARE_TYPE_LINK,
\OCP\Share::SHARE_TYPE_REMOTE,
], ],
Connection::PARAM_INT_ARRAY Connection::PARAM_INT_ARRAY
) )
@ -185,7 +186,8 @@ class Migration {
[ [
\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_USER,
\OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_GROUP,
\OCP\Share::SHARE_TYPE_LINK \OCP\Share::SHARE_TYPE_LINK,
\OCP\Share::SHARE_TYPE_REMOTE,
], ],
Connection::PARAM_INT_ARRAY Connection::PARAM_INT_ARRAY
) )

21
apps/files_sharing/tests/migrationtest.php
View File

@ -209,6 +209,23 @@ class MigrationTest extends TestCase {
$this->assertSame(1, $this->assertSame(1,
$query->execute() $query->execute()
); );
$parent = $query->getLastInsertId();
// third re-share, should be attached to the first user share after migration
$query->setParameter('share_type', \OCP\Share::SHARE_TYPE_REMOTE)
->setParameter('share_with', 'user@server.com')
->setParameter('uid_owner', 'user3')
->setParameter('uid_initiator', '')
->setParameter('parent', $parent)
->setParameter('item_type', 'file')
->setParameter('item_source', '2')
->setParameter('item_target', '/2')
->setParameter('file_source', 2)
->setParameter('file_target', '/foobar')
->setParameter('permissions', 31)
->setParameter('stime', time());
$this->assertSame(1,
$query->execute()
);
} }
public function testRemoveReShares() { public function testRemoveReShares() {
@ -221,7 +238,7 @@ class MigrationTest extends TestCase {
$query = $this->connection->getQueryBuilder(); $query = $this->connection->getQueryBuilder();
$query->select('*')->from($this->table)->orderBy('id'); $query->select('*')->from($this->table)->orderBy('id');
$result = $query->execute()->fetchAll(); $result = $query->execute()->fetchAll();
$this->assertSame(8, count($result)); $this->assertSame(9, count($result));
// shares which shouldn't be modified // shares which shouldn't be modified
for ($i = 0; $i < 4; $i++) { for ($i = 0; $i < 4; $i++) {
@ -238,7 +255,7 @@ class MigrationTest extends TestCase {
$this->assertEmpty($result[5]['uid_initiator']); $this->assertEmpty($result[5]['uid_initiator']);
$this->assertNull($result[5]['parent']); $this->assertNull($result[5]['parent']);
// flatted re-shares // flatted re-shares
for($i = 6; $i < 8; $i++) { for($i = 6; $i < 9; $i++) {
$this->assertSame('owner2', $result[$i]['uid_owner']); $this->assertSame('owner2', $result[$i]['uid_owner']);
$user = 'user' . ($i - 5); $user = 'user' . ($i - 5);
$this->assertSame($user, $result[$i]['uid_initiator']); $this->assertSame($user, $result[$i]['uid_initiator']);