aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/dav/lib/Migration/Version1004Date20170924124212.php5
-rw-r--r--core/Application.php10
2 files changed, 9 insertions, 6 deletions
diff --git a/apps/dav/lib/Migration/Version1004Date20170924124212.php b/apps/dav/lib/Migration/Version1004Date20170924124212.php
index a8b85469214..fbfec7e8e2d 100644
--- a/apps/dav/lib/Migration/Version1004Date20170924124212.php
+++ b/apps/dav/lib/Migration/Version1004Date20170924124212.php
@@ -28,7 +28,10 @@ class Version1004Date20170924124212 extends SimpleMigrationStep {
$table->addIndex(['addressbookid', 'uri'], 'cards_abiduri');
$table = $schema->getTable('cards_properties');
- $table->addIndex(['addressbookid'], 'cards_prop_abid');
+ // Removed later on
+ // $table->addIndex(['addressbookid'], 'cards_prop_abid');
+ // Added later on
+ $table->addIndex(['addressbookid', 'name', 'value'], 'cards_prop_abid_name_value', );
return $schema;
}
diff --git a/core/Application.php b/core/Application.php
index a0dacb885ae..cc84f191330 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -147,12 +147,12 @@ class Application extends App {
true
);
- $event->addMissingIndex(
+ $event->replaceIndex(
'cards_properties',
- 'cards_prop_abid',
- ['addressbookid'],
- [],
- true
+ ['cards_prop_abid'],
+ 'cards_prop_abid_name_value',
+ ['addressbookid', 'name', 'value'],
+ false,
);
$event->addMissingIndex(