Skip to content

fixed #129 and added a test for it. #145

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 1 commit into from
Aug 18, 2015
Merged

fixed #129 and added a test for it. #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion datajoint/relational_operand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def __init__(self, arg, *attributes, **renamed_attributes):
else:
self._attributes.append(attribute)

if arg.heading.computed:
if arg.heading.computed or arg.restrictions:
self._arg = Subquery(arg)
else:
self._arg = arg
Expand Down
12 changes: 12 additions & 0 deletions tests/test_relational_operand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,18 @@ def test_project():
assert_equal(set(x.heading.names), set(('id_a', 'a')),
'extend does not work')

# projection after restriction
assert_equal(
len(D() & (L() & 'cond_in_l')) + len(D() - (L() & 'cond_in_l')),
len(D()),
'failed semijoin or antijoin'
)
assert_equal(
len((D() - (L() & 'cond_in_l')).project()),
len(D() - (L() & 'cond_in_l')),
'projection altered the cardinality of a restricted relation'
)

@staticmethod
def test_aggregate():
x = B().aggregate(C(), 'n', count='count(id_c)', mean='avg(value)', max='max(value)')
Expand Down