Fix timezone handling issue when getting min/max value of datetime fr…

…om gpkg
qgis · May 14, 2020 · 9165b1c · 9165b1c
1 parent 05e959f
commit 9165b1c
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -3908,6 +3908,14 @@ QVariant QgsOgrProvider::minimumValue( int index ) const
   if ( res.type() != originalField.type() )
     res = convertValue( originalField.type(), res.toString() );
 
+  if ( originalField.type() == QVariant::DateTime )
+  {
+    // ensure that we treat times as local time, to match behaviour when iterating features
+    QDateTime temp = res.toDateTime();
+    temp.setTimeSpec( Qt::LocalTime );
+    res = temp;
+  }
+
   return res;
 }
 
@@ -3956,6 +3964,14 @@ QVariant QgsOgrProvider::maximumValue( int index ) const
   if ( res.type() != originalField.type() )
     res = convertValue( originalField.type(), res.toString() );
 
+  if ( originalField.type() == QVariant::DateTime )
+  {
+    // ensure that we treat times as local time, to match behaviour when iterating features
+    QDateTime temp = res.toDateTime();
+    temp.setTimeSpec( Qt::LocalTime );
+    res = temp;
+  }
+
   return res;
 }