summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-03-03 13:56:28 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-03-03 13:56:28 +0000
commit95481e7ba70fd5745c409ef285ed6bd0def81426 (patch)
treee4d4b3c6215a228055ea3108fa3b0d3b87ecde0d /scripts
parentjenkins.sh: set -x (diff)
parentMark AS users with their AS's ID (diff)
downloadsynapse-95481e7ba70fd5745c409ef285ed6bd0def81426.tar.xz
Merge pull request #571 from matrix-org/daniel/asids
Mark AS users with their AS's ID
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/synapse_port_db9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db
index fc92bbf2d8..a2a0f364cf 100755
--- a/scripts/synapse_port_db
+++ b/scripts/synapse_port_db
@@ -309,8 +309,8 @@ class Porter(object):
                 **self.postgres_config["args"]
             )
 
-            sqlite_engine = create_engine("sqlite3")
-            postgres_engine = create_engine("psycopg2")
+            sqlite_engine = create_engine(FakeConfig(sqlite_config))
+            postgres_engine = create_engine(FakeConfig(postgres_config))
 
             self.sqlite_store = Store(sqlite_db_pool, sqlite_engine)
             self.postgres_store = Store(postgres_db_pool, postgres_engine)
@@ -792,3 +792,8 @@ if __name__ == "__main__":
     if end_error_exec_info:
         exc_type, exc_value, exc_traceback = end_error_exec_info
         traceback.print_exception(exc_type, exc_value, exc_traceback)
+
+
+class FakeConfig:
+    def __init__(self, database_config):
+        self.database_config = database_config