entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 34 Releases Activity

sql: use dbname parameter for connecting to database (#33589)

This commit is contained in:
Frédéric Péters 2021-10-23 20:48:27 +02:00
parent 3f46c3e404
commit e7143e3015
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test_ctl.py
View File

@ -291,7 +291,8 @@ def test_delete_tenant_with_sql(freezer):
}
delete_cmd.delete_tenant(pub, sub_options, [])
pgconn = psycopg2.connect(**pub.cfg['postgresql']['createdb-connection-params'])
connect_kwargs = {'dbname': 'postgres', 'user': pub.cfg['postgresql']['user']}
pgconn = psycopg2.connect(**connect_kwargs)
cur = pgconn.cursor()
cur.execute(
@ -315,7 +316,7 @@ def test_delete_tenant_with_sql(freezer):
}
delete_cmd.delete_tenant(pub, sub_options, [])
pgconn = psycopg2.connect(**pub.cfg['postgresql']['createdb-connection-params'])
pgconn = psycopg2.connect(**connect_kwargs)
pgconn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
cur = pgconn.cursor()

12
tests/test_hobo.py
View File

@ -446,23 +446,23 @@ def test_configure_postgresql():
pub.initialize_sql = mock.Mock()
with mock.patch('psycopg2.connect') as connect:
hobo_cmd.configure_sql(service, pub)
assert connect.call_args_list[0][1] == {'user': 'test', 'database': 'postgres'}
assert connect.call_args_list[1][1] == {'user': 'fred', 'database': 'tests_wcs_wcs_example_net'}
assert connect.call_args_list[0][1] == {'user': 'test', 'dbname': 'postgres'}
assert connect.call_args_list[1][1] == {'user': 'fred', 'dbname': 'tests_wcs_wcs_example_net'}
assert pub.initialize_sql.call_count == 1
pub.reload_cfg()
assert 'createdb-connection-params' in pub.cfg['postgresql']
with mock.patch('psycopg2.connect') as connect:
sql.get_connection(new=True)
assert connect.call_args_list[0][1] == {'user': 'fred', 'database': 'tests_wcs_wcs_example_net'}
assert connect.call_args_list[0][1] == {'user': 'fred', 'dbname': 'tests_wcs_wcs_example_net'}
pub.cfg['postgresql']['database-template-name'] = 'very_long_' * 10 + '%s'
with mock.patch('psycopg2.connect') as connect:
hobo_cmd.configure_sql(service, pub)
assert connect.call_args_list[0][1] == {'user': 'test', 'database': 'postgres'}
assert connect.call_args_list[0][1] == {'user': 'test', 'dbname': 'postgres'}
assert connect.call_args_list[1][1] == {
'user': 'fred',
'database': 'very_long_very_long_very_long_c426_ng_very_long_wcs_example_net',
'dbname': 'very_long_very_long_very_long_c426_ng_very_long_wcs_example_net',
}
assert len(connect.call_args_list[1][1]['database']) == 63
assert len(connect.call_args_list[1][1]['dbname']) == 63
assert pub.initialize_sql.call_count == 2

2
wcs/ctl/check_hobos.py
View File

@ -545,6 +545,8 @@ class CmdCheckHobos(Command):
if v and isinstance(v, str):
createdb_cfg[k] = v
if 'database' in createdb_cfg:
createdb_cfg['dbname'] = createdb_cfg.pop('database')
try:
pgconn = psycopg2.connect(**createdb_cfg)
except psycopg2.Error as e:

2
wcs/ctl/delete_tenant.py
View File

@ -65,6 +65,8 @@ class CmdDeleteTenant(Command):
if not createdb_cfg:
createdb_cfg = postgresql_cfg
createdb = False
if 'database' in createdb_cfg:
createdb_cfg['dbname'] = createdb_cfg.pop('database')
try:
pgconn = psycopg2.connect(**createdb_cfg)
except psycopg2.Error as e:

2
wcs/sql.py
View File

@ -375,6 +375,8 @@ def get_connection(new=False, isolate=False):
value = get_cfg('postgresql', {}).get(param)
if value:
postgresql_cfg[param] = value
if 'database' in postgresql_cfg:
postgresql_cfg['dbname'] = postgresql_cfg.pop('database')
try:
pgconn = psycopg2.connect(**postgresql_cfg)
except psycopg2.Error: