sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

[auxiliary storage] Avoid needless spatialite database connection

Browse Source
This commit is contained in:
nirvn 2022-02-18 11:21:13 +07:00 committed by Nyall Dawson
parent 2f9dd9a66f
commit 4324a2a8b5
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/qgsauxiliarystorage.cpp
View File

@ -17,7 +17,7 @@
#include "qgsauxiliarystorage.h" #include "qgsauxiliarystorage.h"
#include "qgslogger.h" #include "qgslogger.h"
#include "qgsspatialiteutils.h" #include "qgssqliteutils.h"
#include "qgsproject.h" #include "qgsproject.h"
#include "qgsvectorlayerlabeling.h" #include "qgsvectorlayerlabeling.h"
#include "qgsdiagramrenderer.h" #include "qgsdiagramrenderer.h"
@ -656,7 +656,7 @@ QgsAuxiliaryLayer *QgsAuxiliaryStorage::createAuxiliaryLayer( const QgsField &fi
if ( mValid && layer ) if ( mValid && layer )
{ {
const QString table( layer->id() ); const QString table( layer->id() );
spatialite_database_unique_ptr database; sqlite3_database_unique_ptr database;
database = openDB( currentFileName() ); database = openDB( currentFileName() );
if ( !tableExists( table, database.get() ) ) if ( !tableExists( table, database.get() ) )
@ -681,7 +681,7 @@ bool QgsAuxiliaryStorage::deleteTable( const QgsDataSourceUri &ogrUri )
if ( !uri.database().isEmpty() && !uri.table().isEmpty() ) if ( !uri.database().isEmpty() && !uri.table().isEmpty() )
{ {
spatialite_database_unique_ptr database; sqlite3_database_unique_ptr database;
database = openDB( uri.database() ); database = openDB( uri.database() );
if ( database ) if ( database )
@ -704,7 +704,7 @@ bool QgsAuxiliaryStorage::duplicateTable( const QgsDataSourceUri &ogrUri, const
if ( !uri.table().isEmpty() && !uri.database().isEmpty() ) if ( !uri.table().isEmpty() && !uri.database().isEmpty() )
{ {
spatialite_database_unique_ptr database; sqlite3_database_unique_ptr database;
database = openDB( uri.database() ); database = openDB( uri.database() );
if ( database ) if ( database )
@ -798,9 +798,9 @@ bool QgsAuxiliaryStorage::createTable( const QString &type, const QString &table
return true; return true;
} }
spatialite_database_unique_ptr QgsAuxiliaryStorage::createDB( const QString &filename ) sqlite3_database_unique_ptr QgsAuxiliaryStorage::createDB( const QString &filename )
{ {
spatialite_database_unique_ptr database; sqlite3_database_unique_ptr database;
int rc; int rc;
rc = database.open_v2( filename, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, nullptr ); rc = database.open_v2( filename, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, nullptr );
@ -815,9 +815,9 @@ spatialite_database_unique_ptr QgsAuxiliaryStorage::createDB( const QString &fil
return database; return database;
} }
spatialite_database_unique_ptr QgsAuxiliaryStorage::openDB( const QString &filename ) sqlite3_database_unique_ptr QgsAuxiliaryStorage::openDB( const QString &filename )
{ {
spatialite_database_unique_ptr database; sqlite3_database_unique_ptr database;
const int rc = database.open_v2( filename, SQLITE_OPEN_READWRITE, nullptr ); const int rc = database.open_v2( filename, SQLITE_OPEN_READWRITE, nullptr );
if ( rc ) if ( rc )
@ -848,9 +848,9 @@ bool QgsAuxiliaryStorage::tableExists( const QString &table, sqlite3 *handler )
return false; return false;
} }
spatialite_database_unique_ptr QgsAuxiliaryStorage::open( const QString &filename ) sqlite3_database_unique_ptr QgsAuxiliaryStorage::open( const QString &filename )
{ {
spatialite_database_unique_ptr database; sqlite3_database_unique_ptr database;
if ( filename.isEmpty() ) if ( filename.isEmpty() )
{ {
@ -874,7 +874,7 @@ spatialite_database_unique_ptr QgsAuxiliaryStorage::open( const QString &filenam
return database; return database;
} }
spatialite_database_unique_ptr QgsAuxiliaryStorage::open( const QgsProject &project ) sqlite3_database_unique_ptr QgsAuxiliaryStorage::open( const QgsProject &project )
{ {
return open( filenameForProject( project ) ); return open( filenameForProject( project ) );
} }

10
src/core/qgsauxiliarystorage.h
View File

@ -24,7 +24,7 @@
#include "qgsdiagramrenderer.h" #include "qgsdiagramrenderer.h"
#include "qgsvectorlayerjoininfo.h" #include "qgsvectorlayerjoininfo.h"
#include "qgsproperty.h" #include "qgsproperty.h"
#include "qgsspatialiteutils.h" #include "qgssqliteutils.h"
#include "qgsvectorlayer.h" #include "qgsvectorlayer.h"
#include "qgscallout.h" #include "qgscallout.h"
#include <QString> #include <QString>
@ -428,14 +428,14 @@ class CORE_EXPORT QgsAuxiliaryStorage
static bool exists( const QgsProject &project ); static bool exists( const QgsProject &project );
private: private:
spatialite_database_unique_ptr open( const QString &filename = QString() ); sqlite3_database_unique_ptr open( const QString &filename = QString() );
spatialite_database_unique_ptr open( const QgsProject &project ); sqlite3_database_unique_ptr open( const QgsProject &project );
void initTmpFileName(); void initTmpFileName();
static QString filenameForProject( const QgsProject &project ); static QString filenameForProject( const QgsProject &project );
static spatialite_database_unique_ptr createDB( const QString &filename ); static sqlite3_database_unique_ptr createDB( const QString &filename );
static spatialite_database_unique_ptr openDB( const QString &filename ); static sqlite3_database_unique_ptr openDB( const QString &filename );
static bool tableExists( const QString &table, sqlite3 *handler ); static bool tableExists( const QString &table, sqlite3 *handler );
static bool createTable( const QString &type, const QString &table, sqlite3 *handler, QString &errorMsg ); static bool createTable( const QString &type, const QString &table, sqlite3 *handler, QString &errorMsg );