Use string for storing a OCM remote id #24247

juliusknorr · 2020-11-20T12:35:03Z

This is required to make sure we are compatible with Federated Sharing OCM as proposed in cs3org/OCM-API#37 providerId is a string.

While #9345 added general support for this our backend does only allow integers to be stored as a providerId, since we still have integer values in our database

Move files_sharing to database migration (only contains oc_share_external)
Migrate share_external to use bigint
Migrate federated_reshares to use bigint
Move parameter types of remoteId usages to string
Migrate remoteId columns to string
Migrate default of remoteId columns to be an empty string instead of -1
- This is the change I hesitated a bit since I don't know the federation code well enough to dare estimating how things might break. However i could not find any place where this value would be checked and tests seem to be still fine with it.

ChristophWurst

Looks good!

nickvergessen · 2020-12-08T08:50:35Z

apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php

+			$remoteIdColumn = $table->getColumn('remote_id');
+			if ($remoteIdColumn && $remoteIdColumn->getType()->getName() !== Types::STRING) {
+				$remoteIdColumn->setNotnull(false);
+				$remoteIdColumn->setType(Type::getType(Types::STRING));


Not sure if our "friend" likes this too much. But the test seems to say yes.

Some "friends" actually did a similar migration, this came up as a part of #23044

apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php

Signed-off-by: Julius Härtl <jus@bitgrid.net>

… share_external Signed-off-by: Julius Härtl <jus@bitgrid.net>

Signed-off-by: Julius Härtl <jus@bitgrid.net>

…registered yet Signed-off-by: Julius Härtl <jus@bitgrid.net>

Signed-off-by: Julius Härtl <jus@bitgrid.net>

faily-bot · 2020-12-08T15:59:02Z

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 306: failure

sqlite

Show full log

There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There were 4 failures:

1) Test\Preview\BitmapTest::testGetThumbnail with data set #0 (-88, -74)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

2) Test\Preview\BitmapTest::testGetThumbnail with data set #1 (66, 86)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

3) Test\Preview\BitmapTest::testGetThumbnail with data set #2 (-36, 60)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

4) Test\Preview\BitmapTest::testGetThumbnail with data set #3 (81, -76)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

mariadb10.4-php7.4

Show full log

There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There were 4 failures:

1) Test\Preview\BitmapTest::testGetThumbnail with data set #0 (-56, -100)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

2) Test\Preview\BitmapTest::testGetThumbnail with data set #1 (72, 43)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

3) Test\Preview\BitmapTest::testGetThumbnail with data set #2 (-22, 9)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

4) Test\Preview\BitmapTest::testGetThumbnail with data set #3 (86, -8)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

mysql8.0-php7.4

Show full log

There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There were 4 failures:

1) Test\Preview\BitmapTest::testGetThumbnail with data set #0 (-96, -16)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

2) Test\Preview\BitmapTest::testGetThumbnail with data set #1 (8, 26)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

3) Test\Preview\BitmapTest::testGetThumbnail with data set #2 (-44, 91)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

4) Test\Preview\BitmapTest::testGetThumbnail with data set #3 (47, -16)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

postgres11-php7.4

Show full log

There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There were 4 failures:

1) Test\Preview\BitmapTest::testGetThumbnail with data set #0 (-91, -12)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

2) Test\Preview\BitmapTest::testGetThumbnail with data set #1 (33, 79)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

3) Test\Preview\BitmapTest::testGetThumbnail with data set #2 (-18, 8)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

4) Test\Preview\BitmapTest::testGetThumbnail with data set #3 (64, -100)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

juliusknorr · 2020-12-08T16:43:30Z

Failures unrelated, erroring on master as well.

juliusknorr · 2020-12-11T07:00:43Z

/backport to stable20

juliusknorr mentioned this pull request Nov 20, 2020

Handle owncloud migration to latest release #23044

Merged

23 tasks

juliusknorr added 2. developing Work in progress bug feature: federation labels Nov 20, 2020

juliusknorr added this to the Nextcloud 21 milestone Nov 20, 2020

juliusknorr force-pushed the bugfix/noid/ocm-providerId-string branch 2 times, most recently from eae4899 to 33694e5 Compare November 20, 2020 14:50

juliusknorr force-pushed the bugfix/noid/ocm-providerId-string branch 5 times, most recently from 497f888 to 061b048 Compare December 4, 2020 13:13

juliusknorr requested review from MorrisJobke, ChristophWurst and nickvergessen December 4, 2020 13:33

juliusknorr added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Dec 4, 2020

juliusknorr marked this pull request as ready for review December 4, 2020 13:33

juliusknorr requested a review from PVince81 December 4, 2020 13:36

ChristophWurst approved these changes Dec 4, 2020

View reviewed changes

nickvergessen reviewed Dec 8, 2020

View reviewed changes

apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php Outdated Show resolved Hide resolved

nickvergessen approved these changes Dec 8, 2020

View reviewed changes

juliusknorr added 7 commits December 8, 2020 16:03

Move remoteId of remote reshares to string

f68f67f

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Migrate files_sharing to migrations and move remote_id to a string in…

bb21e87

… share_external Signed-off-by: Julius Härtl <jus@bitgrid.net>

Move columns to bigint

8f6c2ec

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Get rid of database.xml in files_sharing

1b52e97

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Do not register share menu in cases where the files app has not been …

98deb1b

…registered yet Signed-off-by: Julius Härtl <jus@bitgrid.net>

Adjust default

aefe826

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add temporary test for migrating int to string

4f92772

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Update psalm baseline

b732604

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliusknorr force-pushed the bugfix/noid/ocm-providerId-string branch from 061b048 to b732604 Compare December 8, 2020 15:06

juliusknorr added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 8, 2020

juliusknorr merged commit a0444bc into master Dec 9, 2020

juliusknorr deleted the bugfix/noid/ocm-providerId-string branch December 9, 2020 16:26

backportbot-nextcloud bot added the backport-request label Dec 11, 2020

backportbot-nextcloud bot mentioned this pull request Dec 11, 2020

[stable20] Use string for storing a OCM remote id #24654

Merged

backportbot-nextcloud bot removed the backport-request label Dec 11, 2020

nickvergessen mentioned this pull request Dec 14, 2020

Move files sharing away from database xml #21718

Closed

MorrisJobke mentioned this pull request Mar 24, 2021

Bye bye database xml #21641

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use string for storing a OCM remote id #24247

Use string for storing a OCM remote id #24247

juliusknorr commented Nov 20, 2020 •

edited

Loading

ChristophWurst left a comment

nickvergessen Dec 8, 2020

juliusknorr Dec 8, 2020

faily-bot bot commented Dec 8, 2020

juliusknorr commented Dec 8, 2020

juliusknorr commented Dec 11, 2020

Use string for storing a OCM remote id #24247

Use string for storing a OCM remote id #24247

Conversation

juliusknorr commented Nov 20, 2020 • edited Loading

ChristophWurst left a comment

Choose a reason for hiding this comment

nickvergessen Dec 8, 2020

Choose a reason for hiding this comment

juliusknorr Dec 8, 2020

Choose a reason for hiding this comment

faily-bot bot commented Dec 8, 2020

Status of 306: failure

sqlite

mariadb10.4-php7.4

mysql8.0-php7.4

postgres11-php7.4

juliusknorr commented Dec 8, 2020

juliusknorr commented Dec 11, 2020

juliusknorr commented Nov 20, 2020 •

edited

Loading