Add nested loop support for ogr provider

m-kuhn · m-kuhn · commit 550f381c8727 · 2018-08-08T07:17:18.000+02:00
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -44,7 +44,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
   , mFilterFidsIt( mFilterFids.constBegin() )
 {
   //QgsDebugMsg( "Feature iterator of " + mSource->mLayerName + ": acquiring connection");
-  mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ) );
+  mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), request.connectionTimeout(), request.requestMayBeNested() );
   if ( !mConn->ds )
   {
     return;

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool`
`44`	`44`	`, mFilterFidsIt( mFilterFids.constBegin() )`
`45`	`45`	`{`
`46`	`46`	`//QgsDebugMsg( "Feature iterator of " + mSource->mLayerName + ": acquiring connection");`
`47`		`- mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ) );`
	`47`	`+ mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), request.connectionTimeout(), request.requestMayBeNested() );`
`48`	`48`	`if ( !mConn->ds )`
`49`	`49`	`{`
`50`	`50`	`return;`