diff options
| -rw-r--r-- | apps/dav/lib/Storage/PublicOwnerWrapper.php | 2 | ||||
| -rw-r--r-- | core/Application.php | 7 | ||||
| -rw-r--r-- | core/Command/Db/AddMissingIndices.php | 14 | ||||
| -rw-r--r-- | core/Migrations/Version13000Date20170718121200.php | 1 | ||||
| -rw-r--r-- | lib/private/App/AppStore/Bundles/EducationBundle.php | 2 | ||||
| -rw-r--r-- | tests/lib/App/AppStore/Bundles/EducationBundleTest.php | 2 |
6 files changed, 24 insertions, 4 deletions
diff --git a/apps/dav/lib/Storage/PublicOwnerWrapper.php b/apps/dav/lib/Storage/PublicOwnerWrapper.php index a02a2e42341..188323503ae 100644 --- a/apps/dav/lib/Storage/PublicOwnerWrapper.php +++ b/apps/dav/lib/Storage/PublicOwnerWrapper.php @@ -49,5 +49,7 @@ class PublicOwnerWrapper extends Wrapper { if ($owner === null || $owner === false) { return $this->owner; } + + return $owner; } } diff --git a/core/Application.php b/core/Application.php index 2996c412553..217b6ac41e9 100644 --- a/core/Application.php +++ b/core/Application.php @@ -163,6 +163,13 @@ class Application extends App { $subject->addHintForMissingSubject($table->getName(), 'schedulobj_principuri_index'); } } + + if ($schema->hasTable('properties')) { + $table = $schema->getTable('properties'); + if (!$table->hasIndex('properties_path_index')) { + $subject->addHintForMissingSubject($table->getName(), 'properties_path_index'); + } + } } ); diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php index 506fef94a63..2784721f55f 100644 --- a/core/Command/Db/AddMissingIndices.php +++ b/core/Command/Db/AddMissingIndices.php @@ -11,6 +11,7 @@ declare(strict_types=1); * @author Robin Appelman <robin@icewind.nl> * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Citharel <nextcloud@tcit.fr> + * @author Mario Danic <mario@lovelyhq.com> * * @license GNU AGPL version 3 or any later version * @@ -254,6 +255,19 @@ class AddMissingIndices extends Command { } } + $output->writeln('<info>Check indices of the oc_properties table.</info>'); + if ($schema->hasTable('properties')) { + $table = $schema->getTable('properties'); + if (!$table->hasIndex('properties_path_index')) { + $output->writeln('<info>Adding properties_path_index index to the oc_properties table, this can take some time...</info>'); + + $table->addIndex(['userid', 'propertypath'], 'properties_path_index'); + $this->connection->migrateToSchema($schema->getWrappedSchema()); + $updated = true; + $output->writeln('<info>oc_properties table updated successfully.</info>'); + } + } + if (!$updated) { $output->writeln('<info>Done.</info>'); } diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php index f9745566168..7e48059f798 100644 --- a/core/Migrations/Version13000Date20170718121200.php +++ b/core/Migrations/Version13000Date20170718121200.php @@ -318,6 +318,7 @@ class Version13000Date20170718121200 extends SimpleMigrationStep { ]); $table->setPrimaryKey(['id']); $table->addIndex(['userid'], 'property_index'); + $table->addIndex(['userid', 'propertypath'], 'properties_path_index'); } if (!$schema->hasTable('share')) { diff --git a/lib/private/App/AppStore/Bundles/EducationBundle.php b/lib/private/App/AppStore/Bundles/EducationBundle.php index 01296cd0536..05d6fbbd9d7 100644 --- a/lib/private/App/AppStore/Bundles/EducationBundle.php +++ b/lib/private/App/AppStore/Bundles/EducationBundle.php @@ -37,13 +37,11 @@ class EducationBundle extends Bundle { */ public function getAppIdentifiers() { return [ - 'zenodo', 'dashboard', 'circles', 'groupfolders', 'announcementcenter', 'quota_warning', - 'orcid', 'user_saml', ]; } diff --git a/tests/lib/App/AppStore/Bundles/EducationBundleTest.php b/tests/lib/App/AppStore/Bundles/EducationBundleTest.php index bdbc3f172b7..db96b3e46aa 100644 --- a/tests/lib/App/AppStore/Bundles/EducationBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/EducationBundleTest.php @@ -30,13 +30,11 @@ class EducationBundleTest extends BundleBase { $this->bundleIdentifier = 'EducationBundle'; $this->bundleName = 'Education Edition'; $this->bundleAppIds = [ - 'zenodo', 'dashboard', 'circles', 'groupfolders', 'announcementcenter', 'quota_warning', - 'orcid', 'user_saml', ]; } |