Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-14 02:10:40 -05:00
Code Issues Projects Releases Packages Wiki 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
Download patch file Download diff file Expand all files Collapse all files

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