Merge pull request #41822 from kadas-albireo/gdal_isunique

Use OGR_Fld_IsUnique if compiled against gdal-3.2.1 or newer
qgis · Feb 25, 2021 · 984e0b1 · 984e0b1
2 parents 8e97626 + 1cba809
commit 984e0b1
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -56,10 +56,12 @@ email                : sherman at mrcc.com
 #include <ogr_srs_api.h>
 #include <cpl_string.h>
 
-// Temporary solution until GDAL Unique support is available
+#if GDAL_VERSION_NUM < GDAL_COMPUTE_VERSION(3, 2, 1)
+// Temporary solution for gdal < 3.2.1 without GDAL Unique support
 #include "qgssqliteutils.h"
 #include <sqlite3.h>
 // end temporary
+#endif
 
 #include <limits>
 #include <memory>
@@ -1110,6 +1112,7 @@ void QgsOgrProvider::loadFields()
   mFirstFieldIsFid = !fidColumn.isEmpty() &&
                      fdef.GetFieldIndex( fidColumn ) < 0;
 
+#if GDAL_VERSION_NUM < GDAL_COMPUTE_VERSION(3, 2, 1)
   // This is a temporary solution until GDAL Unique support is available
   QSet<QString> uniqueFieldNames;
 
@@ -1127,6 +1130,7 @@ void QgsOgrProvider::loadFields()
       }
     }
   }
+#endif
 
   int createdFields = 0;
   if ( mFirstFieldIsFid )
@@ -1266,7 +1270,11 @@ void QgsOgrProvider::loadFields()
       newField.setConstraints( constraints );
     }
 
+#if GDAL_VERSION_NUM < GDAL_COMPUTE_VERSION(3, 2, 1)
     if ( uniqueFieldNames.contains( OGR_Fld_GetNameRef( fldDef ) ) )
+#else
+    if ( OGR_Fld_IsUnique( fldDef ) )
+#endif
     {
       QgsFieldConstraints constraints = newField.constraints();
       constraints.setConstraint( QgsFieldConstraints::ConstraintUnique, QgsFieldConstraints::ConstraintOriginProvider );