From bc4372ad81f5037e107a608d4736161ba86bb201 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Thu, 9 Nov 2023 14:40:45 -0500
Subject: [PATCH] Use dbname instead of database for Postgres config. (#16618)

---
 changelog.d/16618.misc                           | 1 +
 docs/postgres.md                                 | 2 +-
 docs/usage/configuration/config_documentation.md | 6 +++---
 tests/server.py                                  | 6 +++---
 tests/utils.py                                   | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 changelog.d/16618.misc

diff --git a/changelog.d/16618.misc b/changelog.d/16618.misc
new file mode 100644
index 000000000..c026e6b99
--- /dev/null
+++ b/changelog.d/16618.misc
@@ -0,0 +1 @@
+Use `dbname` instead of the deprecated `database` connection parameter for psycopg2.
diff --git a/docs/postgres.md b/docs/postgres.md
index 02d4b9b16..ad7c6a073 100644
--- a/docs/postgres.md
+++ b/docs/postgres.md
@@ -66,7 +66,7 @@ database:
   args:
     user: <user>
     password: <pass>
-    database: <db>
+    dbname: <db>
     host: <host>
     cp_min: 5
     cp_max: 10
diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md
index a1ca5fa98..a673975e0 100644
--- a/docs/usage/configuration/config_documentation.md
+++ b/docs/usage/configuration/config_documentation.md
@@ -1447,7 +1447,7 @@ database:
   args:
     user: synapse_user
     password: secretpassword
-    database: synapse
+    dbname: synapse
     host: localhost
     port: 5432
     cp_min: 5
@@ -1526,7 +1526,7 @@ databases:
     args:
       user: synapse_user
       password: secretpassword
-      database: synapse_main
+      dbname: synapse_main
       host: localhost
       port: 5432
       cp_min: 5
@@ -1539,7 +1539,7 @@ databases:
     args:
       user: synapse_user
       password: secretpassword
-      database: synapse_state
+      dbname: synapse_state
       host: localhost
       port: 5432
       cp_min: 5
diff --git a/tests/server.py b/tests/server.py
index c8342db39..5a63ecee9 100644
--- a/tests/server.py
+++ b/tests/server.py
@@ -974,7 +974,7 @@ def setup_test_homeserver(
         database_config = {
             "name": "psycopg2",
             "args": {
-                "database": test_db,
+                "dbname": test_db,
                 "host": POSTGRES_HOST,
                 "password": POSTGRES_PASSWORD,
                 "user": POSTGRES_USER,
@@ -1033,7 +1033,7 @@ def setup_test_homeserver(
         import psycopg2.extensions
 
         db_conn = db_engine.module.connect(
-            database=POSTGRES_BASE_DB,
+            dbname=POSTGRES_BASE_DB,
             user=POSTGRES_USER,
             host=POSTGRES_HOST,
             port=POSTGRES_PORT,
@@ -1080,7 +1080,7 @@ def setup_test_homeserver(
 
             # Drop the test database
             db_conn = db_engine.module.connect(
-                database=POSTGRES_BASE_DB,
+                dbname=POSTGRES_BASE_DB,
                 user=POSTGRES_USER,
                 host=POSTGRES_HOST,
                 port=POSTGRES_PORT,
diff --git a/tests/utils.py b/tests/utils.py
index e73b46944..a0c87ad62 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -80,7 +80,7 @@ def setupdb() -> None:
 
         # Set up in the db
         db_conn = db_engine.module.connect(
-            database=POSTGRES_BASE_DB,
+            dbname=POSTGRES_BASE_DB,
             user=POSTGRES_USER,
             host=POSTGRES_HOST,
             port=POSTGRES_PORT,