Skip to content

Fetch1 checks object length, attribute ordering bug removed #166

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 6 commits into from
Oct 16, 2015
Merged

Fetch1 checks object length, attribute ordering bug removed #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7770441
before throwing out YuEtAl2009
fabiansinz Oct 5, 2015
472360a
Merge branch 'master' of https://github.com/dimitri-yatsenko/datajoin…
fabiansinz Oct 6, 2015
5c71e05
fix join fetchall bug
fabiansinz Oct 13, 2015
323be01
Merge branch 'master' of https://github.com/datajoint/datajoint-python
fabiansinz Oct 14, 2015
085f453
Removed unnecessary import
fabiansinz Oct 14, 2015
3dcd96a
incorporated Dimitri's comments
fabiansinz Oct 14, 2015
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/fetch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,9 @@ def __getitem__(self, item):
item, attributes = prepare_attributes(self._relation, item)

result = self._relation.project(*attributes).fetch()
if len(result) != 1:
raise DataJointError('Fetch1 should only return one tuple')

return_values = tuple(
np.ndarray(result.shape,
np.dtype({name: result.dtype.fields[name] for name in self._relation.primary_key}),
Expand Down
2 changes: 1 addition & 1 deletion datajoint/heading.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def project(self, *attribute_list, **renamed_attributes):

def join(self, other, left):
"""
join two headings
Joins two headings.
"""
assert isinstance(other, Heading)
attribute_list = [v._asdict() for v in self.attributes.values()]
Expand Down
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 @@ -339,7 +339,7 @@ def from_clause(self):

@property
def select_fields(self):
return '*'
return self.heading.as_sql


class Projection(RelationalOperand):
Expand Down