Merge pull request #417 from matrix-org/fix_db_v15_postgres

Fix schema delta 15 on postgres
This commit is contained in:
David Baker 2015-12-02 17:26:17 +00:00
commit 181616deed

View File

@ -1,23 +1,22 @@
-- Drop, copy & recreate pushers table to change unique key -- Drop, copy & recreate pushers table to change unique key
-- Also add access_token column at the same time -- Also add access_token column at the same time
CREATE TABLE IF NOT EXISTS pushers2 ( CREATE TABLE IF NOT EXISTS pushers2 (
id INTEGER PRIMARY KEY AUTOINCREMENT, id BIGINT PRIMARY KEY,
user_name TEXT NOT NULL, user_name TEXT NOT NULL,
access_token INTEGER DEFAULT NULL, access_token BIGINT DEFAULT NULL,
profile_tag varchar(32) NOT NULL, profile_tag VARCHAR(32) NOT NULL,
kind varchar(8) NOT NULL, kind VARCHAR(8) NOT NULL,
app_id varchar(64) NOT NULL, app_id VARCHAR(64) NOT NULL,
app_display_name varchar(64) NOT NULL, app_display_name VARCHAR(64) NOT NULL,
device_display_name varchar(128) NOT NULL, device_display_name VARCHAR(128) NOT NULL,
pushkey blob NOT NULL, pushkey bytea NOT NULL,
ts BIGINT NOT NULL, ts BIGINT NOT NULL,
lang varchar(8), lang VARCHAR(8),
data blob, data bytea,
last_token TEXT, last_token TEXT,
last_success BIGINT, last_success BIGINT,
failing_since BIGINT, failing_since BIGINT,
FOREIGN KEY(user_name) REFERENCES users(name), UNIQUE (app_id, pushkey)
UNIQUE (app_id, pushkey, user_name)
); );
INSERT INTO pushers2 (id, user_name, profile_tag, kind, app_id, app_display_name, device_display_name, pushkey, ts, lang, data, last_token, last_success, failing_since) INSERT INTO pushers2 (id, user_name, profile_tag, kind, app_id, app_display_name, device_display_name, pushkey, ts, lang, data, last_token, last_success, failing_since)
SELECT id, user_name, profile_tag, kind, app_id, app_display_name, device_display_name, pushkey, ts, lang, data, last_token, last_success, failing_since FROM pushers; SELECT id, user_name, profile_tag, kind, app_id, app_display_name, device_display_name, pushkey, ts, lang, data, last_token, last_success, failing_since FROM pushers;