Skip to content

Commit d0138e4

Browse files
add tests for issue #853 - restrictions by NULL
1 parent ad4a10f commit d0138e4

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

tests/schema.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def make(self, key):
146146
populate with random data
147147
"""
148148
from datetime import date, timedelta
149-
users = User().fetch()['username']
149+
users = [None, None] + list(User().fetch()['username'])
150150
random.seed('Amazing Seed')
151151
self.insert(
152152
dict(key,
@@ -155,7 +155,6 @@ def make(self, key):
155155
username=random.choice(users))
156156
for experiment_id in range(self.fake_experiments_per_subject))
157157

158-
159158
@schema
160159
class Trial(dj.Imported):
161160
definition = """ # a trial within an experiment

tests/test_relational_operand.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,15 @@ def test_pandas_fetch_and_restriction():
290290
assert_true(isinstance(df, pandas.DataFrame))
291291
assert_equal(len(E & q), len(E & df))
292292

293+
@staticmethod
294+
def test_restriction_by_null():
295+
assert_true(len(Experiment & 'username is null') > 0)
296+
assert_true(len(Experiment & 'username is not null') > 0)
297+
298+
@staticmethod
299+
def test_restriction_between(): # see issue
300+
assert_true(len(Experiment & 'username between "S" and "Z"') < len(Experiment()))
301+
293302
@staticmethod
294303
def test_restrictions_by_lists():
295304
x = D()

0 commit comments

Comments
 (0)