From b2510dce858cee67229b1d19610b463fb1373b20 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 23 Oct 2019 15:54:17 +0100
Subject: [PATCH 1/2] Fix import paths in synapse_port_db

---
 scripts/synapse_port_db | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db
index 5a34d6f2f5..33f0bef0f2 100755
--- a/scripts/synapse_port_db
+++ b/scripts/synapse_port_db
@@ -33,19 +33,27 @@ from twisted.internet import defer, reactor
 from synapse.config.homeserver import HomeServerConfig
 from synapse.logging.context import PreserveLoggingContext
 from synapse.storage._base import LoggingTransaction
-from synapse.storage.client_ips import ClientIpBackgroundUpdateStore
-from synapse.storage.deviceinbox import DeviceInboxBackgroundUpdateStore
-from synapse.storage.devices import DeviceBackgroundUpdateStore
+from synapse.storage.data_stores.main.client_ips import ClientIpBackgroundUpdateStore
+from synapse.storage.data_stores.main.deviceinbox import DeviceInboxBackgroundUpdateStore
+from synapse.storage.data_stores.main.devices import DeviceBackgroundUpdateStore
 from synapse.storage.engines import create_engine
-from synapse.storage.events_bg_updates import EventsBackgroundUpdatesStore
-from synapse.storage.media_repository import MediaRepositoryBackgroundUpdateStore
+from synapse.storage.data_stores.main.events_bg_updates import (
+    EventsBackgroundUpdatesStore
+)
+from synapse.storage.data_stores.main.media_repository import (
+    MediaRepositoryBackgroundUpdateStore
+)
 from synapse.storage.prepare_database import prepare_database
-from synapse.storage.registration import RegistrationBackgroundUpdateStore
-from synapse.storage.roommember import RoomMemberBackgroundUpdateStore
-from synapse.storage.search import SearchBackgroundUpdateStore
-from synapse.storage.state import StateBackgroundUpdateStore
-from synapse.storage.stats import StatsStore
-from synapse.storage.user_directory import UserDirectoryBackgroundUpdateStore
+from synapse.storage.data_stores.main.registration import (
+    RegistrationBackgroundUpdateStore
+)
+from synapse.storage.data_stores.main.roommember import RoomMemberBackgroundUpdateStore
+from synapse.storage.data_stores.main.search import SearchBackgroundUpdateStore
+from synapse.storage.data_stores.main.state import StateBackgroundUpdateStore
+from synapse.storage.data_stores.main.stats import StatsStore
+from synapse.storage.data_stores.main.user_directory import (
+    UserDirectoryBackgroundUpdateStore
+)
 from synapse.util import Clock
 
 logger = logging.getLogger("synapse_port_db")

From 2f859e865a7112c1d2a329bae20cb47d89813334 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 23 Oct 2019 15:56:50 +0100
Subject: [PATCH 2/2] Changelog

---
 changelog.d/6243.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6243.bugfix

diff --git a/changelog.d/6243.bugfix b/changelog.d/6243.bugfix
new file mode 100644
index 0000000000..cd288c2a44
--- /dev/null
+++ b/changelog.d/6243.bugfix
@@ -0,0 +1 @@
+Make the `synapse_port_db` script create the right indexes on a new PostgreSQL database.