Handle nulls for date/time correctly

(cherry picked from commit aa062f9)
qgis · Feb 19, 2021 · 69c1bdf · 69c1bdf
1 parent 496b10b
commit 69c1bdf
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/src/core/qgsdatetimestatisticalsummary.cpp b/src/core/qgsdatetimestatisticalsummary.cpp
@@ -58,28 +58,36 @@ void QgsDateTimeStatisticalSummary::calculate( const QVariantList &values )
 
 void QgsDateTimeStatisticalSummary::addValue( const QVariant &value )
 {
-  if ( value.type() == QVariant::DateTime )
-  {
-    testDateTime( value.toDateTime() );
-  }
-  else if ( value.type() == QVariant::Date )
-  {
-    QDate date = value.toDate();
-    testDateTime( ! date.isNull() ? QDateTime( date, QTime( 0, 0, 0 ) )
-                  : QDateTime() );
-  }
-  else if ( value.type() == QVariant::Time )
-  {
-    mIsTimes = true;
-    QTime time = value.toTime();
-    testDateTime( ! time.isNull() ? QDateTime( QDate::fromJulianDay( 0 ), time )
-                  : QDateTime() );
-  }
-  else //not a date
+  if ( value.isNull() )
   {
     mCountMissing++;
     mCount++;
   }
+  else
+  {
+    if ( value.type() == QVariant::DateTime )
+    {
+      testDateTime( value.toDateTime() );
+    }
+    else if ( value.type() == QVariant::Date )
+    {
+      QDate date = value.toDate();
+      testDateTime( date.isValid() ? QDateTime( date, QTime( 0, 0, 0 ) )
+                    : QDateTime() );
+    }
+    else if ( value.type() == QVariant::Time )
+    {
+      mIsTimes = true;
+      QTime time = value.toTime();
+      testDateTime( time.isValid() ? QDateTime( QDate::fromJulianDay( 0 ), time )
+                    : QDateTime() );
+    }
+    else //not a date
+    {
+      mCountMissing++;
+      mCount++;
+    }
+  }
   // QTime?
 }