[mssql] Fix import of layers with invalid geometries (fixes #20122)

wonder-sk · wonder-sk · commit 63b2267b6b52 · 2018-11-22T13:06:34.000+01:00
This essentially reverts 62f4534 Rationale: - even valid geometries according to GEOS may be considered as invalid by MS SQL so there is no way of knowing that a geometry may be fail to be added - change of geometries applies MakeValid() so it is consistent again - GDAL driver also applies MakeValid() on all added/changed geometries - QGIS since 3.4 has optional geometry checks for validity etc. so some truly invalid geometries may be fixed before submitted to the provider See also #8411 (cherry picked from commit b1fd7b5)
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -927,10 +927,10 @@ bool QgsMssqlProvider::addFeatures( QgsFeatureList &flist, Flags flags )
       if ( mGeometryColType == QLatin1String( "geometry" ) )
       {
         if ( mUseWkb )
-          values += QStringLiteral( "geometry::STGeomFromWKB(%1,%2)" ).arg(
+          values += QStringLiteral( "geometry::STGeomFromWKB(%1,%2).MakeValid()" ).arg(
                       QStringLiteral( "?" ), QString::number( mSRId ) );
         else
-          values += QStringLiteral( "geometry::STGeomFromText(%1,%2)" ).arg(
+          values += QStringLiteral( "geometry::STGeomFromText(%1,%2).MakeValid()" ).arg(
                       QStringLiteral( "?" ), QString::number( mSRId ) );
       }
       else

Original file line number	Diff line number	Diff line change
`@@ -927,10 +927,10 @@ bool QgsMssqlProvider::addFeatures( QgsFeatureList &flist, Flags flags )`
`927`	`927`	`if ( mGeometryColType == QLatin1String( "geometry" ) )`
`928`	`928`	`{`
`929`	`929`	`if ( mUseWkb )`
`930`		`- values += QStringLiteral( "geometry::STGeomFromWKB(%1,%2)" ).arg(`
	`930`	`+ values += QStringLiteral( "geometry::STGeomFromWKB(%1,%2).MakeValid()" ).arg(`
`931`	`931`	`QStringLiteral( "?" ), QString::number( mSRId ) );`
`932`	`932`	`else`
`933`		`- values += QStringLiteral( "geometry::STGeomFromText(%1,%2)" ).arg(`
	`933`	`+ values += QStringLiteral( "geometry::STGeomFromText(%1,%2).MakeValid()" ).arg(`
`934`	`934`	`QStringLiteral( "?" ), QString::number( mSRId ) );`
`935`	`935`	`}`
`936`	`936`	`else`