another postgres feature count fix

jef · jef · commit 6d4dfaf785c6 · 2010-03-26T15:31:37.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13165 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -736,10 +736,10 @@ bool QgsPostgresProvider::nextFeature( QgsFeature& feature )
 
   if ( mFeatureQueue.empty() )
   {
-    QgsDebugMsg( "End of features" );
+    QgsDebugMsg( QString( "finished after %1 features" ).arg( mFetched ) );
     connectionRO->closeCursor( cursorName );
     mFetching = false;
-    if ( featuresCounted != mFetched )
+    if ( featuresCounted < mFetched )
     {
       QgsDebugMsg( QString( "feature count adjusted from %1 to %2" ).arg( featuresCounted ).arg( mFetched ) );
       featuresCounted = mFetched;

Original file line number	Diff line number	Diff line change
`@@ -736,10 +736,10 @@ bool QgsPostgresProvider::nextFeature( QgsFeature& feature )`
`736`	`736`
`737`	`737`	`if ( mFeatureQueue.empty() )`
`738`	`738`	`{`
`739`		`- QgsDebugMsg( "End of features" );`
	`739`	`+ QgsDebugMsg( QString( "finished after %1 features" ).arg( mFetched ) );`
`740`	`740`	`connectionRO->closeCursor( cursorName );`
`741`	`741`	`mFetching = false;`
`742`		`- if ( featuresCounted != mFetched )`
	`742`	`+ if ( featuresCounted < mFetched )`
`743`	`743`	`{`
`744`	`744`	`QgsDebugMsg( QString( "feature count adjusted from %1 to %2" ).arg( featuresCounted ).arg( mFetched ) );`
`745`	`745`	`featuresCounted = mFetched;`