From 879d61f96e1bcb3006c1062567c3c46357b98c64 Mon Sep 17 00:00:00 2001 From: Khanh Bui Date: Thu, 2 Mar 2023 15:27:44 -0800 Subject: [PATCH] fix last_executed_query() to properly replace placeholders with params --- mssql/operations.py | 8 +++++++- testapp/settings.py | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mssql/operations.py b/mssql/operations.py index 9222ea5e..fcc0608e 100644 --- a/mssql/operations.py +++ b/mssql/operations.py @@ -418,7 +418,13 @@ def last_executed_query(self, cursor, sql, params): exists for database backends to provide a better implementation according to their own quoting schemes. """ - return super().last_executed_query(cursor, cursor.last_sql, cursor.last_params) + if params: + if isinstance(params, list): + params = tuple(params) + return sql % params + # Just return sql when there are no parameters. + else: + return sql def savepoint_create_sql(self, sid): """ diff --git a/testapp/settings.py b/testapp/settings.py index 767f0f3d..311e9175 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -152,7 +152,6 @@ 'schema.tests.SchemaTests.test_unique_and_reverse_m2m', 'schema.tests.SchemaTests.test_unique_no_unnecessary_fk_drops', 'select_for_update.tests.SelectForUpdateTests.test_for_update_after_from', - 'backends.tests.LastExecutedQueryTest.test_last_executed_query', 'db_functions.datetime.test_extract_trunc.DateFunctionTests.test_extract_year_exact_lookup', 'db_functions.datetime.test_extract_trunc.DateFunctionTests.test_extract_year_greaterthan_lookup', 'db_functions.datetime.test_extract_trunc.DateFunctionTests.test_extract_year_lessthan_lookup',