Skip to content

Commit 0f31eda

Browse files
authored
Remove MakeValid() calls as these disable spatial indexes (#5856)
1 parent bbbfd82 commit 0f31eda

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

mapmssql2008.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,7 +1181,7 @@ int msMSSQL2008LayerGetExtent(layerObj *layer, rectObj *extent)
11811181
query = msStringConcatenate(query, "WITH extent(extentcol) AS (SELECT geometry::EnvelopeAggregate(");
11821182
query = msStringConcatenate(query, layerinfo->geom_column);
11831183
}
1184-
query = msStringConcatenate(query, ".MakeValid()) AS extentcol FROM ");
1184+
query = msStringConcatenate(query, ") AS extentcol FROM ");
11851185
query = msStringConcatenate(query, layerinfo->geom_table);
11861186
query = msStringConcatenate(query, ") SELECT extentcol.STPointN(1).STX, extentcol.STPointN(1).STY, extentcol.STPointN(3).STX, extentcol.STPointN(3).STY FROM extent");
11871187
}
@@ -1197,7 +1197,7 @@ int msMSSQL2008LayerGetExtent(layerObj *layer, rectObj *extent)
11971197
query = msStringConcatenate(query, "WITH ENVELOPE as (SELECT ");
11981198
query = msStringConcatenate(query, layerinfo->geom_column);
11991199
}
1200-
query = msStringConcatenate(query, ".MakeValid().STEnvelope() as envelope from ");
1200+
query = msStringConcatenate(query, ".STEnvelope() as envelope from ");
12011201
query = msStringConcatenate(query, layerinfo->geom_table);
12021202
query = msStringConcatenate(query, "), CORNERS as (SELECT envelope.STPointN(1) as point from ENVELOPE UNION ALL select envelope.STPointN(3) from ENVELOPE) SELECT MIN(point.STX), MIN(point.STY), MAX(point.STX), MAX(point.STY) FROM CORNERS");
12031203
}
@@ -1502,7 +1502,7 @@ static int prepare_database(layerObj *layer, rectObj rect, char **query_string)
15021502
query = msStringConcatenate(query, " AND ");
15031503

15041504
query = msStringConcatenate(query, layerinfo->geom_column);
1505-
query = msStringConcatenate(query, ".MakeValid().STIntersects(");
1505+
query = msStringConcatenate(query, ".STIntersects(");
15061506
query = msStringConcatenate(query, box3d);
15071507
query = msStringConcatenate(query, ") = 1 ");
15081508

0 commit comments

Comments
 (0)