Followup 9ba41e9, SQL convention is sum of no records=NULL

qgis · Aug 29, 2016 · 235204f · 235204f
1 parent 7300cda
commit 235204f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/qgsaggregatecalculator.cpp b/src/core/qgsaggregatecalculator.cpp
@@ -506,13 +506,13 @@ QVariant QgsAggregateCalculator::defaultValue( QgsAggregateCalculator::Aggregate
     case Count:
     case CountDistinct:
     case CountMissing:
-    case Sum:
       return 0;
 
     case StringConcatenate:
       return ""; // zero length string - not null!
 
       // undefined - nothing makes sense here
+    case Sum:
     case Min:
     case Max:
     case Mean:

diff --git a/tests/src/python/test_qgsaggregatecalculator.py b/tests/src/python/test_qgsaggregatecalculator.py
@@ -396,7 +396,7 @@ def testExpressionNoMatch(self):
         agg = QgsAggregateCalculator(layer)
         val, ok = agg.calculate(QgsAggregateCalculator.Sum, 'fldint * 2')
         self.assertTrue(ok)
-        self.assertEqual(val, 0)
+        self.assertEqual(val, None)
 
         # count
         agg = QgsAggregateCalculator(layer)