From 7b4582bbff53da6daa8c421cfe8880ff986eb663 Mon Sep 17 00:00:00 2001 From: Alex <akreft@trineo.org> Date: Tue, 13 Jul 2021 10:02:57 +0200 Subject: [PATCH] up --- src/caosdb/apiutils.py | 4 ++-- unittests/test_apiutils.py | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/caosdb/apiutils.py b/src/caosdb/apiutils.py index 5dec8a8d..9192289a 100644 --- a/src/caosdb/apiutils.py +++ b/src/caosdb/apiutils.py @@ -722,7 +722,7 @@ def _apply_to_ids_of_entity(entity, func): prop.value = func(prop.value) -def resolve_reference(prop): +def resolve_reference(prop: Property): """resolves the value of a reference property The integer value is replaced with the entity object. @@ -730,7 +730,7 @@ def resolve_reference(prop): change. """ - if not prop.is_reference(retrieve=True): + if not prop.is_reference(server_retrieval=True): return if isinstance(prop.value, list): diff --git a/unittests/test_apiutils.py b/unittests/test_apiutils.py index c560b5e3..5488fbdd 100644 --- a/unittests/test_apiutils.py +++ b/unittests/test_apiutils.py @@ -29,7 +29,7 @@ import caosdb as db import pickle import tempfile -from caosdb.apiutils import apply_to_ids +from caosdb.apiutils import apply_to_ids, id_query from .test_property import testrecord @@ -62,3 +62,8 @@ def test_apply_to_ids(): assert rec.parents[0].id == -3456 assert rec.properties[0].id == -23345 assert rec.id == -23 + +originalfunc = db.execute_query +db.execute_query = lambda q: q +def test_id_query(): + assert id_query([1]) == 1 -- GitLab