From 3e85e52b3f0e9330f29ec3d0f572db7b122c88b0 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Mon, 19 Jan 2015 15:26:19 +0000
Subject: Allow ':memory:' as the database path for sqlite3

---
 synapse/app/homeserver.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'synapse/app')

diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 43b5c26144..61ad53fbb2 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -247,7 +247,13 @@ def setup():
 
     logger.info("Database prepared in %s.", db_name)
 
-    hs.get_db_pool()
+    db_pool = hs.get_db_pool()
+
+    if db_name == ":memory:"
+        # Memory databases will need to be setup each time they are opened.
+        reactor.callWhenRunning(
+            hs.get_db_pool().runWithConnection, prepare_database
+        )
 
     if config.manhole:
         f = twisted.manhole.telnet.ShellFactory()
-- 
cgit 1.5.1