diff --git a/synapse/storage/engines/__init__.py b/synapse/storage/engines/__init__.py
index 548d4e1b42..eb76df7f01 100644
--- a/synapse/storage/engines/__init__.py
+++ b/synapse/storage/engines/__init__.py
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from .maria import MariaEngine
from .postgres import PostgresEngine
from .sqlite3 import Sqlite3Engine
@@ -22,7 +21,6 @@ import importlib
SUPPORTED_MODULE = {
"sqlite3": Sqlite3Engine,
- "mysql.connector": MariaEngine,
"psycopg2": PostgresEngine,
}
diff --git a/synapse/storage/engines/maria.py b/synapse/storage/engines/maria.py
deleted file mode 100644
index 90165f6849..0000000000
--- a/synapse/storage/engines/maria.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- 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.
-
-from synapse.storage import prepare_database
-
-import types
-
-
-class MariaEngine(object):
- def __init__(self, database_module):
- self.module = database_module
-
- def convert_param_style(self, sql):
- return sql.replace("?", "%s")
-
- def encode_parameter(self, param):
- if isinstance(param, types.BufferType):
- return bytes(param)
- return param
-
- def on_new_connection(self, db_conn):
- pass
-
- def prepare_database(self, db_conn):
- cur = db_conn.cursor()
- cur.execute(
- "ALTER DATABASE CHARACTER SET utf8mb4 COLLATE utf8mb4_bin"
- )
- db_conn.commit()
- prepare_database(db_conn, self)
-
- def is_deadlock(self, error):
- if isinstance(error, self.module.DatabaseError):
- return error.sqlstate == "40001" and error.errno == 1213
- return False
-
- def load_unicode(self, v):
- return bytes(v).decode("UTF8")
diff --git a/synapse/storage/schema/delta/16/unique_constraints.sql b/synapse/storage/schema/delta/16/unique_constraints.sql
index f9fbb6b448..3604ea8427 100644
--- a/synapse/storage/schema/delta/16/unique_constraints.sql
+++ b/synapse/storage/schema/delta/16/unique_constraints.sql
@@ -1,5 +1,5 @@
--- We can use SQLite features here, since mysql support was only added in v16
+-- We can use SQLite features here, since other db support was only added in v16
--
DELETE FROM current_state_events WHERE rowid not in (
|
