Move table name variable to local

elpaso · elpaso · commit f1b2893b489a · 2018-09-28T11:05:27.000+02:00
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -4592,27 +4592,29 @@ bool QgsSpatiaLiteProvider::checkLayerType()
     {
       // Check if we can get use the ROWID from the table that provides the geometry
       sqlite3_stmt *stmt = nullptr;
+      //! String containing the name of the table that provides the geometry if the layer data source is based on a query
+      QString queryGeomTableName;
       // 1. find the table that provides geometry
       if ( sqlite3_prepare_v2( mSqliteHandle, sql.toUtf8().constData(), -1, &stmt, nullptr ) == SQLITE_OK )
       {
-        mQueryGeomTableName = sqlite3_column_table_name( stmt, 1 );
+        queryGeomTableName = sqlite3_column_table_name( stmt, 1 );
       }
       // 2. check if the table has a useable ROWID
-      if ( ! mQueryGeomTableName.isEmpty() )
+      if ( ! queryGeomTableName.isEmpty() )
       {
-        sql = QStringLiteral( "SELECT ROWID FROM %1 WHERE ROWID IS NOT NULL LIMIT 1" ).arg( quotedIdentifier( mQueryGeomTableName ) );
+        sql = QStringLiteral( "SELECT ROWID FROM %1 WHERE ROWID IS NOT NULL LIMIT 1" ).arg( quotedIdentifier( queryGeomTableName ) );
         ret = sqlite3_get_table( mSqliteHandle, sql.toUtf8().constData(), &results, &rows, &columns, &errMsg );
         if ( ret != SQLITE_OK || rows != 1 )
         {
-          mQueryGeomTableName = QString();
+          queryGeomTableName = QString();
         }
       }
       // 3. check if ROWID injection works
-      if ( ! mQueryGeomTableName.isEmpty() )
+      if ( ! queryGeomTableName.isEmpty() )
       {
         QString newSql( mQuery.replace( QStringLiteral( "SELECT " ),
                                         QStringLiteral( "SELECT %1.%2, " )
-                                        .arg( quotedIdentifier( mQueryGeomTableName ), QStringLiteral( "ROWID" ) ),
+                                        .arg( quotedIdentifier( queryGeomTableName ), QStringLiteral( "ROWID" ) ),
                                         Qt::CaseInsensitive ) );
         sql = QStringLiteral( "SELECT ROWID FROM %1 WHERE ROWID IS NOT NULL LIMIT 1" ).arg( newSql );
         ret = sqlite3_get_table( mSqliteHandle, sql.toUtf8().constData(), &results, &rows, &columns, &errMsg );
diff --git a/src/providers/spatialite/qgsspatialiteprovider.h b/src/providers/spatialite/qgsspatialiteprovider.h
@@ -230,9 +230,6 @@ class QgsSpatiaLiteProvider: public QgsVectorDataProvider
     //! Flag indicating if the layer data source is based on a query
     bool mIsQuery = false;
 
-    //! String containing the name of the table that provides the geometry if the layer data source is based on a query
-    QString mQueryGeomTableName;
-
     //! Flag indicating if ROWID has been injected in the query
     bool mRowidInjectedInQuery = false;
 

Original file line number	Diff line number	Diff line change
`@@ -4592,27 +4592,29 @@ bool QgsSpatiaLiteProvider::checkLayerType()`
`4592`	`4592`	`{`
`4593`	`4593`	`// Check if we can get use the ROWID from the table that provides the geometry`
`4594`	`4594`	`sqlite3_stmt *stmt = nullptr;`
	`4595`	`+ //! String containing the name of the table that provides the geometry if the layer data source is based on a query`
	`4596`	`+ QString queryGeomTableName;`
`4595`	`4597`	`// 1. find the table that provides geometry`
`4596`	`4598`	`if ( sqlite3_prepare_v2( mSqliteHandle, sql.toUtf8().constData(), -1, &stmt, nullptr ) == SQLITE_OK )`
`4597`	`4599`	`{`
`4598`		`- mQueryGeomTableName = sqlite3_column_table_name( stmt, 1 );`
	`4600`	`+ queryGeomTableName = sqlite3_column_table_name( stmt, 1 );`
`4599`	`4601`	`}`
`4600`	`4602`	`// 2. check if the table has a useable ROWID`
`4601`		`- if ( ! mQueryGeomTableName.isEmpty() )`
	`4603`	`+ if ( ! queryGeomTableName.isEmpty() )`
`4602`	`4604`	`{`
`4603`		`- sql = QStringLiteral( "SELECT ROWID FROM %1 WHERE ROWID IS NOT NULL LIMIT 1" ).arg( quotedIdentifier( mQueryGeomTableName ) );`
	`4605`	`+ sql = QStringLiteral( "SELECT ROWID FROM %1 WHERE ROWID IS NOT NULL LIMIT 1" ).arg( quotedIdentifier( queryGeomTableName ) );`
`4604`	`4606`	`ret = sqlite3_get_table( mSqliteHandle, sql.toUtf8().constData(), &results, &rows, &columns, &errMsg );`
`4605`	`4607`	`if ( ret != SQLITE_OK \|\| rows != 1 )`
`4606`	`4608`	`{`
`4607`		`- mQueryGeomTableName = QString();`
	`4609`	`+ queryGeomTableName = QString();`
`4608`	`4610`	`}`
`4609`	`4611`	`}`
`4610`	`4612`	`// 3. check if ROWID injection works`
`4611`		`- if ( ! mQueryGeomTableName.isEmpty() )`
	`4613`	`+ if ( ! queryGeomTableName.isEmpty() )`
`4612`	`4614`	`{`
`4613`	`4615`	`QString newSql( mQuery.replace( QStringLiteral( "SELECT " ),`
`4614`	`4616`	`QStringLiteral( "SELECT %1.%2, " )`
`4615`		`- .arg( quotedIdentifier( mQueryGeomTableName ), QStringLiteral( "ROWID" ) ),`
	`4617`	`+ .arg( quotedIdentifier( queryGeomTableName ), QStringLiteral( "ROWID" ) ),`
`4616`	`4618`	`Qt::CaseInsensitive ) );`
`4617`	`4619`	`sql = QStringLiteral( "SELECT ROWID FROM %1 WHERE ROWID IS NOT NULL LIMIT 1" ).arg( newSql );`
`4618`	`4620`	`ret = sqlite3_get_table( mSqliteHandle, sql.toUtf8().constData(), &results, &rows, &columns, &errMsg );`