diff --git a/changelogs/fragments/10201-mssql_script-alternate-credentials-and-script-path.yml b/changelogs/fragments/10201-mssql_script-alternate-credentials-and-script-path.yml index cbccfd2757..99d349ff3e 100644 --- a/changelogs/fragments/10201-mssql_script-alternate-credentials-and-script-path.yml +++ b/changelogs/fragments/10201-mssql_script-alternate-credentials-and-script-path.yml @@ -1,5 +1,5 @@ -minor_changes: - - mssql_script - add ``login_user_alt`` and ``login_password_alt`` parameters to support fallback authentication credentials. - - mssql_script - add ``script_path`` parameter to allow executing SQL scripts from files as an alternative to inline scripts. - - mssql_script - add ``authenticated_user`` return value to indicate which username was successfully used for authentication. - - mssql_script - add automatic Byte Order Mark (BOM) detection and removal for script files to prevent SQL parsing errors. +minor_changes: + - mssql_script - add ``login_user_alt`` and ``login_password_alt`` parameters to support fallback authentication credentials. + - mssql_script - add ``script_path`` parameter to allow executing SQL scripts from files as an alternative to inline scripts. + - mssql_script - add ``authenticated_user`` return value to indicate which username was successfully used for authentication. + - mssql_script - add automatic Byte Order Mark (BOM) detection and removal for script files to prevent SQL parsing errors. diff --git a/plugins/modules/mssql_script.py b/plugins/modules/mssql_script.py index 556367a6f6..639b1c0406 100644 --- a/plugins/modules/mssql_script.py +++ b/plugins/modules/mssql_script.py @@ -349,7 +349,7 @@ def run_module(): # Try primary credentials first, then alternate if primary fails conn = None authenticated_user = None - + # Try primary credentials if login_user is not None: try: @@ -368,8 +368,8 @@ def run_module(): errno, errstr = e2.args module.fail_json(msg="ERROR: %s %s" % (errno, errstr)) else: - module.fail_json(msg="unable to connect with primary or alternate credentials, check login credentials are correct, or alternatively check your " - "@sysconfdir@/freetds.conf / ${HOME}/.freetds.conf") + module.fail_json(msg="unable to connect with primary or alternate credentials, check login credentials are correct, " + "or alternatively check your @sysconfdir@/freetds.conf / ${HOME}/.freetds.conf") else: if "Unknown database" in str(e): errno, errstr = e.args