Skip to content

Commit 9b8c4eb

Browse files
authored
Merge pull request #981 from dimitri-yatsenko/keysource
Fix default key_source
2 parents e905dce + 7d9d04e commit 9b8c4eb

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

datajoint/autopopulate.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ class AutoPopulate:
2626
@property
2727
def key_source(self):
2828
"""
29-
:return: the relation whose primary key values are passed, sequentially, to the
30-
``make`` method when populate() is called.
31-
The default value is the join of the parent relations.
32-
Users may override to change the granularity or the scope of populate() calls.
29+
:return: the query expression that yields primary key values to be passed,
30+
sequentially, to the ``make`` method when populate() is called.
31+
The default value is the join of the parent relations.
32+
Users may override to change the granularity or the scope of populate() calls.
3333
"""
3434
def _rename_attributes(table, props):
3535
return (table.proj(
3636
**{attr: ref for attr, ref in props['attr_map'].items() if attr != ref})
37-
if props['aliased'] else table)
37+
if props['aliased'] else table.proj())
3838

3939
if self._key_source is None:
4040
parents = self.target.parents(primary=True, as_objects=True, foreign_key_info=True)

datajoint/table.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ class Table(QueryExpression):
5555
_table_name = None # must be defined in subclass
5656
_log_ = None # placeholder for the Log table object
5757

58-
# These properties must be set by the schema decorator (schemas.py) at class level or by FreeTable at instance level
58+
# These properties must be set by the schema decorator (schemas.py) at class level
59+
# or by FreeTable at instance level
5960
database = None
6061
declaration_context = None
6162

0 commit comments

Comments
 (0)