[QGIS Commit] r13059 - trunk/qgis/src/providers/postgres

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-03-15 15:25:02 -0400 (Mon, 15 Mar 2010)
New Revision: 13059

Modified:
   trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
   trunk/qgis/src/providers/postgres/qgspostgresprovider.h
Log:
fix #2555

Modified: trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp	2010-03-15 19:05:11 UTC (rev 13058)
+++ trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp	2010-03-15 19:25:02 UTC (rev 13059)
@@ -690,6 +690,7 @@
     return;
 
   mFetching = true;
+  mFetched = 0;
 }
 
 bool QgsPostgresProvider::nextFeature( QgsFeature& feature )
@@ -731,6 +732,11 @@
     QgsDebugMsg( "End of features" );
     connectionRO->closeCursor( cursorName );
     mFetching = false;
+    if ( featuresCounted != mFetched )
+    {
+      QgsDebugMsg( QString( "feature count adjusted from %1 to %2" ).arg( featuresCounted ).arg( mFetched ) );
+      featuresCounted = mFetched;
+    }
     return false;
   }
 
@@ -748,6 +754,7 @@
   feature.setAttributeMap( mFeatureQueue.front().attributeMap() );
 
   mFeatureQueue.pop();
+  mFetched++;
 
   feature.setValid( true );
   return true;

Modified: trunk/qgis/src/providers/postgres/qgspostgresprovider.h
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresprovider.h	2010-03-15 19:05:11 UTC (rev 13058)
+++ trunk/qgis/src/providers/postgres/qgspostgresprovider.h	2010-03-15 19:25:02 UTC (rev 13059)
@@ -364,7 +364,8 @@
     */
     bool parseDomainCheckConstraint( QStringList& enumValues, const QString& attributeName ) const;
 
-    bool mFetching;   // true if a cursor was declared
+    bool mFetching; // true if a cursor was declared
+    int mFetched; // number of retrieved features
     std::vector < QgsFeature > features;
     QgsFieldMap attributeFields;
     QString mDataComment;