Fix upgrade script to run all the missing deltas.
This commit is contained in:
parent
b3c793e362
commit
42b725ce52
|
@ -1,3 +1,5 @@
|
||||||
|
|
||||||
|
from synapse.storage import SCHEMA_VERSION, read_schema
|
||||||
from synapse.storage._base import SQLBaseStore
|
from synapse.storage._base import SQLBaseStore
|
||||||
from synapse.storage.signatures import SignatureStore
|
from synapse.storage.signatures import SignatureStore
|
||||||
from synapse.storage.event_federation import EventFederationStore
|
from synapse.storage.event_federation import EventFederationStore
|
||||||
|
@ -186,12 +188,16 @@ def get_key(server_name):
|
||||||
|
|
||||||
|
|
||||||
def reinsert_events(cursor, server_name, signing_key):
|
def reinsert_events(cursor, server_name, signing_key):
|
||||||
|
print "Running delta: v10"
|
||||||
|
|
||||||
cursor.executescript(delta_sql)
|
cursor.executescript(delta_sql)
|
||||||
|
|
||||||
cursor.execute(
|
cursor.execute(
|
||||||
"SELECT * FROM events ORDER BY rowid ASC"
|
"SELECT * FROM events ORDER BY rowid ASC"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
print "Getting events..."
|
||||||
|
|
||||||
rows = store.cursor_to_dict(cursor)
|
rows = store.cursor_to_dict(cursor)
|
||||||
|
|
||||||
events = store._generate_event_json(cursor, rows)
|
events = store._generate_event_json(cursor, rows)
|
||||||
|
@ -281,7 +287,21 @@ def reinsert_events(cursor, server_name, signing_key):
|
||||||
def main(database, server_name, signing_key):
|
def main(database, server_name, signing_key):
|
||||||
conn = sqlite3.connect(database)
|
conn = sqlite3.connect(database)
|
||||||
cursor = conn.cursor()
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
# Do other deltas:
|
||||||
|
cursor.execute("PRAGMA user_version")
|
||||||
|
row = cursor.fetchone()
|
||||||
|
|
||||||
|
if row and row[0]:
|
||||||
|
user_version = row[0]
|
||||||
|
# Run every version since after the current version.
|
||||||
|
for v in range(user_version + 1, 10):
|
||||||
|
print "Running delta: %d" % (v,)
|
||||||
|
sql_script = read_schema("delta/v%d" % (v,))
|
||||||
|
cursor.executescript(sql_script)
|
||||||
|
|
||||||
reinsert_events(cursor, server_name, signing_key)
|
reinsert_events(cursor, server_name, signing_key)
|
||||||
|
|
||||||
conn.commit()
|
conn.commit()
|
||||||
|
|
||||||
print "Success!"
|
print "Success!"
|
||||||
|
|
|
@ -20,4 +20,60 @@ CREATE TABLE IF NOT EXISTS destinations(
|
||||||
retry_interval INTEGER
|
retry_interval INTEGER
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS local_media_repository (
|
||||||
|
media_id TEXT, -- The id used to refer to the media.
|
||||||
|
media_type TEXT, -- The MIME-type of the media.
|
||||||
|
media_length INTEGER, -- Length of the media in bytes.
|
||||||
|
created_ts INTEGER, -- When the content was uploaded in ms.
|
||||||
|
upload_name TEXT, -- The name the media was uploaded with.
|
||||||
|
user_id TEXT, -- The user who uploaded the file.
|
||||||
|
CONSTRAINT uniqueness UNIQUE (media_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS local_media_repository_thumbnails (
|
||||||
|
media_id TEXT, -- The id used to refer to the media.
|
||||||
|
thumbnail_width INTEGER, -- The width of the thumbnail in pixels.
|
||||||
|
thumbnail_height INTEGER, -- The height of the thumbnail in pixels.
|
||||||
|
thumbnail_type TEXT, -- The MIME-type of the thumbnail.
|
||||||
|
thumbnail_method TEXT, -- The method used to make the thumbnail.
|
||||||
|
thumbnail_length INTEGER, -- The length of the thumbnail in bytes.
|
||||||
|
CONSTRAINT uniqueness UNIQUE (
|
||||||
|
media_id, thumbnail_width, thumbnail_height, thumbnail_type
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS local_media_repository_thumbnails_media_id
|
||||||
|
ON local_media_repository_thumbnails (media_id);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS remote_media_cache (
|
||||||
|
media_origin TEXT, -- The remote HS the media came from.
|
||||||
|
media_id TEXT, -- The id used to refer to the media on that server.
|
||||||
|
media_type TEXT, -- The MIME-type of the media.
|
||||||
|
created_ts INTEGER, -- When the content was uploaded in ms.
|
||||||
|
upload_name TEXT, -- The name the media was uploaded with.
|
||||||
|
media_length INTEGER, -- Length of the media in bytes.
|
||||||
|
filesystem_id TEXT, -- The name used to store the media on disk.
|
||||||
|
CONSTRAINT uniqueness UNIQUE (media_origin, media_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS remote_media_cache_thumbnails (
|
||||||
|
media_origin TEXT, -- The remote HS the media came from.
|
||||||
|
media_id TEXT, -- The id used to refer to the media.
|
||||||
|
thumbnail_width INTEGER, -- The width of the thumbnail in pixels.
|
||||||
|
thumbnail_height INTEGER, -- The height of the thumbnail in pixels.
|
||||||
|
thumbnail_method TEXT, -- The method used to make the thumbnail
|
||||||
|
thumbnail_type TEXT, -- The MIME-type of the thumbnail.
|
||||||
|
thumbnail_length INTEGER, -- The length of the thumbnail in bytes.
|
||||||
|
filesystem_id TEXT, -- The name used to store the media on disk.
|
||||||
|
CONSTRAINT uniqueness UNIQUE (
|
||||||
|
media_origin, media_id, thumbnail_width, thumbnail_height,
|
||||||
|
thumbnail_type, thumbnail_type
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS remote_media_cache_thumbnails_media_id
|
||||||
|
ON local_media_repository_thumbnails (media_id);
|
||||||
|
|
||||||
|
|
||||||
PRAGMA user_version = 9;
|
PRAGMA user_version = 9;
|
Loading…
Reference in New Issue