Bump minimum spatialite version to 4.2

m-kuhn · m-kuhn · commit bb6fda6cd612 · 2017-11-16T07:57:41.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -250,16 +250,6 @@ IF(WITH_CORE)
 
   FIND_PACKAGE(SpatiaLite REQUIRED)
 
-  IF(SPATIALITE_VERSION_GE_4_0_0)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPATIALITE_VERSION_GE_4_0_0")
-  ENDIF(SPATIALITE_VERSION_GE_4_0_0)
-  IF(SPATIALITE_VERSION_G_4_1_1)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPATIALITE_VERSION_G_4_1_1")
-  ENDIF(SPATIALITE_VERSION_G_4_1_1)
-  IF(SPATIALITE_HAS_INIT_EX)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPATIALITE_HAS_INIT_EX")
-  ENDIF(SPATIALITE_HAS_INIT_EX)
-
   IF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
     MESSAGE (SEND_ERROR "Some dependencies were not found! Proj: ${PROJ_FOUND}, Geos: ${GEOS_FOUND}, GDAL: ${GDAL_FOUND}")
   ENDIF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
diff --git a/cmake/FindSpatiaLite.cmake b/cmake/FindSpatiaLite.cmake
@@ -65,14 +65,15 @@ IF (SPATIALITE_FOUND)
       MESSAGE(STATUS "Found SpatiaLite: ${SPATIALITE_LIBRARY}")
    ENDIF (NOT SPATIALITE_FIND_QUIETLY)
 
-   # Check for symbol gaiaDropTable
    IF(APPLE)
      # no extra LDFLAGS used in link test, may fail in OS X SDK
      SET(CMAKE_REQUIRED_LIBRARIES "-F/Library/Frameworks" ${CMAKE_REQUIRED_LIBRARIES})
    ENDIF(APPLE)
-   check_library_exists("${SPATIALITE_LIBRARY}" gaiaDropTable "" SPATIALITE_VERSION_GE_4_0_0)
-   check_library_exists("${SPATIALITE_LIBRARY}" gaiaStatisticsInvalidate "" SPATIALITE_VERSION_G_4_1_1)
-   check_library_exists("${SPATIALITE_LIBRARY}" spatialite_init_ex "" SPATIALITE_HAS_INIT_EX)
+
+   check_library_exists("${SPATIALITE_LIBRARY}" gaiaStatisticsInvalidate "" SPATIALITE_VERSION_GE_4_2_0)
+   IF (NOT SPATIALITE_VERSION_GE_4_2_0)
+     MESSAGE(FATAL_ERROR "Found SpatiaLite, but version is too old. Requires at least version 4.2.0")
+   ENDIF (NOT SPATIALITE_VERSION_GE_4_2_0)
 
 ELSE (SPATIALITE_FOUND)
 
diff --git a/doc/overview.t2t b/doc/overview.t2t
@@ -19,7 +19,7 @@ Required build dependencies:
 - Proj >= 4.4.x
 - GEOS >= 3.4
 - Sqlite3 >= 3.0.0
-- SpatiaLite
+- SpatiaLite >= 4.2.0
 - libspatialindex
 - GDAL/OGR >= 2.1
 - Qwt >= 5.0 & (< 6.1 with internal QwtPolar)
diff --git a/src/core/qgsspatialiteutils.cpp b/src/core/qgsspatialiteutils.cpp
@@ -24,21 +24,15 @@
 
 int spatialite_database_unique_ptr::open( const QString &path )
 {
-#if defined(SPATIALITE_HAS_INIT_EX)
   auto &deleter = get_deleter();
   deleter.mSpatialiteContext = spatialite_alloc_connection();
-#else
-  spatialite_init( 0 );
-#endif
 
   sqlite3 *database = nullptr;
   int result = sqlite3_open( path.toUtf8(), &database );
   std::unique_ptr< sqlite3, QgsSpatialiteCloser>::reset( database );
 
-#if defined(SPATIALITE_HAS_INIT_EX)
   if ( result == SQLITE_OK )
     spatialite_init_ex( database, deleter.mSpatialiteContext, 0 );
-#endif
 
   return result;
 }
