summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-07 12:13:58 +0100
committerErik Johnston <erik@matrix.org>2015-04-07 12:13:58 +0100
commit6bc9edd8b22309796470950a855fc43b88171bea (patch)
treea859c88e014eb11a9d96c41f0753b996ce948883 /synapse
parentBump database version (diff)
downloadsynapse-6bc9edd8b22309796470950a855fc43b88171bea.tar.xz
Fix prepare_sqlite3_database's convert_param_style
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/__init__.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 9b30cd6ad9..e16414d736 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -442,8 +442,6 @@ def prepare_sqlite3_database(db_conn):
     new. This only affects sqlite databases since they were the only ones
     supported at the time.
     """
-    import sqlite3
-
     with db_conn:
         schema_path = os.path.join(
             dir_path, "schema", "schema_version.sql",
@@ -462,10 +460,7 @@ def prepare_sqlite3_database(db_conn):
 
             if row and row[0]:
                 db_conn.execute(
-                    _convert_param_style(
-                        "REPLACE INTO schema_version (version, upgraded)"
-                        " VALUES (?,?)",
-                        sqlite3
-                    ),
+                    "REPLACE INTO schema_version (version, upgraded)"
+                    " VALUES (?,?)",
                     (row[0], False)
                 )