Skip to content
Snippets Groups Projects
Commit 204132a9 authored by Erik Johnston's avatar Erik Johnston
Browse files

Check that postgres database has correct charset set

parent 478e511d
No related branches found
No related tags found
No related merge requests found
......@@ -283,6 +283,10 @@ class Porter(object):
self.sqlite_store = Store(sqlite_db_pool, sqlite_engine)
self.postgres_store = Store(postgres_db_pool, postgres_engine)
yield self.postgres_store.execute(
postgres_engine.check_database
)
# Step 1. Set up databases.
self.progress.set_state("Preparing SQLite3")
self.setup_db(sqlite_config, sqlite_engine)
......
......@@ -17,7 +17,7 @@
import sys
sys.dont_write_bytecode = True
from synapse.storage.engines import create_engine
from synapse.storage.engines import create_engine, IncorrectDatabaseSetup
from synapse.storage import (
are_all_users_on_domain, UpgradeDatabaseException,
)
......@@ -255,6 +255,15 @@ class SynapseHomeServer(HomeServer):
)
sys.exit(1)
try:
database_engine.check_database(db_conn.cursor())
except IncorrectDatabaseSetup as e:
sys.stderr.write("*" * len(e.message) + '\n')
sys.stderr.write(e.message)
sys.stderr.write('\n')
sys.stderr.write("*" * len(e.message) + '\n')
sys.exit(2)
def get_version_string():
try:
......
......@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from ._base import IncorrectDatabaseSetup
from .postgres import PostgresEngine
from .sqlite3 import Sqlite3Engine
......
# -*- coding: utf-8 -*-
# Copyright 2015 OpenMarket Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
class IncorrectDatabaseSetup(RuntimeError):
pass
......@@ -15,12 +15,23 @@
from synapse.storage import prepare_database
from ._base import IncorrectDatabaseSetup
class PostgresEngine(object):
def __init__(self, database_module):
self.module = database_module
self.module.extensions.register_type(self.module.extensions.UNICODE)
def check_database(self, txn):
txn.execute("SHOW SERVER_ENCODING")
rows = txn.fetchall()
if rows and rows[0][0] != "UTF8":
raise IncorrectDatabaseSetup(
"Database has incorrect encoding: '%s' instead of 'UTF8'"
% (rows[0][0],)
)
def convert_param_style(self, sql):
return sql.replace("?", "%s")
......
......@@ -20,6 +20,9 @@ class Sqlite3Engine(object):
def __init__(self, database_module):
self.module = database_module
def check_database(self, txn):
pass
def convert_param_style(self, sql):
return sql
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment