summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-04-07 16:43:54 +0100
committerDavid Baker <dave@matrix.org>2016-04-07 16:43:54 +0100
commit2d5c693fd3c72800980f906b8255e3619ac524e2 (patch)
treea5d836478900811d94219c8ea6a9535c2fbfd3ad /synapse/storage
parentMerge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_act... (diff)
downloadsynapse-2d5c693fd3c72800980f906b8255e3619ac524e2.tar.xz
Fix port script for changes merged from develop
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/schema/delta/31/pushers.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/schema/delta/31/pushers.py b/synapse/storage/schema/delta/31/pushers.py
index 7e0e385fb5..d07bab012f 100644
--- a/synapse/storage/schema/delta/31/pushers.py
+++ b/synapse/storage/schema/delta/31/pushers.py
@@ -27,7 +27,7 @@ def token_to_stream_ordering(token):
     return int(token[1:].split('_')[0])
 
 
-def run_upgrade(cur, database_engine, *args, **kwargs):
+def run_create(cur, database_engine, *args, **kwargs):
     logger.info("Porting pushers table, delta 31...")
     cur.execute("""
         CREATE TABLE IF NOT EXISTS pushers2 (
@@ -73,3 +73,6 @@ def run_upgrade(cur, database_engine, *args, **kwargs):
     cur.execute("DROP TABLE pushers")
     cur.execute("ALTER TABLE pushers2 RENAME TO pushers")
     logger.info("Moved %d pushers to new table", count)
+
+def run_upgrade(cur, database_engine, *args, **kwargs):
+    pass