1
0
Fork 0

confirm_destructive_query: Use confirm rather than prompt (#1410)

* confirm_destructive_query: Use confirm rather than prompt

* Fix tests
This commit is contained in:
Sharon Yogev 2023-10-18 19:25:29 +03:00 committed by GitHub
parent 13ca7d2430
commit 0ad3393fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 4 deletions

View File

@ -129,6 +129,7 @@ Contributors:
* Damien Baty (dbaty)
* blag
* Rob Berry (rob-b)
* Sharon Yogev (sharonyogev)
Creator:
--------

View File

@ -32,6 +32,7 @@ Bug fixes:
predetermined table aliases instead of generating aliases programmatically on
the fly
* Fixed SQL error when there is a comment on the first line: ([issue 1403](https://github.com/dbcli/pgcli/issues/1403))
* Fix wrong usage of prompt instead of confirm when confirm execution of destructive query
Internal:
---------

View File

@ -16,9 +16,9 @@ def confirm_destructive_query(queries, keywords, alias):
if alias:
info += f" in {click.style(alias, fg='red')}"
prompt_text = f"{info}.\nDo you want to proceed? (y/n)"
prompt_text = f"{info}.\nDo you want to proceed?"
if is_destructive(queries, keywords) and sys.stdin.isatty():
return prompt(prompt_text, type=bool)
return confirm(prompt_text)
def confirm(*args, **kwargs):

View File

@ -206,7 +206,7 @@ def step_resppond_to_destructive_command(context, response):
"""Respond to destructive command."""
wrappers.expect_exact(
context,
"You're about to run a destructive command.\r\nDo you want to proceed? (y/n):",
"You're about to run a destructive command.\r\nDo you want to proceed? [y/N]:",
timeout=2,
)
context.cli.sendline(response.strip())

View File

@ -16,7 +16,7 @@ def step_prepare_data(context):
context.cli.sendline("drop table if exists a;")
wrappers.expect_exact(
context,
"You're about to run a destructive command.\r\nDo you want to proceed? (y/n):",
"You're about to run a destructive command.\r\nDo you want to proceed? [y/N]:",
timeout=2,
)
context.cli.sendline("y")