summary refs log tree commit diff
path: root/synapse/storage/engines/postgres.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-13 13:19:23 +0100
committerErik Johnston <erik@matrix.org>2015-10-13 13:29:02 +0100
commitf9340ea0d5346bb07489b1bd03bb90ea8f437e42 (patch)
tree3cb14e0a740aa768df674d08bb51c53970a215cb /synapse/storage/engines/postgres.py
parentSearch left rooms too (diff)
parentExpose error more nicely (diff)
downloadsynapse-f9340ea0d5346bb07489b1bd03bb90ea8f437e42.tar.xz
Merge branch 'erikj/store_engine' into erikj/search
Diffstat (limited to 'synapse/storage/engines/postgres.py')
-rw-r--r--synapse/storage/engines/postgres.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py
index 4a855ffd56..7e45dabf4c 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 import prepare_database
+from synapse.storage.schema_prepare import prepare_database
 
 from ._base import IncorrectDatabaseSetup