Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use dbname instead of database for Postgres config. (#16618)

This commit is contained in:
Patrick Cloke 2023-11-09 14:40:45 -05:00 committed by GitHub
parent 9f514dd0fb
commit bc4372ad81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/16618.misc Normal file
View File

@ -0,0 +1 @@
Use `dbname` instead of the deprecated `database` connection parameter for psycopg2.

2
docs/postgres.md
View File

@ -66,7 +66,7 @@ database:
args: args:
user: <user> user: <user>
password: <pass> password: <pass>
database: <db> dbname: <db>
host: <host> host: <host>
cp_min: 5 cp_min: 5
cp_max: 10 cp_max: 10

6
docs/usage/configuration/config_documentation.md
View File

@ -1447,7 +1447,7 @@ database:
args: args:
user: synapse_user user: synapse_user
password: secretpassword password: secretpassword
database: synapse dbname: synapse
host: localhost host: localhost
port: 5432 port: 5432
cp_min: 5 cp_min: 5
@ -1526,7 +1526,7 @@ databases:
args: args:
user: synapse_user user: synapse_user
password: secretpassword password: secretpassword
database: synapse_main dbname: synapse_main
host: localhost host: localhost
port: 5432 port: 5432
cp_min: 5 cp_min: 5
@ -1539,7 +1539,7 @@ databases:
args: args:
user: synapse_user user: synapse_user
password: secretpassword password: secretpassword
database: synapse_state dbname: synapse_state
host: localhost host: localhost
port: 5432 port: 5432
cp_min: 5 cp_min: 5

6
tests/server.py
View File

@ -974,7 +974,7 @@ def setup_test_homeserver(
database_config = { database_config = {
"name": "psycopg2", "name": "psycopg2",
"args": { "args": {
"database": test_db, "dbname": test_db,
"host": POSTGRES_HOST, "host": POSTGRES_HOST,
"password": POSTGRES_PASSWORD, "password": POSTGRES_PASSWORD,
"user": POSTGRES_USER, "user": POSTGRES_USER,
@ -1033,7 +1033,7 @@ def setup_test_homeserver(
import psycopg2.extensions import psycopg2.extensions
db_conn = db_engine.module.connect( db_conn = db_engine.module.connect(
database=POSTGRES_BASE_DB, dbname=POSTGRES_BASE_DB,
user=POSTGRES_USER, user=POSTGRES_USER,
host=POSTGRES_HOST, host=POSTGRES_HOST,
port=POSTGRES_PORT, port=POSTGRES_PORT,
@ -1080,7 +1080,7 @@ def setup_test_homeserver(
# Drop the test database # Drop the test database
db_conn = db_engine.module.connect( db_conn = db_engine.module.connect(
database=POSTGRES_BASE_DB, dbname=POSTGRES_BASE_DB,
user=POSTGRES_USER, user=POSTGRES_USER,
host=POSTGRES_HOST, host=POSTGRES_HOST,
port=POSTGRES_PORT, port=POSTGRES_PORT,

2
tests/utils.py
View File

@ -80,7 +80,7 @@ def setupdb() -> None:
# Set up in the db # Set up in the db
db_conn = db_engine.module.connect( db_conn = db_engine.module.connect(
database=POSTGRES_BASE_DB, dbname=POSTGRES_BASE_DB,
user=POSTGRES_USER, user=POSTGRES_USER,
host=POSTGRES_HOST, host=POSTGRES_HOST,
port=POSTGRES_PORT, port=POSTGRES_PORT,