tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge branch 'erikj/store_engine' into erikj/search

Browse source
This commit is contained in:
Erik Johnston 2015-10-13 13:57:06 +01:00
commit 88971fd034
6 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/app/homeserver.py
View file

@ -36,7 +36,7 @@ if __name__ == '__main__':
from synapse.storage.engines import create_engine, IncorrectDatabaseSetup
from synapse.storage import are_all_users_on_domain
from synapse.storage.schema_prepare import UpgradeDatabaseException
from synapse.storage.prepare_database import UpgradeDatabaseException
from synapse.server import HomeServer

2
synapse/storage/engines/postgres.py
View file

@ -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

2
synapse/storage/engines/sqlite3.py
View file

@ -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
)

0
synapse/storage/schema_prepare.py → synapse/storage/prepare_database.py
View file

2
synapse/storage/schema/delta/24/fts.py
View file

@ -14,7 +14,7 @@
import logging
from synapse.storage.schema_prepare import get_statements
from synapse.storage.prepare_database import get_statements
from synapse.storage.engines import PostgresEngine, Sqlite3Engine
import ujson

2
tests/utils.py
View file

@ -16,7 +16,7 @@
from synapse.http.server import HttpServer
from synapse.api.errors import cs_error, CodeMessageException, StoreError
from synapse.api.constants import EventTypes
from synapse.storage.schema_prepare import prepare_database
from synapse.storage.prepare_database import prepare_database
from synapse.storage.engines import create_engine
from synapse.server import HomeServer