Use consistently dataSourceUri() with QgsOgrConnPool (follow up of #3057)

rouault · rouault · commit 52de4fb9ba2b · 2016-05-04T22:33:17.000+02:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -385,7 +385,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
 QgsOgrProvider::~QgsOgrProvider()
 {
   close();
-  QgsOgrConnPool::instance()->unref( mFilePath );
+  QgsOgrConnPool::instance()->unref( dataSourceUri() );
 }
 
 QgsAbstractFeatureSource* QgsOgrProvider::featureSource() const
@@ -1216,7 +1216,7 @@ bool QgsOgrProvider::addAttributes( const QList<QgsField> &attributes )
   {
     // adding attributes in mapinfo requires to be able to delete the .dat file
     // so drop any cached connections.
-    QgsOgrConnPool::instance()->invalidateConnections( filePath() );
+    QgsOgrConnPool::instance()->invalidateConnections( dataSourceUri() );
   }
 
   bool returnvalue = true;
@@ -2792,7 +2792,7 @@ QString QgsOgrProviderUtils::quotedValue( const QVariant& value )
 bool QgsOgrProvider::syncToDisc()
 {
   //for shapefiles, remove spatial index files and create a new index
-  QgsOgrConnPool::instance()->unref( mFilePath );
+  QgsOgrConnPool::instance()->unref( dataSourceUri() );
   bool shapeIndex = false;
   if ( ogrDriverName == "ESRI Shapefile" )
   {

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )`
`385`	`385`	`QgsOgrProvider::~QgsOgrProvider()`
`386`	`386`	`{`
`387`	`387`	`close();`
`388`		`- QgsOgrConnPool::instance()->unref( mFilePath );`
	`388`	`+ QgsOgrConnPool::instance()->unref( dataSourceUri() );`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`QgsAbstractFeatureSource* QgsOgrProvider::featureSource() const`
`@@ -1216,7 +1216,7 @@ bool QgsOgrProvider::addAttributes( const QList<QgsField> &attributes )`
`1216`	`1216`	`{`
`1217`	`1217`	`// adding attributes in mapinfo requires to be able to delete the .dat file`
`1218`	`1218`	`// so drop any cached connections.`
`1219`		`- QgsOgrConnPool::instance()->invalidateConnections( filePath() );`
	`1219`	`+ QgsOgrConnPool::instance()->invalidateConnections( dataSourceUri() );`
`1220`	`1220`	`}`
`1221`	`1221`
`1222`	`1222`	`bool returnvalue = true;`
`@@ -2792,7 +2792,7 @@ QString QgsOgrProviderUtils::quotedValue( const QVariant& value )`
`2792`	`2792`	`bool QgsOgrProvider::syncToDisc()`
`2793`	`2793`	`{`
`2794`	`2794`	`//for shapefiles, remove spatial index files and create a new index`
`2795`		`- QgsOgrConnPool::instance()->unref( mFilePath );`
	`2795`	`+ QgsOgrConnPool::instance()->unref( dataSourceUri() );`
`2796`	`2796`	`bool shapeIndex = false;`
`2797`	`2797`	`if ( ogrDriverName == "ESRI Shapefile" )`
`2798`	`2798`	`{`