From 827a552afa18eaf48b67f5b76f57bd71542b6245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= <ilmari@ilmari.org>
Date: Mon, 28 Sep 2020 01:30:02 +0100
Subject: [PATCH 1/2] Add `ui_auth_sessions_ips` table to `synapse_port_db`
 ignore list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This table was created in #8034 (1.20.0).  It references
`ui_auth_sessions`, which is ignored, so this one should be too.

Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
---
 changelog.d/8410.bugfix | 1 +
 scripts/synapse_port_db | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/8410.bugfix

diff --git a/changelog.d/8410.bugfix b/changelog.d/8410.bugfix
new file mode 100644
index 000000000000..3296929da767
--- /dev/null
+++ b/changelog.d/8410.bugfix
@@ -0,0 +1 @@
+Fix `synapse_port_db` script regression from 1.20.0.
diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db
index 684a518b8e5f..ae2887b7d2f4 100755
--- a/scripts/synapse_port_db
+++ b/scripts/synapse_port_db
@@ -145,6 +145,7 @@ IGNORED_TABLES = {
     # the sessions are transient anyway, so ignore them.
     "ui_auth_sessions",
     "ui_auth_sessions_credentials",
+    "ui_auth_sessions_ips",
 }
 
 

From 673425b07df5b9961e0abc37c85c861cc52f858f Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Mon, 28 Sep 2020 15:29:50 +0100
Subject: [PATCH 2/2] Update changelog.d/8410.bugfix

---
 changelog.d/8410.bugfix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/8410.bugfix b/changelog.d/8410.bugfix
index 3296929da767..1323ddc525db 100644
--- a/changelog.d/8410.bugfix
+++ b/changelog.d/8410.bugfix
@@ -1 +1 @@
-Fix `synapse_port_db` script regression from 1.20.0.
+Fix a v1.20.0 regression in the `synapse_port_db` script regarding the `ui_auth_sessions_ips` table.