When repairing or changing the data source for a delimited text layer

to another CSV file, add special handling so that we don't silently change the layer's provider across to OGR and drop all the delimited text setup (like field names, crs, etc)
qgis · Feb 9, 2022 · 03796bd · 03796bd
1 parent 4a37fe8
commit 03796bd
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8461,6 +8461,7 @@ void QgisApp::changeDataSource( QgsMapLayer *layer )
       auto fixLayer = [this]( QgsMapLayer * layer, const QgsMimeDataUtils::Uri & uri )
       {
         bool layerWasValid( layer->isValid() );
+        const QString previousProvider = layer->providerType();
         // Store subset string from vlayer if we are fixing a bad layer
         QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
         QString subsetString;
@@ -8479,7 +8480,26 @@ void QgisApp::changeDataSource( QgsMapLayer *layer )
           subsetString = vlayer->subsetString();
         }
 
-        layer->setDataSource( uri.uri, layer->name(), uri.providerKey, QgsDataProvider::ProviderOptions() );
+        QString newProvider = uri.providerKey;
+        QString newUri = uri.uri;
+        // special case -- if layer was using delimitedtext provider, and a new CSV file is picked, we shouldn't change the
+        // provider to OGR
+        if ( previousProvider.compare( QLatin1String( "delimitedtext" ), Qt::CaseInsensitive ) == 0
+             && newProvider.compare( QLatin1String( "ogr" ), Qt::CaseInsensitive ) == 0 )
+        {
+          QVariantMap uriParts = QgsProviderRegistry::instance()->decodeUri( layer->providerType(), layer->source() );
+          const QVariantMap newUriParts = QgsProviderRegistry::instance()->decodeUri( uri.providerKey, uri.uri );
+          const QString newPath = newUriParts.value( QStringLiteral( "path" ) ).toString();
+          if ( QFileInfo( newPath ).suffix().compare( QLatin1String( "csv" ), Qt::CaseInsensitive ) == 0 )
+          {
+            newProvider = QStringLiteral( "delimitedtext" );
+            // keep all the other delimited text settings, such as field names etc, just change the path
+            uriParts.insert( QStringLiteral( "path" ), newPath );
+            newUri = QgsProviderRegistry::instance()->encodeUri( newProvider, uriParts );
+          }
+        }
+
+        layer->setDataSource( newUri, layer->name(), newProvider, QgsDataProvider::ProviderOptions() );
         // Re-apply original style and subset string  when fixing bad layers
         if ( !( layerWasValid || layer->originalXmlProperties().isEmpty() ) )
         {