Skip to content

Fix default key_source #981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
A-Baji merged 5 commits into from
Jan 20, 2022
Merged

Fix default key_source #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5bbc1e9
project out secondary attributes from key_source tables before joinin…
dimitri-yatsenko Jan 10, 2022
69174c5
minor: improve docstrings
dimitri-yatsenko Jan 19, 2022
9c56945
Merge branch 'master' into keysource
dimitri-yatsenko Jan 19, 2022
f589196
Merge branch 'master' into keysource
dimitri-yatsenko Jan 19, 2022
7d9d04e
Merge branch 'master' into keysource
dimitri-yatsenko Jan 19, 2022
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
10 changes: 5 additions & 5 deletions datajoint/autopopulate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ class AutoPopulate:
@property
def key_source(self):
"""
:return: the relation whose primary key values are passed, sequentially, to the
``make`` method when populate() is called.
The default value is the join of the parent relations.
Users may override to change the granularity or the scope of populate() calls.
:return: the query expression that yields primary key values to be passed,
sequentially, to the ``make`` method when populate() is called.
The default value is the join of the parent relations.
Users may override to change the granularity or the scope of populate() calls.
"""
def _rename_attributes(table, props):
return (table.proj(
**{attr: ref for attr, ref in props['attr_map'].items() if attr != ref})
if props['aliased'] else table)
if props['aliased'] else table.proj())

if self._key_source is None:
parents = self.target.parents(primary=True, as_objects=True, foreign_key_info=True)
Expand Down
3 changes: 2 additions & 1 deletion datajoint/table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ class Table(QueryExpression):
_table_name = None # must be defined in subclass
_log_ = None # placeholder for the Log table object

# These properties must be set by the schema decorator (schemas.py) at class level or by FreeTable at instance level
# These properties must be set by the schema decorator (schemas.py) at class level
# or by FreeTable at instance level
database = None
declaration_context = None

Expand Down