qgis · Aug 25, 2021
diff --git a/‎src/core/providers/ogr/qgsogrprovidermetadata.cpp
Lines changed: 49 additions & 0 deletions b/‎src/core/providers/ogr/qgsogrprovidermetadata.cpp
Lines changed: 49 additions & 0 deletions
diff --git a/‎tests/src/python/test_provider_ogr.py
Lines changed: 18 additions & 0 deletions b/‎tests/src/python/test_provider_ogr.py
Lines changed: 18 additions & 0 deletions
@@ -31,6 +31,7 @@ email                : nyall dot dawson at gmail dot com
 #include "qgsproviderutils.h"
 #include "qgsgdalutils.h"
 
+#include <gdal.h>
 #include <QFileInfo>
 #include <QFile>
 #include <QDir>
@@ -1305,6 +1306,54 @@ QList<QgsProviderSublayerDetails> QgsOgrProviderMetadata::querySublayers( const
     } ), res.end() );
   }
 
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3,4,0)
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+  QMutex *mutex = nullptr;
+#else
+  QRecursiveMutex *mutex = nullptr;
+#endif
+  GDALDatasetH hDS = firstLayer->getDatasetHandleAndMutex( mutex );
+  QMutexLocker locker( mutex );
+  if ( GDALGroupH rootGroup = GDALDatasetGetRootGroup( hDS ) )
+  {
+    std::function< void( GDALGroupH, const QStringList & ) > recurseGroup;
+    recurseGroup = [&recurseGroup, &res]( GDALGroupH group, const QStringList & currentPath )
+    {
+      if ( char **vectorLayerNames = GDALGroupGetVectorLayerNames( group, nullptr ) )
+      {
+        const QStringList layers = QgsOgrUtils::cStringListToQStringList( vectorLayerNames );
+        // attach path to matching layers
+        for ( const QString &layer : layers )
+        {
+          for ( int i = 0; i < res.size(); ++i )
+          {
+            if ( res.at( i ).name() == layer )
+            {
+              res[i].setPath( currentPath );
+            }
+          }
+        }
+      }
+
+      if ( char **subgroupNames = GDALGroupGetGroupNames( group, nullptr ) )
+      {
+        for ( int i = 0; subgroupNames[i]; ++i )
+        {
+          if ( GDALGroupH subgroup = GDALGroupOpenGroup( group, subgroupNames[i], nullptr ) )
+          {
+            recurseGroup( subgroup, QStringList( currentPath ) << QString::fromUtf8( subgroupNames[i] ) );
+            GDALGroupRelease( subgroup );
+          }
+        }
+      }
+    };
+
+    recurseGroup( rootGroup, {} );
+    GDALGroupRelease( rootGroup );
+  }
+#endif
+
   return res;
 }
 
 
@@ -2045,6 +2045,24 @@ def test_provider_sublayer_details(self):
                                 'driverName': 'SQLite',
                                 'geomColName': ''}])
 
+    @unittest.skipIf(int(gdal.VersionInfo('VERSION_NUM')) < GDAL_COMPUTE_VERSION(3, 4, 0), "GDAL 3.4 required")
+    def test_provider_sublayer_details_hierarchy(self):
+        """
+        Test retrieving sublayer details from a datasource with a hierarchy of layers
+        """
+        metadata = QgsProviderRegistry.instance().providerMetadata('ogr')
+
+        res = metadata.querySublayers(os.path.join(TEST_DATA_DIR, 'featuredataset.gdb'))
+        self.assertEqual(len(res), 4)
+        self.assertEqual(res[0].name(), 'fd1_lyr1')
+        self.assertEqual(res[0].path(), ['fd1'])
+        self.assertEqual(res[1].name(), 'fd1_lyr2')
+        self.assertEqual(res[1].path(), ['fd1'])
+        self.assertEqual(res[2].name(), 'standalone')
+        self.assertEqual(res[2].path(), [])
+        self.assertEqual(res[3].name(), 'fd2_lyr')
+        self.assertEqual(res[3].path(), ['fd2'])
+
     def test_provider_sublayer_details_fast_scan(self):
         """
         Test retrieving sublayer details from data provider metadata, using fast scan