diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-13 17:03:49 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-13 17:03:49 +0100 |
| commit | 86fc9b617c5eb91186a8466370ddd97f3acd34a2 (patch) | |
| tree | 77e27c555e59c6504947f1c28932db772fd2e1fb | |
| parent | Support running porting script multiple times (diff) | |
| download | synapse-86fc9b617c5eb91186a8466370ddd97f3acd34a2.tar.xz | |
For backwards compat, make state_groups.id have a type of int, not varchar
| -rw-r--r-- | synapse/storage/schema/full_schemas/16/state.sql | 2 | ||||
| -rw-r--r-- | synapse/storage/state.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/schema/full_schemas/16/state.sql b/synapse/storage/schema/full_schemas/16/state.sql index 8d6b94a616..8c51610396 100644 --- a/synapse/storage/schema/full_schemas/16/state.sql +++ b/synapse/storage/schema/full_schemas/16/state.sql @@ -14,7 +14,7 @@ */ CREATE TABLE IF NOT EXISTS state_groups( - id VARCHAR(20) PRIMARY KEY, + id BIGINT UNSIGNED PRIMARY KEY, room_id VARCHAR(150) NOT NULL, event_id VARCHAR(150) NOT NULL ); diff --git a/synapse/storage/state.py b/synapse/storage/state.py index 4994bacd6c..553ba9dd1f 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -93,7 +93,7 @@ class StateStore(SQLBaseStore): state_group = context.state_group if not state_group: - state_group = _make_group_id(self._clock) + state_group = self._state_groups_id_gen.get_next_txn(txn) self._simple_insert_txn( txn, table="state_groups", |