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

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

diff --git a/apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php b/apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php
index c3fc22db8e4f4d422b6f4bdd78149572714c6309..1f32f2cced2d7b1cdd9cc46aa58ba172ff5ae63c 100644 (file)
--- a/apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php
+++ b/apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php
@@ -36,16 +36,18 @@ class Version1011Date20201120125158 extends SimpleMigrationStep {
        public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
                /** @var ISchemaWrapper $schema */
                $schema = $schemaClosure();
-               
+
                if ($schema->hasTable('federated_reshares')) {
                        $table = $schema->getTable('federated_reshares');
                        $remoteIdColumn = $table->getColumn('remote_id');
                        if ($remoteIdColumn && $remoteIdColumn->getType()->getName() !== Types::STRING) {
                                $remoteIdColumn->setType(Type::getType(Types::STRING));
                                $remoteIdColumn->setOptions(['length' => 255]);
+                               $remoteIdColumn->setDefault('');
+                               return $schema;
                        }
                }
 
-               return $schema;
+               return null;
        }
 }

diff --git a/apps/files_sharing/composer/composer/autoload_classmap.php b/apps/files_sharing/composer/composer/autoload_classmap.php
index 4ba8d1659af59151c207cfdab816f2e47523e7e4..a29e3879e06e373ddc11b8eed425ff00feef7a73 100644 (file)
--- a/apps/files_sharing/composer/composer/autoload_classmap.php
+++ b/apps/files_sharing/composer/composer/autoload_classmap.php
@@ -62,6 +62,7 @@ return array(
     'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => $baseDir . '/../lib/Migration/OwncloudGuestShareType.php',
     'OCA\\Files_Sharing\\Migration\\SetAcceptedStatus' => $baseDir . '/../lib/Migration/SetAcceptedStatus.php',
     'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => $baseDir . '/../lib/Migration/SetPasswordColumn.php',
+    'OCA\\Files_Sharing\\Migration\\Version11300Date20201120141438' => $baseDir . '/../lib/Migration/Version11300Date20201120141438.php',
     'OCA\\Files_Sharing\\MountProvider' => $baseDir . '/../lib/MountProvider.php',
     'OCA\\Files_Sharing\\Notification\\Listener' => $baseDir . '/../lib/Notification/Listener.php',
     'OCA\\Files_Sharing\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',

diff --git a/apps/files_sharing/composer/composer/autoload_static.php b/apps/files_sharing/composer/composer/autoload_static.php
index 4376ad0b8201dd9c89f92726091eeefd4a1b1846..523f2bc194515769eb18386204ad8dc3c64286b2 100644 (file)
--- a/apps/files_sharing/composer/composer/autoload_static.php
+++ b/apps/files_sharing/composer/composer/autoload_static.php
@@ -77,6 +77,7 @@ class ComposerStaticInitFiles_Sharing
         'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => __DIR__ . '/..' . '/../lib/Migration/OwncloudGuestShareType.php',
         'OCA\\Files_Sharing\\Migration\\SetAcceptedStatus' => __DIR__ . '/..' . '/../lib/Migration/SetAcceptedStatus.php',
         'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => __DIR__ . '/..' . '/../lib/Migration/SetPasswordColumn.php',
+        'OCA\\Files_Sharing\\Migration\\Version11300Date20201120141438' => __DIR__ . '/..' . '/../lib/Migration/Version11300Date20201120141438.php',
         'OCA\\Files_Sharing\\MountProvider' => __DIR__ . '/..' . '/../lib/MountProvider.php',
         'OCA\\Files_Sharing\\Notification\\Listener' => __DIR__ . '/..' . '/../lib/Notification/Listener.php',
         'OCA\\Files_Sharing\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',

diff --git a/apps/files_sharing/lib/Migration/Version11300Date20201120141438.php b/apps/files_sharing/lib/Migration/Version11300Date20201120141438.php
new file mode 100644 (file)
index 0000000..84c8721
--- /dev/null
+++ b/apps/files_sharing/lib/Migration/Version11300Date20201120141438.php
@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\Files_Sharing\Migration;
+
+use Closure;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version11300Date20201120141438 extends SimpleMigrationStep {
+       public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+               /** @var ISchemaWrapper $schema */
+               $schema = $schemaClosure();
+
+               if (!$schema->hasTable('share_external')) {
+                       $table = $schema->createTable('share_external');
+                       $table->addColumn('id', Types::INTEGER, [
+                               'autoincrement' => true,
+                               'notnull' => true,
+                       ]);
+                       $table->addColumn('parent', Types::INTEGER, [
+                               'notnull' => false,
+                               'default' => -1,
+                       ]);
+                       $table->addColumn('share_type', Types::INTEGER, [
+                               'notnull' => false,
+                               'length' => 4,
+                       ]);
+                       $table->addColumn('remote', Types::STRING, [
+                               'notnull' => true,
+                               'length' => 512,
+                       ]);
+                       $table->addColumn('remote_id', Types::STRING, [
+                               'notnull' => true,
+                               'length' => 255,
+                               'default' => -1,
+                       ]);
+                       $table->addColumn('share_token', Types::STRING, [
+                               'notnull' => true,
+                               'length' => 64,
+                       ]);
+                       $table->addColumn('password', Types::STRING, [
+                               'notnull' => false,
+                               'length' => 64,
+                       ]);
+                       $table->addColumn('name', Types::STRING, [
+                               'notnull' => true,
+                               'length' => 64,
+                       ]);
+                       $table->addColumn('owner', Types::STRING, [
+                               'notnull' => true,
+                               'length' => 64,
+                       ]);
+                       $table->addColumn('user', Types::STRING, [
+                               'notnull' => true,
+                               'length' => 64,
+                       ]);
+                       $table->addColumn('mountpoint', Types::STRING, [
+                               'notnull' => true,
+                               'length' => 4000,
+                       ]);
+                       $table->addColumn('mountpoint_hash', Types::STRING, [
+                               'notnull' => true,
+                               'length' => 32,
+                       ]);
+                       $table->addColumn('accepted', Types::INTEGER, [
+                               'notnull' => true,
+                               'length' => 4,
+                               'default' => 0,
+                       ]);
+                       $table->setPrimaryKey(['id']);
+                       $table->addIndex(['user'], 'sh_external_user');
+                       $table->addUniqueIndex(['user', 'mountpoint_hash'], 'sh_external_mp');
+               } else {
+                       $table = $schema->getTable('share_external');
+                       $remoteIdColumn = $table->getColumn('remote_id');
+                       if ($remoteIdColumn && $remoteIdColumn->getType()->getName() !== Types::STRING) {
+                               $remoteIdColumn->setType(Type::getType(Types::STRING));
+                               $remoteIdColumn->setOptions(['length' => 255]);
+                       }
+               }
+
+               return $schema;
+       }
+
+}