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

rouault · rouault · commit 05bfd2bcb118 · 2016-05-29T11:02:52.000+02:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -384,7 +384,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
 QgsOgrProvider::~QgsOgrProvider()
 {
   close();
-  QgsOgrConnPool::instance()->unref( mFilePath );
+  QgsOgrConnPool::instance()->unref( dataSourceUri() );
 }
 
 QgsAbstractFeatureSource* QgsOgrProvider::featureSource() const
@@ -1107,7 +1107,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;
@@ -2658,7 +2658,7 @@ QString QgsOgrUtils::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
`@@ -384,7 +384,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )`
`384`	`384`	`QgsOgrProvider::~QgsOgrProvider()`
`385`	`385`	`{`
`386`	`386`	`close();`
`387`		`- QgsOgrConnPool::instance()->unref( mFilePath );`
	`387`	`+ QgsOgrConnPool::instance()->unref( dataSourceUri() );`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`QgsAbstractFeatureSource* QgsOgrProvider::featureSource() const`
`@@ -1107,7 +1107,7 @@ bool QgsOgrProvider::addAttributes( const QList<QgsField> &attributes )`
`1107`	`1107`	`{`
`1108`	`1108`	`// adding attributes in mapinfo requires to be able to delete the .dat file`
`1109`	`1109`	`// so drop any cached connections.`
`1110`		`- QgsOgrConnPool::instance()->invalidateConnections( filePath() );`
	`1110`	`+ QgsOgrConnPool::instance()->invalidateConnections( dataSourceUri() );`
`1111`	`1111`	`}`
`1112`	`1112`
`1113`	`1113`	`bool returnvalue = true;`
`@@ -2658,7 +2658,7 @@ QString QgsOgrUtils::quotedValue( const QVariant& value )`
`2658`	`2658`	`bool QgsOgrProvider::syncToDisc()`
`2659`	`2659`	`{`
`2660`	`2660`	`//for shapefiles, remove spatial index files and create a new index`
`2661`		`- QgsOgrConnPool::instance()->unref( mFilePath );`
	`2661`	`+ QgsOgrConnPool::instance()->unref( dataSourceUri() );`
`2662`	`2662`	`bool shapeIndex = false;`
`2663`	`2663`	`if ( ogrDriverName == "ESRI Shapefile" )`
`2664`	`2664`	`{`