summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-19 16:18:20 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-19 16:18:20 +0000
commit1397f83181249316425e12577d33d50916e358e8 (patch)
tree4afbb41d658778aaad23366234af901b1908f797
parentMerge pull request #6451 from matrix-org/uhoreg/cross_signing_signatures_index (diff)
parentFix error when using synapse_port_db on a vanilla synapse db (#6449) (diff)
downloadsynapse-1397f83181249316425e12577d33d50916e358e8.tar.xz
Fix error when using synapse_port_db on a vanilla synapse db (#6449)
* commit '85901939c':
  Update changelog.d/6449.bugfix
  Add changelog
  Fix error when using synapse_port_db on a vanilla synapse db
Diffstat (limited to '')
-rw-r--r--changelog.d/6449.bugfix1
-rwxr-xr-xscripts/synapse_port_db5
2 files changed, 5 insertions, 1 deletions
diff --git a/changelog.d/6449.bugfix b/changelog.d/6449.bugfix
new file mode 100644

index 0000000000..002f33c450 --- /dev/null +++ b/changelog.d/6449.bugfix
@@ -0,0 +1 @@ +Fix error when using synapse_port_db on a vanilla synapse db. diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db
index 0d3321682c..f24b8ffe67 100755 --- a/scripts/synapse_port_db +++ b/scripts/synapse_port_db
@@ -782,7 +782,10 @@ class Porter(object): def _setup_state_group_id_seq(self): def r(txn): txn.execute("SELECT MAX(id) FROM state_groups") - next_id = txn.fetchone()[0] + 1 + curr_id = txn.fetchone()[0] + if not curr_id: + return + next_id = curr_id + 1 txn.execute("ALTER SEQUENCE state_group_id_seq RESTART WITH %s", (next_id,)) return self.postgres_store.runInteraction("setup_state_group_id_seq", r)