Address review

qgis · Jan 31, 2021 · 7961c92 · 7961c92
1 parent 4b84330
commit 7961c92
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/src/gui/providers/gdal/qgsgdalsourceselect.cpp b/src/gui/providers/gdal/qgsgdalsourceselect.cpp
@@ -268,10 +268,7 @@ void QgsGdalSourceSelect::fillOpenOptions()
     return;
 
   GDALDriverH hDriver;
-  if ( STARTS_WITH_CI( mDataSources[0].toUtf8().toStdString().c_str(), "PG:" ) )
-    hDriver = GDALGetDriverByName( "PostgreSQL" ); // otherwise the PostgisRaster driver gets identified
-  else
-    hDriver = GDALIdentifyDriver( mDataSources[0].toUtf8().toStdString().c_str(), nullptr );
+  hDriver = GDALIdentifyDriver( mDataSources[0].toUtf8().toStdString().c_str(), nullptr );
   if ( hDriver == nullptr )
     return;
 
@@ -289,8 +286,6 @@ void QgsGdalSourceSelect::fillOpenOptions()
     return;
   }
 
-  const bool bIsGPKG = EQUAL( GDALGetDriverShortName( hDriver ), "GPKG" );
-
   for ( auto psItem = psOpenOptionList->psChild; psItem != nullptr; psItem = psItem->psNext )
   {
     if ( psItem->eType != CXT_Element || !EQUAL( psItem->pszValue, "Option" ) )
@@ -305,12 +300,6 @@ void QgsGdalSourceSelect::fillOpenOptions()
     if ( pszScope != nullptr && strstr( pszScope, "raster" ) == nullptr )
       continue;
 
-    // The GPKG driver list a lot of options that are only for rasters
-    if ( bIsGPKG && strstr( pszOpenOptionList, "scope=" ) == nullptr &&
-         !EQUAL( pszOptionName, "LIST_ALL_TABLES" ) &&
-         !EQUAL( pszOptionName, "PRELUDE_STATEMENTS" ) )
-      continue;
-
     const char *pszType = CPLGetXMLValue( psItem, "type", nullptr );
     QStringList options;
     if ( pszType && EQUAL( pszType, "string-select" ) )