Open sqlite db for datum transform info in readonly mode. Fixes slow opening on windows

mhugent · mhugent · commit de0a88682d2a · 2016-01-04T17:34:10.000+01:00
diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -904,7 +904,7 @@ QString QgsCoordinateTransform::stripDatumTransform( const QString& proj4 )
 void QgsCoordinateTransform::searchDatumTransform( const QString& sql, QList< int >& transforms )
 {
   sqlite3* db;
-  int openResult = sqlite3_open( QgsApplication::srsDbFilePath().toUtf8().constData(), &db );
+  int openResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().constData(), &db, SQLITE_OPEN_READONLY, 0 );
   if ( openResult != SQLITE_OK )
   {
     sqlite3_close( db );
@@ -935,7 +935,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )
   QString transformString;
 
   sqlite3* db;
-  int openResult = sqlite3_open( QgsApplication::srsDbFilePath().toUtf8().constData(), &db );
+  int openResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().constData(), &db, SQLITE_OPEN_READONLY, 0 );
   if ( openResult != SQLITE_OK )
   {
     sqlite3_close( db );
@@ -989,7 +989,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )
 bool QgsCoordinateTransform::datumTransformCrsInfo( int datumTransform, int& epsgNr, QString& srcProjection, QString& dstProjection, QString &remarks, QString &scope, bool &preferred, bool &deprecated )
 {
   sqlite3* db;
-  int openResult = sqlite3_open( QgsApplication::srsDbFilePath().toUtf8().constData(), &db );
+  int openResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().constData(), &db, SQLITE_OPEN_READONLY, 0 );
   if ( openResult != SQLITE_OK )
   {
     sqlite3_close( db );

Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,7 @@ QString QgsCoordinateTransform::stripDatumTransform( const QString& proj4 )`
`904`	`904`	`void QgsCoordinateTransform::searchDatumTransform( const QString& sql, QList< int >& transforms )`
`905`	`905`	`{`
`906`	`906`	`sqlite3* db;`
`907`		`- int openResult = sqlite3_open( QgsApplication::srsDbFilePath().toUtf8().constData(), &db );`
	`907`	`+ int openResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().constData(), &db, SQLITE_OPEN_READONLY, 0 );`
`908`	`908`	`if ( openResult != SQLITE_OK )`
`909`	`909`	`{`
`910`	`910`	`sqlite3_close( db );`
`@@ -935,7 +935,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )`
`935`	`935`	`QString transformString;`
`936`	`936`
`937`	`937`	`sqlite3* db;`
`938`		`- int openResult = sqlite3_open( QgsApplication::srsDbFilePath().toUtf8().constData(), &db );`
	`938`	`+ int openResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().constData(), &db, SQLITE_OPEN_READONLY, 0 );`
`939`	`939`	`if ( openResult != SQLITE_OK )`
`940`	`940`	`{`
`941`	`941`	`sqlite3_close( db );`
`@@ -989,7 +989,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )`
`989`	`989`	`bool QgsCoordinateTransform::datumTransformCrsInfo( int datumTransform, int& epsgNr, QString& srcProjection, QString& dstProjection, QString &remarks, QString &scope, bool &preferred, bool &deprecated )`
`990`	`990`	`{`
`991`	`991`	`sqlite3* db;`
`992`		`- int openResult = sqlite3_open( QgsApplication::srsDbFilePath().toUtf8().constData(), &db );`
	`992`	`+ int openResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().constData(), &db, SQLITE_OPEN_READONLY, 0 );`
`993`	`993`	`if ( openResult != SQLITE_OK )`
`994`	`994`	`{`
`995`	`995`	`sqlite3_close( db );`