diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-11-09 14:40:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 14:40:45 -0500 |
| commit | bc4372ad81f5037e107a608d4736161ba86bb201 (patch) | |
| tree | 4480845db462fe38a403927e96cd77fbcbdee20e | |
| parent | Use _invalidate_cache_and_stream_bulk in more places. (#16616) (diff) | |
| download | synapse-bc4372ad81f5037e107a608d4736161ba86bb201.tar.xz | |
Use dbname instead of database for Postgres config. (#16618)
| -rw-r--r-- | changelog.d/16618.misc | 1 | ||||
| -rw-r--r-- | docs/postgres.md | 2 | ||||
| -rw-r--r-- | docs/usage/configuration/config_documentation.md | 6 | ||||
| -rw-r--r-- | tests/server.py | 6 | ||||
| -rw-r--r-- | tests/utils.py | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/changelog.d/16618.misc b/changelog.d/16618.misc new file mode 100644 index 0000000000..c026e6b995 --- /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 02d4b9b162..ad7c6a0738 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 a1ca5fa98c..a673975e04 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 c8342db399..5a63ecee9f 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 e73b46944b..a0c87ad628 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, |