diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2015-12-02 17:26:17 +0000 |
|---|---|---|
| committer | David Baker <dbkr@users.noreply.github.com> | 2015-12-02 17:26:17 +0000 |
| commit | 181616deed3ae217290b232f078655989f6c309f (patch) | |
| tree | ff0e2c6b98825c87052bcd5cc5ac9a3728896467 | |
| parent | Merge pull request #416 from matrix-org/markjh/idempotent_state (diff) | |
| parent | Just replace the table definition with the one from full_schema 16 (diff) | |
| download | synapse-181616deed3ae217290b232f078655989f6c309f.tar.xz | |
Merge pull request #417 from matrix-org/fix_db_v15_postgres
Fix schema delta 15 on postgres
| -rw-r--r-- | synapse/storage/schema/delta/15/v15.sql | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/synapse/storage/schema/delta/15/v15.sql b/synapse/storage/schema/delta/15/v15.sql index f5b2a08ca4..9523d2bcc3 100644 --- a/synapse/storage/schema/delta/15/v15.sql +++ b/synapse/storage/schema/delta/15/v15.sql @@ -1,23 +1,22 @@ -- Drop, copy & recreate pushers table to change unique key -- Also add access_token column at the same time CREATE TABLE IF NOT EXISTS pushers2 ( - id INTEGER PRIMARY KEY AUTOINCREMENT, + id BIGINT PRIMARY KEY, user_name TEXT NOT NULL, - access_token INTEGER DEFAULT NULL, - profile_tag varchar(32) NOT NULL, - kind varchar(8) NOT NULL, - app_id varchar(64) NOT NULL, - app_display_name varchar(64) NOT NULL, - device_display_name varchar(128) NOT NULL, - pushkey blob NOT NULL, + access_token BIGINT DEFAULT NULL, + profile_tag VARCHAR(32) NOT NULL, + kind VARCHAR(8) NOT NULL, + app_id VARCHAR(64) NOT NULL, + app_display_name VARCHAR(64) NOT NULL, + device_display_name VARCHAR(128) NOT NULL, + pushkey bytea NOT NULL, ts BIGINT NOT NULL, - lang varchar(8), - data blob, + lang VARCHAR(8), + data bytea, last_token TEXT, last_success BIGINT, failing_since BIGINT, - FOREIGN KEY(user_name) REFERENCES users(name), - UNIQUE (app_id, pushkey, user_name) + UNIQUE (app_id, pushkey) ); 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; |