Skip to content

Commit

Permalink
Merge pull request #42061 from nextcloud/revert/index-preferences
Browse files Browse the repository at this point in the history
  • Loading branch information
juliushaertl authored Dec 6, 2023
2 parents b6f43c1 + 1cfc8a2 commit 74acfa4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
11 changes: 0 additions & 11 deletions core/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
use OC\Authentication\Notifications\Notifier as AuthenticationNotifier;
use OC\Core\Listener\BeforeTemplateRenderedListener;
use OC\Core\Notification\CoreNotifier;
use OC\SystemConfig;
use OC\TagManager;
use OCP\AppFramework\App;
use OCP\AppFramework\Http\Events\BeforeLoginTemplateRenderedEvent;
Expand Down Expand Up @@ -82,7 +81,6 @@ public function __construct() {
$notificationManager->registerNotifierService(AuthenticationNotifier::class);

$eventDispatcher->addListener(AddMissingIndicesEvent::class, function (AddMissingIndicesEvent $event) {
$dbType = $this->getContainer()->get(SystemConfig::class)->getSystemValue('dbtype', 'sqlite');
$event->addMissingIndex(
'share',
'share_with_index',
Expand Down Expand Up @@ -239,15 +237,6 @@ public function __construct() {
['appid', 'configkey']
);

if ($dbType !== 'oci') {
$event->addMissingIndex(
'preferences',
'preferences_configvalue',
['configvalue'],
['lengths' => [80]]
);
}

$event->addMissingIndex(
'mounts',
'mounts_class_index',
Expand Down
4 changes: 0 additions & 4 deletions core/Migrations/Version13000Date20170718121200.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
*/
namespace OC\Core\Migrations;

use Doctrine\DBAL\Platforms\OraclePlatform;
use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
use OCP\DB\ISchemaWrapper;
use OCP\DB\Types;
Expand Down Expand Up @@ -333,9 +332,6 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
]);
$table->setPrimaryKey(['userid', 'appid', 'configkey']);
$table->addIndex(['appid', 'configkey'], 'preferences_app_key');
if (!$this->connection->getDatabasePlatform() instanceof OraclePlatform) {
$table->addIndex(['configvalue'], 'preferences_configvalue', [], ['lengths' => [80]]);
}
}

if (!$schema->hasTable('properties')) {
Expand Down

0 comments on commit 74acfa4

Please sign in to comment.