FIX #34482, clear values for piecewise read mode (otherwise it concat…

…enates current default value with default value of the previous row in result) (cherry picked from commit 3f2fb5a)
qgis · Jun 19, 2020 · f2b3f83 · f2b3f83
1 parent 7740861
commit f2b3f83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/providers/oracle/ocispatial/qsql_ocispatial.cpp b/src/providers/oracle/ocispatial/qsql_ocispatial.cpp
@@ -3476,7 +3476,10 @@ bool QOCISpatialResult::gotoNext( QSqlCachedResult::ValueCache &values, int inde
 
   // need to read piecewise before assigning values
   if ( r == OCI_SUCCESS && piecewise )
+  {
+    values.clear();
     r = d->cols->readPiecewise( values, index );
+  }
 
   if ( r == OCI_SUCCESS )
     d->cols->getValues( values, index );

diff --git a/tests/src/python/test_provider_oracle.py b/tests/src/python/test_provider_oracle.py
@@ -220,6 +220,7 @@ def testDateInsertion(self):
     def testDefaultValue(self):
         self.assertEqual(self.source.defaultValue(1), NULL)
         self.assertEqual(self.source.defaultValue(2), "'qgis'")
+        self.assertEqual(self.source.defaultValue(3), "'qgis'")
 
     def testPoints(self):
         vl = QgsVectorLayer('%s table="QGIS"."POINT_DATA" (GEOM) srid=4326 type=POINT sql=' %