Skip to content
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.

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

support null/is_null sub-ops inside has/any ops #325

Merged
merged 2 commits into from Jul 15, 2014

Conversation

@glyphobet
Copy link
Contributor

glyphobet commented Jun 20, 2014

The code in _sub_operator was assuming that the sub-operator dictionary argument had a val key, but in the case of the null and is_null operators, there is no val key, so we use get and pass None to _create_operation.

The code in `_sub_operator` was assuming that the sub-operator dictionary argument had a `val` key, but in the case of the `null` and `is_null` operators, there is no `val` key, so we use `get` and pass `None` to `_create_operation`.
@jbkkd

This comment has been minimized.

Copy link
Contributor

jbkkd commented Jun 21, 2014

Due note this fails on pypy - you might want to fix that and update the code.

@glyphobet

This comment has been minimized.

Copy link
Contributor Author

glyphobet commented Jun 21, 2014

@jbkkd No, the PyPy builds of this project have been failing intermittently for ages.

@glyphobet

This comment has been minimized.

Copy link
Contributor Author

glyphobet commented Jun 21, 2014

The build of the same git revision, 6d1a2ad, in the upstream repo, passed: https://travis-ci.org/goodscloud/flask-restless/builds/28066278

My best guess is it's something with the travis cache.

@@ -200,7 +200,7 @@ class Computer(self.Base):
owner_id = Column(Integer, ForeignKey('person.id'))
owner = relationship('Person')
programs = relationship('ComputerProgram',
cascade="all, delete-orphan")
cascade="all, delete-orphan", backref='computer')

This comment has been minimized.

Copy link
@jfinkels

jfinkels Jul 15, 2014

Owner

Trim to 79 characters.

This comment has been minimized.

Copy link
@glyphobet

glyphobet Jul 15, 2014

Author Contributor

done

jfinkels added a commit that referenced this pull request Jul 15, 2014
support null/is_null sub-ops inside has/any ops
@jfinkels jfinkels merged commit 67ee11e into jfinkels:master Jul 15, 2014
1 check passed
1 check passed
continuous-integration/travis-ci The Travis CI build passed
Details
@glyphobet glyphobet deleted the goodscloud:has-any-null-ops branch Jul 15, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.