From 493de16d477f0745c53fe0fc5a1ed64eb2daa847 Mon Sep 17 00:00:00 2001 From: NEC-Vishal <105697861+NEC-Vishal@users.noreply.github.com> Date: Mon, 28 Nov 2022 10:20:01 +0530 Subject: [PATCH 1/3] Update RELEASE_NOTES.md --- RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index b41d37df..4b97bcc1 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -24,6 +24,7 @@ - Replaced entity with getter (#652) - Resolved TODO in Dockerfile (#680) - Resolved TODO at src/reporter/tests/test_timescale_types.py (#667) +- Resolved TODO at src/wq/ql/flask_utils.py (#707) ### Bug fixes From dbddb72c9c2c11124915abfbe94368817e6e9e1c Mon Sep 17 00:00:00 2001 From: NEC-Vishal Date: Thu, 29 Dec 2022 05:57:04 +0000 Subject: [PATCH 2/3] resolved TODO in sql_translator.py --- RELEASE_NOTES.md | 1 - src/translators/sql_translator.py | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 4b97bcc1..b41d37df 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -24,7 +24,6 @@ - Replaced entity with getter (#652) - Resolved TODO in Dockerfile (#680) - Resolved TODO at src/reporter/tests/test_timescale_types.py (#667) -- Resolved TODO at src/wq/ql/flask_utils.py (#707) ### Bug fixes diff --git a/src/translators/sql_translator.py b/src/translators/sql_translator.py index fe66fc03..41efd5f9 100644 --- a/src/translators/sql_translator.py +++ b/src/translators/sql_translator.py @@ -12,6 +12,7 @@ import dateutil.parser from typing import Any, List, Optional, Sequence from uuid import uuid4 +import crate from cache.factory import get_cache, is_cache_available from translators.insert_splitter import to_insert_batches @@ -1122,10 +1123,14 @@ def query(self, try: self.cursor.execute(op) + except crate.client.exceptions.ProgrammingError as e: + err_msg = self.sql_error_handler(e) + self.logger.error(str(e),exc_info=True) + entities = [] + if err_msg: + message = err_msg + except Exception as e: - # TODO due to this except in case of sql errors, - # all goes fine, and users gets 404 as result - # Reason 1: fiware_service_path column in legacy dbs. err_msg = self.sql_error_handler(e) self.logger.error(str(e), exc_info=True) entities = [] From e8867c7d0c835039efe0403cfbc86739f85e8558 Mon Sep 17 00:00:00 2001 From: NEC-Vishal <105697861+NEC-Vishal@users.noreply.github.com> Date: Thu, 29 Dec 2022 11:31:52 +0530 Subject: [PATCH 3/3] Update RELEASE_NOTES.md --- RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index b41d37df..42febf05 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -24,6 +24,7 @@ - Replaced entity with getter (#652) - Resolved TODO in Dockerfile (#680) - Resolved TODO at src/reporter/tests/test_timescale_types.py (#667) +- Resolved TODO in sql_translator.py (#710) ### Bug fixes