@@ -50,21 +44,15 @@ void spatialite_database_unique_ptr::reset()
 
 int spatialite_database_unique_ptr::open_v2( const QString &path, int flags, const char *zVfs )
 {
-#if defined(SPATIALITE_HAS_INIT_EX)
   auto &deleter = get_deleter();
   deleter.mSpatialiteContext = spatialite_alloc_connection();
-#else
-  spatialite_init( 0 );
-#endif
 
   sqlite3 *database = nullptr;
   int result = sqlite3_open_v2( path.toUtf8(), &database, flags, zVfs );
   std::unique_ptr< sqlite3, QgsSpatialiteCloser>::reset( database );
 
-#if defined(SPATIALITE_HAS_INIT_EX)
   if ( result == SQLITE_OK )
     spatialite_init_ex( database, deleter.mSpatialiteContext, 0 );
-#endif
 
   return result;
 }
@@ -92,9 +80,7 @@ void QgsSpatialiteCloser::operator()( sqlite3 *handle )
   {
     QgsDebugMsg( QStringLiteral( "sqlite3_close() failed: %1" ).arg( res ) );
   }
-#if defined(SPATIALITE_HAS_INIT_EX)
+
   spatialite_cleanup_ex( mSpatialiteContext );
   mSpatialiteContext = nullptr;
-#endif
-
 }
diff --git a/src/providers/spatialite/qgsspatialiteconnection.cpp b/src/providers/spatialite/qgsspatialiteconnection.cpp
@@ -77,27 +77,7 @@ QgsSpatiaLiteConnection::Error QgsSpatiaLiteConnection::fetchTables( bool loadGe
     return FailedToCheckMetadata;
   }
 
-  bool recentVersion = false;
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-  // only if libspatialite version is >= 4.0.0
-  recentVersion = true;
-#endif
-
-  if ( ret == LayoutCurrent && !recentVersion )
-  {
-    // obsolete library version
-    mErrorMsg = tr( "obsolete libspatialite: connecting to this DB requires using v.4.0 (or any subsequent)" );
-    return FailedToCheckMetadata;
-  }
-
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-  // only if libspatialite version is >= 4.0.0
-  // using v.4.0 Abstract Interface
   if ( !getTableInfoAbstractInterface( database.get(), loadGeometrylessTables ) )
-#else
-  // obsolete library: still using the traditional approach
-  if ( !getTableInfo( database.get(), loadGeometrylessTables ) )
-#endif
   {
     return FailedToGetTables;
   }
@@ -107,7 +87,6 @@ QgsSpatiaLiteConnection::Error QgsSpatiaLiteConnection::fetchTables( bool loadGe
 
 bool QgsSpatiaLiteConnection::updateStatistics()
 {
-#ifdef SPATIALITE_VERSION_GE_4_0_0
   QFileInfo fi( mPath );
   if ( !fi.exists() )
     return false;
@@ -120,9 +99,6 @@ bool QgsSpatiaLiteConnection::updateStatistics()
   ret = update_layer_statistics( database.get(), nullptr, nullptr );
 
   return ret;
-#else
-  return false;
-#endif
 }
 
 int QgsSpatiaLiteConnection::checkHasMetadataTables( sqlite3 *handle )
@@ -242,8 +218,6 @@ int QgsSpatiaLiteConnection::checkHasMetadataTables( sqlite3 *handle )
   return false;
 }
 
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-// only if libspatialite version is >= 4.0.0
 bool QgsSpatiaLiteConnection::getTableInfoAbstractInterface( sqlite3 *handle, bool loadGeometrylessTables )
 {
   int ret;
@@ -353,7 +327,6 @@ bool QgsSpatiaLiteConnection::getTableInfoAbstractInterface( sqlite3 *handle, bo
   }
   return false;
 }
-#endif
 
 bool QgsSpatiaLiteConnection::getTableInfo( sqlite3 *handle, bool loadGeometrylessTables )
 {
diff --git a/src/providers/spatialite/qgsspatialiteconnection.h b/src/providers/spatialite/qgsspatialiteconnection.h
@@ -92,9 +92,6 @@ class QgsSpatiaLiteConnection : public QObject
       \returns true if querying of tables was successful, false on error */
     bool getTableInfo( sqlite3 *handle, bool loadGeometrylessTables );
 
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-    // only if libspatialite version is >= 4.0.0
-
     /**
      * Inserts information about the spatial tables into mTables
      * please note: this method is fully based on the Abstract Interface
@@ -105,7 +102,6 @@ class QgsSpatiaLiteConnection : public QObject
      * thus completely freeing the client application to take care of them.
      */
     bool getTableInfoAbstractInterface( sqlite3 *handle, bool loadGeometrylessTables );
-#endif
 
     //! Cleaning well-formatted SQL strings
     QString quotedValue( QString value ) const;
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -475,8 +475,6 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )
   bool alreadyDone = false;
   bool ret = false;
 
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-  // only if libspatialite version is >= 4.0.0
   gaiaVectorLayersListPtr list = nullptr;
   gaiaVectorLayerPtr lyr = nullptr;
   bool specialCase = false;
