Skip to content

Use string for storing a OCM remote id #24247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 8 commits into from
Dec 9, 2020
Merged

Use string for storing a OCM remote id #24247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f68f67f
Move remoteId of remote reshares to string
juliusknorr Nov 20, 2020
bb21e87
Migrate files_sharing to migrations and move remote_id to a string in…
juliusknorr Nov 20, 2020
8f6c2ec
Move columns to bigint
juliusknorr Nov 20, 2020
1b52e97
Get rid of database.xml in files_sharing
juliusknorr Nov 20, 2020
98deb1b
Do not register share menu in cases where the files app has not been …
juliusknorr Dec 3, 2020
aefe826
Adjust default
juliusknorr Dec 3, 2020
4f92772
Add temporary test for migrating int to string
juliusknorr Dec 4, 2020
b732604
Update psalm baseline
juliusknorr Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move columns to bigint 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Dec 8, 2020
commit 8f6c2ec357dd9fcc71f2f8fb69a325004b36b98b
3 changes: 1 addition & 2 deletions apps/federatedfilesharing/lib/Migration/Version1010Date20200630191755.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt

if (!$schema->hasTable('federated_reshares')) {
$table = $schema->createTable('federated_reshares');
$table->addColumn('share_id', Types::INTEGER, [
$table->addColumn('share_id', Types::BIGINT, [
'notnull' => true,
'length' => 4,
]);
$table->addColumn('remote_id', Types::STRING, [
'notnull' => true,
Expand Down
5 changes: 2 additions & 3 deletions apps/files_sharing/lib/Migration/Version11300Date20201120141438.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt

if (!$schema->hasTable('share_external')) {
$table = $schema->createTable('share_external');
$table->addColumn('id', Types::INTEGER, [
$table->addColumn('id', Types::BIGINT, [
'autoincrement' => true,
'notnull' => true,
]);
$table->addColumn('parent', Types::INTEGER, [
$table->addColumn('parent', Types::BIGINT, [
'notnull' => false,
'default' => -1,
]);
Expand Down Expand Up @@ -86,5 +86,4 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt

return $schema;
}

}
2 changes: 2 additions & 0 deletions apps/settings/lib/Controller/CheckSetupController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,12 +627,14 @@ protected function hasBigIntConversionPendingColumns(): array {
'activity_mq' => ['mail_id'],
'authtoken' => ['id'],
'bruteforce_attempts' => ['id'],
'federated_reshares' => ['share_id'],
'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
'filecache_extended' => ['fileid'],
'file_locks' => ['id'],
'jobs' => ['id'],
'mimetypes' => ['id'],
'mounts' => ['id', 'storage_id', 'root_id', 'mount_id'],
'share_external' => ['id', 'parent'],
'storages' => ['numeric_id'],
];

Expand Down
2 changes: 2 additions & 0 deletions core/Command/Db/ConvertFilecacheBigInt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,14 @@ protected function getColumnsByTable() {
'activity_mq' => ['mail_id'],
'authtoken' => ['id'],
'bruteforce_attempts' => ['id'],
'federated_reshares' => ['share_id'],
'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
'filecache_extended' => ['fileid'],
'file_locks' => ['id'],
'jobs' => ['id'],
'mimetypes' => ['id'],
'mounts' => ['id', 'storage_id', 'root_id', 'mount_id'],
'share_external' => ['id', 'parent'],
'storages' => ['numeric_id'],
];
}
Expand Down