Allow ':memory:' as the database path for sqlite3
This commit is contained in:
parent
5fed042640
commit
3e85e52b3f
|
@ -247,7 +247,13 @@ def setup():
|
||||||
|
|
||||||
logger.info("Database prepared in %s.", db_name)
|
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:
|
if config.manhole:
|
||||||
f = twisted.manhole.telnet.ShellFactory()
|
f = twisted.manhole.telnet.ShellFactory()
|
||||||
|
|
|
@ -20,6 +20,9 @@ import os
|
||||||
class DatabaseConfig(Config):
|
class DatabaseConfig(Config):
|
||||||
def __init__(self, args):
|
def __init__(self, args):
|
||||||
super(DatabaseConfig, self).__init__(args)
|
super(DatabaseConfig, self).__init__(args)
|
||||||
|
if args.database_path == ":memory:":
|
||||||
|
self.database_path = ":memory:"
|
||||||
|
else:
|
||||||
self.database_path = self.abspath(args.database_path)
|
self.database_path = self.abspath(args.database_path)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
Loading…
Reference in New Issue