From 66d19a55b47d4a1f9496116ab30a5b41b2154c8e Mon Sep 17 00:00:00 2001
From: florian <f.spreckelsen@inidscale.com>
Date: Wed, 8 Jul 2020 16:52:26 +0200
Subject: [PATCH] ENH: Add original query to unique query error messages
---
src/caosdb/common/models.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py
index 5ced1e38..8de67513 100644
--- a/src/caosdb/common/models.py
+++ b/src/caosdb/common/models.py
@@ -49,7 +49,7 @@ from caosdb.connection.encode import MultipartParam, multipart_encode
from caosdb.exceptions import (AmbiguityException,
AuthorizationException,
CaosDBException, ConnectionException,
- ConsistencyError, ContainerError,
+ ConsistencyError,
EntityDoesNotExistError, EntityError,
EntityHasNoDatatypeError,
TransactionError, UniqueNamesError,
@@ -3480,9 +3480,11 @@ class Query():
if unique:
if len(cresp) > 1 and raise_exception_on_error:
- raise AmbiguityException("This query wasn't unique")
+ raise AmbiguityException("Query '{}' wasn't unique.".format(q))
elif len(cresp) == 0 and raise_exception_on_error:
- raise EntityDoesNotExistError("No such entity found.")
+ ee = EntityDoesNotExistError(
+ "Query '{}' found no results.".format(q))
+ raise TransactionError(ee)
elif len(cresp) == 1:
r = cresp[0]
r.messages.extend(cresp.messages)
--
GitLab