summary refs log tree commit diff
path: root/synapse/storage/engines/sqlite3.py
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/sqlite3.py
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/sqlite3.py')
-rw-r--r--synapse/storage/engines/sqlite3.py2
1 files changed, 1 insertions, 1 deletions
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 )