cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

postgresql_query: refactoring (#66084)

Browse source
This commit is contained in:
Andrew Klychkov 2020-01-01 13:15:48 +03:00 committed by ansibot
parent 80896792c8
commit f7d4121446
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/database/postgresql/postgresql_query.py
View file

@ -27,7 +27,8 @@ version_added: '2.8'
options: options:
query: query:
description: description:
- SQL query to run. Variables can be escaped with psycopg2 syntax U(http://initd.org/psycopg/docs/usage.html). - SQL query to run. Variables can be escaped with psycopg2 syntax
U(http://initd.org/psycopg/docs/usage.html).
type: str type: str
positional_args: positional_args:
description: description:
@ -256,9 +257,6 @@ def main():
if autocommit and module.check_mode: if autocommit and module.check_mode:
module.fail_json(msg="Using autocommit is mutually exclusive with check_mode") module.fail_json(msg="Using autocommit is mutually exclusive with check_mode")
if positional_args and named_args:
module.fail_json(msg="positional_args and named_args params are mutually exclusive")
if path_to_script and query: if path_to_script and query:
module.fail_json(msg="path_to_script is mutually exclusive with query") module.fail_json(msg="path_to_script is mutually exclusive with query")
@ -294,6 +292,9 @@ def main():
try: try:
cursor.execute(query, arguments) cursor.execute(query, arguments)
except Exception as e: except Exception as e:
if not autocommit:
db_connection.rollback()
cursor.close() cursor.close()
db_connection.close() db_connection.close()
module.fail_json(msg="Cannot execute SQL '%s' %s: %s" % (query, arguments, to_native(e))) module.fail_json(msg="Cannot execute SQL '%s' %s: %s" % (query, arguments, to_native(e)))