Merge 1c2c2b3252a1010c96c69ace5fffa2584b59535a into 58efdb82ce9aabaccdbc8d98a653733d876ea88e

Merge pull request #63417 from qgis/backport-63404-to-release-3_44
[Backport release-3_44] [mssql] Fix curvepolygon hidden in browser
2025-10-03 00:04:47 -04:00 · 2025-10-02 08:50:09 +02:00 · 2025-10-02 07:50:06 +01:00 · 2025-10-01 23:58:11 +00:00
1 changed files with 6 additions and 9 deletions
--- a/src/providers/mssql/qgsmssqldataitems.cpp
+++ b/src/providers/mssql/qgsmssqldataitems.cpp
@ -143,7 +143,7 @@ QVector<QgsDataItem *> QgsMssqlConnectionItem::createChildren()
  }

  // build sql statement
-  QString query = QgsMssqlConnection::buildQueryForTables( mName );
+  const QString query = QgsMssqlConnection::buildQueryForTables( mName );

  const bool disableInvalidGeometryHandling = QgsMssqlConnection::isInvalidGeometryHandlingDisabled( mName );

@ -471,19 +471,16 @@ QgsMssqlLayerItem *QgsMssqlSchemaItem::addLayer( const QgsMssqlLayerProperty &la
  QString tip = tr( "%1 as %2 in %3" ).arg( layerProperty.geometryColName, QgsWkbTypes::displayString( wkbType ), layerProperty.srid );

  Qgis::BrowserLayerType layerType;
-  Qgis::WkbType flatType = QgsWkbTypes::flatType( wkbType );
-  switch ( flatType )
+  const Qgis::GeometryType geomType = QgsWkbTypes::geometryType( wkbType );
+  switch ( geomType )
  {
-    case Qgis::WkbType::Point:
-    case Qgis::WkbType::MultiPoint:
+    case Qgis::GeometryType::Point:
      layerType = Qgis::BrowserLayerType::Point;
      break;
-    case Qgis::WkbType::LineString:
-    case Qgis::WkbType::MultiLineString:
+    case Qgis::GeometryType::Line:
      layerType = Qgis::BrowserLayerType::Line;
      break;
-    case Qgis::WkbType::Polygon:
-    case Qgis::WkbType::MultiPolygon:
+    case Qgis::GeometryType::Polygon:
      layerType = Qgis::BrowserLayerType::Polygon;
      break;
    default:
Author	SHA1	Message	Date
qgis-bot	389076b757	Merge 1c2c2b3252a1010c96c69ace5fffa2584b59535a into 58efdb82ce9aabaccdbc8d98a653733d876ea88e	2025-10-02 08:50:09 +02:00
Alexander Bruy	58efdb82ce	Merge pull request #63417 from qgis/backport-63404-to-release-3_44 [Backport release-3_44] [mssql] Fix curvepolygon hidden in browser	2025-10-02 07:50:06 +01:00
Alessandro Pasotti	288ba08b3c	[mssql] Fix curvepolygon hidden in browser Fix #63365	2025-10-01 23:58:11 +00:00