Merge pull request #93 from stphivos/carta-exclude-none-row-from-filter-comparison

Exclude none row from filter comparison

Author: stphivos

.travis.yml

@@ -36,7 +36,7 @@ matrix:
       - TOX_ENV=py36-dj21-drf37
 
 install:
-  - travis_retry pip install "virtualenv<14.0.0" "tox>=1.9" "coverage<4"
+  - travis_retry pip install "virtualenv<14.0.0" "tox>=1.9" "coverage<4" "setuptools<40.0.0"
 
 script:
   - tox -e $TOX_ENV

django_mock_queries/utils.py

@@ -140,11 +140,11 @@ def is_match(first, second, comparison=None):
         COMPARISON_IEXACT: lambda: first.lower() == second.lower(),
         COMPARISON_CONTAINS: lambda: second in first,
         COMPARISON_ICONTAINS: lambda: second.lower() in first.lower(),
-        COMPARISON_GT: lambda: first > second,
-        COMPARISON_GTE: lambda: first >= second,
-        COMPARISON_LT: lambda: first < second,
-        COMPARISON_LTE: lambda: first <= second,
-        COMPARISON_IN: lambda: first in second,
+        COMPARISON_GT: lambda: first > second if first else False,
+        COMPARISON_GTE: lambda: first >= second if first else False,
+        COMPARISON_LT: lambda: first < second if first else False,
+        COMPARISON_LTE: lambda: first <= second if first else False,
+        COMPARISON_IN: lambda: first in second if first else False,
         COMPARISON_STARTSWITH: lambda: first.startswith(second),
         COMPARISON_ISTARTSWITH: lambda: first.lower().startswith(second.lower()),
         COMPARISON_ENDSWITH: lambda: first.endswith(second),

tests/test_utils.py

@@ -158,6 +158,9 @@ def test_is_match_greater_than_value_check(self):
         result = utils.is_match(3, 5, constants.COMPARISON_GT)
         assert result is False
 
+        result = utils.is_match(None, 5, constants.COMPARISON_GT)
+        assert result is False
+
     def test_is_match_greater_than_equal_to_value_check(self):
         result = utils.is_match(5, 3, constants.COMPARISON_GTE)
         assert result is True
@@ -168,13 +171,19 @@ def test_is_match_greater_than_equal_to_value_check(self):
         result = utils.is_match(3, 5, constants.COMPARISON_GTE)
         assert result is False
 
+        result = utils.is_match(None, 5, constants.COMPARISON_GTE)
+        assert result is False
+
     def test_is_match_less_than_value_check(self):
         result = utils.is_match(1, 2, constants.COMPARISON_LT)
         assert result is True
 
         result = utils.is_match(2, 2, constants.COMPARISON_LT)
         assert result is False
 
+        result = utils.is_match(None, 5, constants.COMPARISON_LT)
+        assert result is False
+
     def test_is_match_less_than_equal_to_value_check(self):
         result = utils.is_match(1, 2, constants.COMPARISON_LTE)
         assert result is True
@@ -185,6 +194,9 @@ def test_is_match_less_than_equal_to_value_check(self):
         result = utils.is_match(2, 1, constants.COMPARISON_LTE)
         assert result is False
 
+        result = utils.is_match(None, 5, constants.COMPARISON_LTE)
+        assert result is False
+
     def test_is_match_isnull_check(self):
         result = utils.is_match(1, True, constants.COMPARISON_ISNULL)
         assert result is False