Followup 8435fee, fix filtering of NULL values

qgis · Jan 19, 2016 · 7e642df · 7e642df
1 parent d902c56
commit 7e642df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
@@ -589,7 +589,7 @@ QString QgsCategorizedSymbolRendererV2::filter( const QgsFields& fields )
   }
   else if ( defaultActive )
   {
-    return QString( "(\"%1\") NOT IN (%2)" ).arg( mAttrName, inactiveValues );
+    return QString( "(\"%1\") NOT IN (%2) OR (\"%1\") IS NULL" ).arg( mAttrName, inactiveValues );
   }
   else
   {

diff --git a/tests/src/python/test_qgscategorizedsymbolrendererv2.py b/tests/src/python/test_qgscategorizedsymbolrendererv2.py
@@ -62,11 +62,11 @@ def testFilter(self):
         self.assertEqual(renderer.filter(), '')
         # remove categories, leaving default
         assert renderer.updateCategoryRenderState(0, False)
-        self.assertEqual(renderer.filter(), "(\"field\") NOT IN ('a')")
+        self.assertEqual(renderer.filter(), "(\"field\") NOT IN ('a') OR (\"field\") IS NULL")
         assert renderer.updateCategoryRenderState(1, False)
-        self.assertEqual(renderer.filter(), "(\"field\") NOT IN ('a','b')")
+        self.assertEqual(renderer.filter(), "(\"field\") NOT IN ('a','b') OR (\"field\") IS NULL")
         assert renderer.updateCategoryRenderState(2, False)
-        self.assertEqual(renderer.filter(), "(\"field\") NOT IN ('a','b','c')")
+        self.assertEqual(renderer.filter(), "(\"field\") NOT IN ('a','b','c') OR (\"field\") IS NULL")
         # remove default category
         assert renderer.updateCategoryRenderState(3, False)
         self.assertEqual(renderer.filter(), "FALSE")