@@ -500,7 +498,6 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )
     QgsDebugMsg( "Using checkLayerTypeAbstractInterface" );
     alreadyDone = true;
   }
-#endif
 
   if ( !alreadyDone )
   {
@@ -533,7 +530,6 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )
 
   alreadyDone = false;
 
-#ifdef SPATIALITE_VERSION_GE_4_0_0
   if ( lyr )
   {
     // using the v.4.0 AbstractInterface
@@ -559,7 +555,6 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )
     gaiaFreeVectorLayersList( list );
     alreadyDone = true;
   }
-#endif
 
   if ( !alreadyDone )
   {
@@ -665,9 +660,6 @@ static TypeSubType getVariantType( const QString &type )
     return TypeSubType( QVariant::String, QVariant::Invalid );
 }
 
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-// only if libspatialite version is >= 4.0.0
-
 void QgsSpatiaLiteProvider::loadFieldsAbstractInterface( gaiaVectorLayerPtr lyr )
 {
   if ( !lyr )
@@ -774,7 +766,6 @@ void QgsSpatiaLiteProvider::loadFieldsAbstractInterface( gaiaVectorLayerPtr lyr
 
   sqlite3_free_table( results );
 }
-#endif
 
 QString QgsSpatiaLiteProvider::spatialiteVersion()
 {
@@ -4185,16 +4176,9 @@ bool QgsSpatiaLiteProvider::addAttributes( const QList<QgsField> &attributes )
     handleError( sql, errMsg, true );
     return false;
   }
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-  sql = QStringLiteral( "UPDATE geometry_columns_statistics set last_verified = 0 WHERE f_table_name=\"%1\" AND f_geometry_column=\"%2\";" )
-        .arg( mTableName,
-              mGeometryColumn );
-  ret = sqlite3_exec( mSqliteHandle, sql.toUtf8().constData(), nullptr, nullptr, &errMsg );
-  update_layer_statistics( mSqliteHandle, mTableName.toUtf8().constData(), mGeometryColumn.toUtf8().constData() );
-#elif SPATIALITE_VERSION_G_4_1_1
-  gaiaStatisticsInvalidate( mSqliteHandle, tableName.toUtf8().constData(), mGeometryColumn.toUtf8().constData() );
+
+  gaiaStatisticsInvalidate( mSqliteHandle, mTableName.toUtf8().constData(), mGeometryColumn.toUtf8().constData() );
   update_layer_statistics( mSqliteHandle, mTableName.toUtf8().constData(), mGeometryColumn.toUtf8().constData() );
-#endif
 
   // reload columns
   loadFields();
@@ -4401,8 +4385,6 @@ QString QgsSpatiaLiteProvider::quotedValue( QString value )
   return value.prepend( '\'' ).append( '\'' );
 }
 
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-// only if libspatialite version is >= 4.0.0
 bool QgsSpatiaLiteProvider::checkLayerTypeAbstractInterface( gaiaVectorLayerPtr lyr )
 {
   if ( !lyr )
@@ -4444,7 +4426,6 @@ bool QgsSpatiaLiteProvider::checkLayerTypeAbstractInterface( gaiaVectorLayerPtr
 
   return true;
 }
-#endif
 
 bool QgsSpatiaLiteProvider::checkLayerType()
 {
@@ -4626,8 +4607,6 @@ bool QgsSpatiaLiteProvider::checkLayerType()
   return count == 1;
 }
 
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-// only if libspatialite version is >= 4.0.0
 bool QgsSpatiaLiteProvider::getGeometryDetailsAbstractInterface( gaiaVectorLayerPtr lyr )
 {
   if ( !lyr )
@@ -4728,7 +4707,6 @@ void QgsSpatiaLiteProvider::getViewSpatialIndexName()
   }
   sqlite3_free_table( results );
 }
