ogr provider: avoid GDAL #4509 (fixes #8232)

jef-n · jef-n · commit bf1d1b0453ba · 2013-07-08T22:34:55.000+02:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -2122,6 +2122,10 @@ void QgsOgrProvider::uniqueValues( int index, QList<QVariant> &uniqueValues, int
     return; //not a provider field
   }
 
+#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM < 1910
+  // avoid GDAL #4509
+  return QgsVectorDataProvider::uniqueValues( index, uniqueValues, limit );
+#else
   QString theLayerName = FROM8( OGR_FD_GetName( OGR_L_GetLayerDefn( ogrLayer ) ) );
 
   QString sql = QString( "SELECT DISTINCT %1 FROM %2" )
@@ -2151,6 +2155,7 @@ void QgsOgrProvider::uniqueValues( int index, QList<QVariant> &uniqueValues, int
   }
 
   OGR_DS_ReleaseResultSet( ogrDataSource, l );
+#endif
 }
 
 QVariant QgsOgrProvider::minimumValue( int index )

Original file line number	Diff line number	Diff line change
`@@ -2122,6 +2122,10 @@ void QgsOgrProvider::uniqueValues( int index, QList<QVariant> &uniqueValues, int`
`2122`	`2122`	`return; //not a provider field`
`2123`	`2123`	`}`
`2124`	`2124`
	`2125`	`+#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM < 1910`
	`2126`	`+ // avoid GDAL #4509`
	`2127`	`+ return QgsVectorDataProvider::uniqueValues( index, uniqueValues, limit );`
	`2128`	`+#else`
`2125`	`2129`	`QString theLayerName = FROM8( OGR_FD_GetName( OGR_L_GetLayerDefn( ogrLayer ) ) );`
`2126`	`2130`
`2127`	`2131`	`QString sql = QString( "SELECT DISTINCT %1 FROM %2" )`
`@@ -2151,6 +2155,7 @@ void QgsOgrProvider::uniqueValues( int index, QList<QVariant> &uniqueValues, int`
`2151`	`2155`	`}`
`2152`	`2156`
`2153`	`2157`	`OGR_DS_ReleaseResultSet( ogrDataSource, l );`
	`2158`	`+#endif`
`2154`	`2159`	`}`
`2155`	`2160`
`2156`	`2161`	`QVariant QgsOgrProvider::minimumValue( int index )`