summary refs log tree commit diff
path: root/synapse/storage/engines/sqlite3.py
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 /synapse/storage/engines/sqlite3.py
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 'synapse/storage/engines/sqlite3.py')
-rw-r--r--synapse/storage/engines/sqlite3.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/engines/sqlite3.py b/synapse/storage/engines/sqlite3.py
index 91fac33b8b..522b905949 100644
--- a/synapse/storage/engines/sqlite3.py
+++ b/synapse/storage/engines/sqlite3.py
@@ -23,8 +23,9 @@ import struct
 class Sqlite3Engine(object):
     single_threaded = True
 
-    def __init__(self, database_module):
+    def __init__(self, database_module, config):
         self.module = database_module
+        self.config = config
 
     def check_database(self, txn):
         pass
@@ -38,7 +39,7 @@ class Sqlite3Engine(object):
 
     def prepare_database(self, db_conn):
         prepare_sqlite3_database(db_conn)
-        prepare_database(db_conn, self)
+        prepare_database(db_conn, self, config=self.config)
 
     def is_deadlock(self, error):
         return False