-#endif
 
 bool QgsSpatiaLiteProvider::getGeometryDetails()
 {
@@ -5143,8 +5121,6 @@ bool QgsSpatiaLiteProvider::getSridDetails()
   return true;
 }
 
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-// only if libspatialite version is >= 4.0.0
 bool QgsSpatiaLiteProvider::getTableSummaryAbstractInterface( gaiaVectorLayerPtr lyr )
 {
   if ( !lyr )
@@ -5164,7 +5140,6 @@ bool QgsSpatiaLiteProvider::getTableSummaryAbstractInterface( gaiaVectorLayerPtr
 
   return true;
 }
-#endif
 
 bool QgsSpatiaLiteProvider::getTableSummary()
 {
@@ -5389,41 +5364,13 @@ QGISEXTERN bool deleteLayer( const QString &dbPath, const QString &tableName, QS
   }
   sqlite3 *sqlite_handle = hndl->handle();
   int ret;
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-  // only if libspatialite version is >= 4.0.0
-  // if libspatialite is v.4.0 (or higher) using the internal library
-  // method is highly recommended
   if ( !gaiaDropTable( sqlite_handle, tableName.toUtf8().constData() ) )
   {
     // unexpected error
     errCause = QObject::tr( "Unable to delete table %1\n" ).arg( tableName );
     QgsSqliteHandle::closeDb( hndl );
     return false;
   }
-#else
-  // drop the table
-  QString sql = QString( "DROP TABLE " ) + QgsSpatiaLiteProvider::quotedIdentifier( tableName );
-  QgsDebugMsg( sql );
-  char *errMsg = nullptr;
-  ret = sqlite3_exec( sqlite_handle, sql.toUtf8().constData(), nullptr, nullptr, &errMsg );
-  if ( ret != SQLITE_OK )
-  {
-    errCause = QObject::tr( "Unable to delete table %1:\n" ).arg( tableName );
-    errCause += QString::fromUtf8( errMsg );
-    sqlite3_free( errMsg );
-    QgsSqliteHandle::closeDb( hndl );
-    return false;
-  }
-
-  // remove table from geometry columns
-  sql = QString( "DELETE FROM geometry_columns WHERE upper(f_table_name) = upper(%1)" )
-        .arg( QgsSpatiaLiteProvider::quotedValue( tableName ) );
-  ret = sqlite3_exec( sqlite_handle, sql.toUtf8().constData(), nullptr, nullptr, nullptr );
-  if ( ret != SQLITE_OK )
-  {
-    QgsDebugMsg( "sqlite error: " + QString::fromUtf8( sqlite3_errmsg( sqlite_handle ) ) );
-  }
-#endif
 
   // TODO: remove spatial indexes?
   // run VACUUM to free unused space and compact the database
diff --git a/src/providers/spatialite/qgsspatialiteprovider.h b/src/providers/spatialite/qgsspatialiteprovider.h
@@ -325,14 +325,11 @@ class QgsSpatiaLiteProvider: public QgsVectorDataProvider
     bool getQueryGeometryDetails();
     bool getSridDetails();
     bool getTableSummary();
-#ifdef SPATIALITE_VERSION_GE_4_0_0
-    // only if libspatialite version is >= 4.0.0
     bool checkLayerTypeAbstractInterface( gaiaVectorLayerPtr lyr );
     bool getGeometryDetailsAbstractInterface( gaiaVectorLayerPtr lyr );
     bool getTableSummaryAbstractInterface( gaiaVectorLayerPtr lyr );
     void loadFieldsAbstractInterface( gaiaVectorLayerPtr lyr );
     void getViewSpatialIndexName();
-#endif
     bool prepareStatement( sqlite3_stmt *&stmt,
                            const QgsAttributeList &fetchAttributes,
                            bool fetchGeometry,

Original file line number	Diff line number	Diff line change
`@@ -77,27 +77,7 @@ QgsSpatiaLiteConnection::Error QgsSpatiaLiteConnection::fetchTables( bool loadGe`
`77`	`77`	`return FailedToCheckMetadata;`
`78`	`78`	`}`
`79`	`79`
`80`		`- bool recentVersion = false;`
`81`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`82`		`- // only if libspatialite version is >= 4.0.0`
`83`		`- recentVersion = true;`
`84`		`-#endif`
`85`		`-`
`86`		`- if ( ret == LayoutCurrent && !recentVersion )`
`87`		`- {`
`88`		`- // obsolete library version`
`89`		`- mErrorMsg = tr( "obsolete libspatialite: connecting to this DB requires using v.4.0 (or any subsequent)" );`
`90`		`- return FailedToCheckMetadata;`
`91`		`- }`
`92`		`-`
`93`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`94`		`- // only if libspatialite version is >= 4.0.0`
`95`		`- // using v.4.0 Abstract Interface`
`96`	`80`	`if ( !getTableInfoAbstractInterface( database.get(), loadGeometrylessTables ) )`
`97`		`-#else`
`98`		`- // obsolete library: still using the traditional approach`
`99`		`- if ( !getTableInfo( database.get(), loadGeometrylessTables ) )`
`100`		`-#endif`
`101`	`81`	`{`
`102`	`82`	`return FailedToGetTables;`
`103`	`83`	`}`
`@@ -107,7 +87,6 @@ QgsSpatiaLiteConnection::Error QgsSpatiaLiteConnection::fetchTables( bool loadGe`
`107`	`87`
`108`	`88`	`bool QgsSpatiaLiteConnection::updateStatistics()`
`109`	`89`	`{`
`110`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`111`	`90`	`QFileInfo fi( mPath );`
`112`	`91`	`if ( !fi.exists() )`
`113`	`92`	`return false;`
`@@ -120,9 +99,6 @@ bool QgsSpatiaLiteConnection::updateStatistics()`
`120`	`99`	`ret = update_layer_statistics( database.get(), nullptr, nullptr );`
`121`	`100`
`122`	`101`	`return ret;`
`123`		`-#else`
`124`		`- return false;`
`125`		`-#endif`
`126`	`102`	`}`
`127`	`103`
`128`	`104`	`int QgsSpatiaLiteConnection::checkHasMetadataTables( sqlite3 *handle )`
`@@ -242,8 +218,6 @@ int QgsSpatiaLiteConnection::checkHasMetadataTables( sqlite3 *handle )`
`242`	`218`	`return false;`
`243`	`219`	`}`
`244`	`220`
`245`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`246`		`-// only if libspatialite version is >= 4.0.0`
`247`	`221`	`bool QgsSpatiaLiteConnection::getTableInfoAbstractInterface( sqlite3 *handle, bool loadGeometrylessTables )`
`248`	`222`	`{`
`249`	`223`	`int ret;`
`@@ -353,7 +327,6 @@ bool QgsSpatiaLiteConnection::getTableInfoAbstractInterface( sqlite3 *handle, bo`
`353`	`327`	`}`
`354`	`328`	`return false;`
`355`	`329`	`}`
`356`		`-#endif`
`357`	`330`
`358`	`331`	`bool QgsSpatiaLiteConnection::getTableInfo( sqlite3 *handle, bool loadGeometrylessTables )`
`359`	`332`	`{`
Original file line number	Diff line number	Diff line change
`@@ -475,8 +475,6 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )`
`475`	`475`	`bool alreadyDone = false;`
`476`	`476`	`bool ret = false;`
`477`	`477`
`478`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`479`		`- // only if libspatialite version is >= 4.0.0`
`480`	`478`	`gaiaVectorLayersListPtr list = nullptr;`
`481`	`479`	`gaiaVectorLayerPtr lyr = nullptr;`
`482`	`480`	`bool specialCase = false;`
`@@ -500,7 +498,6 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )`
`500`	`498`	`QgsDebugMsg( "Using checkLayerTypeAbstractInterface" );`
`501`	`499`	`alreadyDone = true;`
`502`	`500`	`}`
`503`		`-#endif`
`504`	`501`
`505`	`502`	`if ( !alreadyDone )`
`506`	`503`	`{`
`@@ -533,7 +530,6 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )`
`533`	`530`
`534`	`531`	`alreadyDone = false;`
`535`	`532`
`536`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`537`	`533`	`if ( lyr )`
`538`	`534`	`{`
`539`	`535`	`// using the v.4.0 AbstractInterface`
`@@ -559,7 +555,6 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )`
`559`	`555`	`gaiaFreeVectorLayersList( list );`
`560`	`556`	`alreadyDone = true;`
`561`	`557`	`}`
`562`		`-#endif`
`563`	`558`
`564`	`559`	`if ( !alreadyDone )`
`565`	`560`	`{`
`@@ -665,9 +660,6 @@ static TypeSubType getVariantType( const QString &type )`
`665`	`660`	`return TypeSubType( QVariant::String, QVariant::Invalid );`
`666`	`661`	`}`
`667`	`662`
`668`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`669`		`-// only if libspatialite version is >= 4.0.0`
`670`		`-`
`671`	`663`	`void QgsSpatiaLiteProvider::loadFieldsAbstractInterface( gaiaVectorLayerPtr lyr )`
`672`	`664`	`{`
`673`	`665`	`if ( !lyr )`
`@@ -774,7 +766,6 @@ void QgsSpatiaLiteProvider::loadFieldsAbstractInterface( gaiaVectorLayerPtr lyr`
`774`	`766`
`775`	`767`	`sqlite3_free_table( results );`
`776`	`768`	`}`
`777`		`-#endif`
`778`	`769`
`779`	`770`	`QString QgsSpatiaLiteProvider::spatialiteVersion()`
`780`	`771`	`{`
`@@ -4185,16 +4176,9 @@ bool QgsSpatiaLiteProvider::addAttributes( const QList<QgsField> &attributes )`
`4185`	`4176`	`handleError( sql, errMsg, true );`
`4186`	`4177`	`return false;`
`4187`	`4178`	`}`
`4188`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`4189`		`- sql = QStringLiteral( "UPDATE geometry_columns_statistics set last_verified = 0 WHERE f_table_name=\"%1\" AND f_geometry_column=\"%2\";" )`
`4190`		`- .arg( mTableName,`
`4191`		`- mGeometryColumn );`
`4192`		`- ret = sqlite3_exec( mSqliteHandle, sql.toUtf8().constData(), nullptr, nullptr, &errMsg );`
`4193`		`- update_layer_statistics( mSqliteHandle, mTableName.toUtf8().constData(), mGeometryColumn.toUtf8().constData() );`
`4194`		`-#elif SPATIALITE_VERSION_G_4_1_1`
`4195`		`- gaiaStatisticsInvalidate( mSqliteHandle, tableName.toUtf8().constData(), mGeometryColumn.toUtf8().constData() );`
	`4179`	`+`
	`4180`	`+ gaiaStatisticsInvalidate( mSqliteHandle, mTableName.toUtf8().constData(), mGeometryColumn.toUtf8().constData() );`
`4196`	`4181`	`update_layer_statistics( mSqliteHandle, mTableName.toUtf8().constData(), mGeometryColumn.toUtf8().constData() );`
`4197`		`-#endif`
`4198`	`4182`
`4199`	`4183`	`// reload columns`
`4200`	`4184`	`loadFields();`
`@@ -4401,8 +4385,6 @@ QString QgsSpatiaLiteProvider::quotedValue( QString value )`
`4401`	`4385`	`return value.prepend( '\'' ).append( '\'' );`
`4402`	`4386`	`}`
`4403`	`4387`
`4404`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`4405`		`-// only if libspatialite version is >= 4.0.0`
`4406`	`4388`	`bool QgsSpatiaLiteProvider::checkLayerTypeAbstractInterface( gaiaVectorLayerPtr lyr )`
`4407`	`4389`	`{`
`4408`	`4390`	`if ( !lyr )`
`@@ -4444,7 +4426,6 @@ bool QgsSpatiaLiteProvider::checkLayerTypeAbstractInterface( gaiaVectorLayerPtr`
`4444`	`4426`
`4445`	`4427`	`return true;`
`4446`	`4428`	`}`
`4447`		`-#endif`
`4448`	`4429`
`4449`	`4430`	`bool QgsSpatiaLiteProvider::checkLayerType()`
`4450`	`4431`	`{`
`@@ -4626,8 +4607,6 @@ bool QgsSpatiaLiteProvider::checkLayerType()`
`4626`	`4607`	`return count == 1;`
`4627`	`4608`	`}`
`4628`	`4609`
`4629`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`4630`		`-// only if libspatialite version is >= 4.0.0`
`4631`	`4610`	`bool QgsSpatiaLiteProvider::getGeometryDetailsAbstractInterface( gaiaVectorLayerPtr lyr )`
`4632`	`4611`	`{`
`4633`	`4612`	`if ( !lyr )`
`@@ -4728,7 +4707,6 @@ void QgsSpatiaLiteProvider::getViewSpatialIndexName()`
`4728`	`4707`	`}`
`4729`	`4708`	`sqlite3_free_table( results );`
`4730`	`4709`	`}`
`4731`		`-#endif`
`4732`	`4710`
`4733`	`4711`	`bool QgsSpatiaLiteProvider::getGeometryDetails()`
`4734`	`4712`	`{`
`@@ -5143,8 +5121,6 @@ bool QgsSpatiaLiteProvider::getSridDetails()`
`5143`	`5121`	`return true;`
`5144`	`5122`	`}`
`5145`	`5123`
`5146`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`5147`		`-// only if libspatialite version is >= 4.0.0`
`5148`	`5124`	`bool QgsSpatiaLiteProvider::getTableSummaryAbstractInterface( gaiaVectorLayerPtr lyr )`
`5149`	`5125`	`{`
`5150`	`5126`	`if ( !lyr )`
`@@ -5164,7 +5140,6 @@ bool QgsSpatiaLiteProvider::getTableSummaryAbstractInterface( gaiaVectorLayerPtr`
`5164`	`5140`
`5165`	`5141`	`return true;`
`5166`	`5142`	`}`
`5167`		`-#endif`
`5168`	`5143`
`5169`	`5144`	`bool QgsSpatiaLiteProvider::getTableSummary()`
`5170`	`5145`	`{`
`@@ -5389,41 +5364,13 @@ QGISEXTERN bool deleteLayer( const QString &dbPath, const QString &tableName, QS`
`5389`	`5364`	`}`
`5390`	`5365`	`sqlite3 *sqlite_handle = hndl->handle();`
`5391`	`5366`	`int ret;`
`5392`		`-#ifdef SPATIALITE_VERSION_GE_4_0_0`
`5393`		`- // only if libspatialite version is >= 4.0.0`
`5394`		`- // if libspatialite is v.4.0 (or higher) using the internal library`
`5395`		`- // method is highly recommended`
`5396`	`5367`	`if ( !gaiaDropTable( sqlite_handle, tableName.toUtf8().constData() ) )`
`5397`	`5368`	`{`
`5398`	`5369`	`// unexpected error`
`5399`	`5370`	`errCause = QObject::tr( "Unable to delete table %1\n" ).arg( tableName );`
`5400`	`5371`	`QgsSqliteHandle::closeDb( hndl );`
`5401`	`5372`	`return false;`
`5402`	`5373`	`}`
`5403`		`-#else`
`5404`		`- // drop the table`
`5405`		`- QString sql = QString( "DROP TABLE " ) + QgsSpatiaLiteProvider::quotedIdentifier( tableName );`
`5406`		`- QgsDebugMsg( sql );`
`5407`		`- char *errMsg = nullptr;`
`5408`		`- ret = sqlite3_exec( sqlite_handle, sql.toUtf8().constData(), nullptr, nullptr, &errMsg );`
`5409`		`- if ( ret != SQLITE_OK )`
`5410`		`- {`
`5411`		`- errCause = QObject::tr( "Unable to delete table %1:\n" ).arg( tableName );`
`5412`		`- errCause += QString::fromUtf8( errMsg );`
`5413`		`- sqlite3_free( errMsg );`
`5414`		`- QgsSqliteHandle::closeDb( hndl );`
`5415`		`- return false;`
`5416`		`- }`
`5417`		`-`
`5418`		`- // remove table from geometry columns`
`5419`		`- sql = QString( "DELETE FROM geometry_columns WHERE upper(f_table_name) = upper(%1)" )`
`5420`		`- .arg( QgsSpatiaLiteProvider::quotedValue( tableName ) );`
`5421`		`- ret = sqlite3_exec( sqlite_handle, sql.toUtf8().constData(), nullptr, nullptr, nullptr );`
`5422`		`- if ( ret != SQLITE_OK )`
`5423`		`- {`
`5424`		`- QgsDebugMsg( "sqlite error: " + QString::fromUtf8( sqlite3_errmsg( sqlite_handle ) ) );`
`5425`		`- }`
`5426`		`-#endif`
`5427`	`5374`
`5428`	`5375`	`// TODO: remove spatial indexes?`
`5429`	`5376`	`// run VACUUM to free unused space and compact the database`