Merge branch 'allow-minus-in-database-names' into 'main'
allow hyphen-minus character in database names See merge request odoo-openupgrade-wizard/odoo-openupgrade-wizard!70
This commit is contained in:
commit
0a0c763a49
1
newsfragments/allow-minus-in-database-names.bugfix
Normal file
1
newsfragments/allow-minus-in-database-names.bugfix
Normal file
|
|
@ -0,0 +1 @@
|
|||
Allow hyphen-minus character in database names.
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
import os
|
||||
import shlex
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
|
|
@ -125,7 +126,7 @@ def execute_psql_command(
|
|||
"psql"
|
||||
" --username=odoo"
|
||||
f" --dbname={database or 'postgres'}"
|
||||
f' --command "{request}"'
|
||||
f" --command {shlex.quote(request)}"
|
||||
f" {' '.join(psql_args)}"
|
||||
)
|
||||
logger.debug(
|
||||
|
|
@ -151,19 +152,21 @@ def ensure_database(ctx, database: str, state="present", template: str = ""):
|
|||
return
|
||||
|
||||
if template:
|
||||
logger.info(f"Copy database '{template}' into '{database}' ...")
|
||||
request = f"CREATE DATABASE {database} WITH TEMPLATE {template};"
|
||||
logger.info(f'Copy database "{template}" into "{database}"...')
|
||||
request = (
|
||||
f'CREATE DATABASE "{database}" WITH TEMPLATE "{template}";'
|
||||
)
|
||||
else:
|
||||
logger.info(f"Create database '{database}' ...")
|
||||
request = f"CREATE DATABASE {database} owner odoo;"
|
||||
logger.info(f"Create database '{database}'...")
|
||||
request = f'CREATE DATABASE "{database}" OWNER odoo;'
|
||||
execute_psql_command(ctx, request)
|
||||
|
||||
else:
|
||||
if [database] not in result:
|
||||
return
|
||||
|
||||
logger.info(f"Drop database '{database}' ...")
|
||||
request = f"DROP DATABASE {database};"
|
||||
logger.info(f'Drop database "{database}"...')
|
||||
request = f'DROP DATABASE "{database}";'
|
||||
execute_psql_command(ctx, request)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user