summary refs log tree commit diff
path: root/synapse/storage/engines
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-13 13:57:06 +0100
committerErik Johnston <erik@matrix.org>2015-10-13 14:03:30 +0100
commit88971fd03451205a74babc594b1730bf6d80faf1 (patch)
treede90f47ba080d217dbc62c238be5b9ba1123e242 /synapse/storage/engines
parentAdd SQLite support (diff)
parentrename schema_prepare to prepare_database (diff)
downloadsynapse-88971fd03451205a74babc594b1730bf6d80faf1.tar.xz
Merge branch 'erikj/store_engine' into erikj/search
Diffstat (limited to 'synapse/storage/engines')
-rw-r--r--synapse/storage/engines/postgres.py2
-rw-r--r--synapse/storage/engines/sqlite3.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py
index 7e45dabf4c..98d66e0a86 100644
--- a/synapse/storage/engines/postgres.py
+++ b/synapse/storage/engines/postgres.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from synapse.storage.schema_prepare import prepare_database
+from synapse.storage.prepare_database import prepare_database
 
 from ._base import IncorrectDatabaseSetup
 
diff --git a/synapse/storage/engines/sqlite3.py b/synapse/storage/engines/sqlite3.py
index 0eeaa45d19..bad3b5c5ac 100644
--- a/synapse/storage/engines/sqlite3.py
+++ b/synapse/storage/engines/sqlite3.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from synapse.storage.schema_prepare import (
+from synapse.storage.prepare_database import (
     prepare_database, prepare_sqlite3_database
 )