Add CreateSpatialIndex capability for GPKG connection

qgis · Mar 17, 2020 · e728dd2 · e728dd2
1 parent cd2caf8
commit e728dd2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/core/providers/ogr/qgsgeopackageproviderconnection.cpp b/src/core/providers/ogr/qgsgeopackageproviderconnection.cpp
@@ -179,6 +179,17 @@ void QgsGeoPackageProviderConnection::vacuum( const QString &schema, const QStri
   executeGdalSqlPrivate( QStringLiteral( "VACUUM" ) );
 }
 
+void QgsGeoPackageProviderConnection::createSpatialIndex( const QString &schema, const QString &name, const QgsAbstractDatabaseProviderConnection::SpatialIndexOptions &options ) const
+{
+  checkCapability( Capability::CreateSpatialIndex );
+  if ( ! schema.isEmpty() )
+  {
+    QgsMessageLog::logMessage( QStringLiteral( "Schema is not supported by GPKG, ignoring" ), QStringLiteral( "OGR" ), Qgis::Info );
+  }
+  executeGdalSqlPrivate( QStringLiteral( "SELECT CreateSpatialIndex(%1, %2)" ).arg( QgsSqliteUtils::quotedString( name ),
+                         QgsSqliteUtils::quotedString( ( options.geometryColumnName ) ) ) );
+
+}
 
 QList<QgsGeoPackageProviderConnection::TableProperty> QgsGeoPackageProviderConnection::tables( const QString &schema, const TableFlags &flags ) const
 {
@@ -280,6 +291,7 @@ void QgsGeoPackageProviderConnection::setDefaultCapabilities()
     Capability::Spatial,
     Capability::TableExists,
     Capability::ExecuteSql,
+    Capability::CreateSpatialIndex
   };
 #if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(2,4,0)
   mCapabilities |= Capability::DropRasterTable;

diff --git a/src/core/providers/ogr/qgsgeopackageproviderconnection.h b/src/core/providers/ogr/qgsgeopackageproviderconnection.h
@@ -40,6 +40,7 @@ class QgsGeoPackageProviderConnection : public QgsAbstractDatabaseProviderConnec
     void renameVectorTable( const QString &schema, const QString &name, const QString &newName ) const override;
     QList<QList<QVariant>> executeSql( const QString &sql ) const override;
     void vacuum( const QString &schema, const QString &name ) const override;
+    void createSpatialIndex( const QString &schema, const QString &name, const QgsAbstractDatabaseProviderConnection::SpatialIndexOptions &options = QgsAbstractDatabaseProviderConnection::SpatialIndexOptions() ) const override;
     QList<QgsAbstractDatabaseProviderConnection::TableProperty> tables( const QString &schema = QString(),
         const TableFlags &flags = nullptr ) const override;
     QIcon icon() const override;

diff --git a/src/providers/postgres/qgspostgresproviderconnection.cpp b/src/providers/postgres/qgspostgresproviderconnection.cpp
@@ -328,7 +328,7 @@ void QgsPostgresProviderConnection::createSpatialIndex( const QString &schema, c
   if ( options.geometryColumnName.isEmpty() )
     throw QgsProviderConnectionException( QObject::tr( "Geometry column name not specified while creating spatial index" ) );
 
-  checkCapability( Capability::Vacuum );
+  checkCapability( Capability::CreateSpatialIndex );
 
   const QString indexName = QStringLiteral( "sidx_%1_%2" ).arg( name, options.geometryColumnName );
   executeSql( QStringLiteral( "CREATE INDEX %1 ON %2.%3 USING GIST (%4);" )