spatialite provider: prefer rowid as primary key where available (and…

… some cleanups) fixes #14575, fixes #14626
qgis · Apr 9, 2016 · 1050174 · 1050174
1 parent 2897764
commit 1050174
Show file tree

Hide file tree

Showing 4 changed files with 377 additions and 385 deletions.
diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp
@@ -378,7 +378,7 @@ QString QgsSpatiaLiteFeatureIterator::whereClauseRect()
   }
   else if ( rect.isFinite() )
   {
-    if ( mSource->spatialIndexRTree )
+    if ( mSource->mSpatialIndexRTree )
     {
       // using the RTree spatial index
       QString mbrFilter = QString( "xmin <= %1 AND " ).arg( qgsDoubleToString( rect.xMaximum() ) );
@@ -391,7 +391,7 @@ QString QgsSpatiaLiteFeatureIterator::whereClauseRect()
                            QgsSpatiaLiteProvider::quotedIdentifier( idxName ),
                            mbrFilter );
     }
-    else if ( mSource->spatialIndexMbrCache )
+    else if ( mSource->mSpatialIndexMbrCache )
     {
       // using the MbrCache spatial index
       QString idxName = QString( "cache_%1_%2" ).arg( mSource->mIndexTable, mSource->mIndexGeometry );
@@ -578,16 +578,16 @@ bool QgsSpatiaLiteFeatureIterator::prepareOrderBy( const QList<QgsFeatureRequest
 QgsSpatiaLiteFeatureSource::QgsSpatiaLiteFeatureSource( const QgsSpatiaLiteProvider* p )
     : mGeometryColumn( p->mGeometryColumn )
     , mSubsetString( p->mSubsetString )
-    , mFields( p->attributeFields )
+    , mFields( p->mAttributeFields )
     , mQuery( p->mQuery )
-    , isQuery( p->isQuery )
+    , mIsQuery( p->mIsQuery )
     , mViewBased( p->mViewBased )
     , mVShapeBased( p->mVShapeBased )
     , mIndexTable( p->mIndexTable )
     , mIndexGeometry( p->mIndexGeometry )
     , mPrimaryKey( p->mPrimaryKey )
-    , spatialIndexRTree( p->spatialIndexRTree )
-    , spatialIndexMbrCache( p->spatialIndexMbrCache )
+    , mSpatialIndexRTree( p->mSpatialIndexRTree )
+    , mSpatialIndexMbrCache( p->mSpatialIndexMbrCache )
     , mSqlitePath( p->mSqlitePath )
 {
 }

diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.h b/src/providers/spatialite/qgsspatialitefeatureiterator.h
@@ -39,14 +39,14 @@ class QgsSpatiaLiteFeatureSource : public QgsAbstractFeatureSource
     QString mSubsetString;
     QgsFields mFields;
     QString mQuery;
-    bool isQuery;
+    bool mIsQuery;
     bool mViewBased;
     bool mVShapeBased;
     QString mIndexTable;
     QString mIndexGeometry;
     QString mPrimaryKey;
-    bool spatialIndexRTree;
-    bool spatialIndexMbrCache;
+    bool mSpatialIndexRTree;
+    bool mSpatialIndexMbrCache;
     QString mSqlitePath;
 
     friend class QgsSpatiaLiteFeatureIterator;