Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/datajoint/expression.py
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ def fetch(
import warnings

warnings.warn(
"fetch() is deprecated in DataJoint 2.0. " "Use to_dicts(), to_pandas(), to_arrays(), or keys() instead.",
"fetch() is deprecated in DataJoint 2.0. Use to_dicts(), to_pandas(), to_arrays(), or keys() instead.",
DeprecationWarning,
stacklevel=2,
)
Expand Down Expand Up @@ -748,7 +748,10 @@ def is_key(attr):
proj_attrs.extend(self.primary_key)
else:
proj_attrs.append(attr)
return self.proj(*proj_attrs).to_dicts(order_by=order_by, limit=limit, offset=offset, squeeze=squeeze)
dicts = self.proj(*proj_attrs).to_dicts(order_by=order_by, limit=limit, offset=offset, squeeze=squeeze)
# Filter to only requested attributes (proj always includes primary key)
requested = set(proj_attrs)
return [{k: v for k, v in d.items() if k in requested} for d in dicts]
else:
# fetch('col1', 'col2') or fetch('col1', 'col2', as_dict=False) -> tuple of arrays
# This matches DJ 1.x behavior where fetch('col') returns array(['alpha', 'beta'])
Expand Down
Loading