Skip to content

Fix #438 - raise an error when calling populate on a restricted table #448

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
merged 2 commits into from
Feb 15, 2018
Merged

Fix #438 - raise an error when calling populate on a restricted table #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
062c013
fix #438. Populate raises an error when the table has a restriction.
dimitri-yatsenko Feb 15, 2018
40b38d9
Merge branch 'master' of https://github.com/datajoint/datajoint-pytho…
dimitri-yatsenko Feb 15, 2018
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
3 changes: 3 additions & 0 deletions datajoint/autopopulate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ def _jobs_to_do(self, restrictions):
"""
:return: the relation containing the keys to be computed (derived from self.key_source)
"""
if self.restriction:
raise DataJointError('Cannot call populate on a restricted table. '
'Instead, pass conditions to populate() as arguments.')
todo = self.key_source
if not isinstance(todo, RelationalOperand):
raise DataJointError('Invalid key_source value')
Expand Down
2 changes: 1 addition & 1 deletion datajoint/user_relations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

# attributes that trigger instantiation of user classes
supported_class_attrs = set((
'key_source', 'describe', 'populate', 'progress',
'key_source', 'describe', 'populate', 'progress', 'primary_key',
'proj', 'aggr', 'heading', 'fetch', 'fetch1',
'insert', 'insert1', 'drop', 'drop_quick',
'delete', 'delete_quick'))
Expand Down