Rework MSSQL parser to support v2 geometries (fixes #22041)

qgis · Jun 15, 2019 · 38659fb · 38659fb
1 parent b25fa7a
commit 38659fb
Show file tree

Hide file tree

Showing 4 changed files with 418 additions and 325 deletions.
diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -376,11 +376,10 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature &feature )
       QByteArray ar = mQuery->record().value( mSource->mGeometryColName ).toByteArray();
       if ( !ar.isEmpty() )
       {
-        if ( unsigned char *wkb = mParser.ParseSqlGeometry( reinterpret_cast< unsigned char * >( ar.data() ), ar.size() ) )
+        std::unique_ptr<QgsAbstractGeometry> geom = mParser.ParseSqlGeometry(reinterpret_cast< unsigned char * >(ar.data()), ar.size());
+        if ( geom != nullptr )
         {
-          QgsGeometry g;
-          g.fromWkb( wkb, mParser.GetWkbLen() );
-          feature.setGeometry( g );
+          feature.setGeometry( QgsGeometry( geom.release() ) );
         }
       }
     }