Fix hard-coded spatial column name in GetExtents

terribletim · terribletim · commit 6fc3a420620d · 2018-11-23T07:37:40.000+07:00
diff --git a/SharpMap/Data/Providers/SqlServer2008.cs b/SharpMap/Data/Providers/SqlServer2008.cs
@@ -766,7 +766,7 @@ public override Envelope GetExtents()
                         {
                             sql += String.IsNullOrEmpty(DefinitionQuery) ? " WHERE " : " AND ";
                             // MUST explicitly exlude NULLS for EnvelopeAggregate
-                            sql += "GEOM IS NOT NULL";
+                            sql += $"{GeometryColumn} IS NOT NULL";
                         }
 
                         if (_logger.IsDebugEnabled) _logger.DebugFormat("GetExtents {0} {1}", ExtentsMode, sql);
@@ -805,7 +805,7 @@ public override Envelope GetExtents()
                         {
                             sql += String.IsNullOrEmpty(DefinitionQuery) ? " WHERE " : " AND ";
                             // MUST explicitly exlude NULLS / Invalids PRIOR to EnvelopeAggregate
-                            sql += "GEOM IS NOT NULL AND GEOM.STIsValid()=1";
+                            sql += $"{GeometryColumn} IS NOT NULL AND {GeometryColumn}.STIsValid()=1";
                         }
 
                         if (_logger.IsDebugEnabled) _logger.DebugFormat("GetExtents {0} {1}", ExtentsMode, sql);

Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,7 @@ public override Envelope GetExtents()`
`766`	`766`	`{`
`767`	`767`	`sql += String.IsNullOrEmpty(DefinitionQuery) ? " WHERE " : " AND ";`
`768`	`768`	`// MUST explicitly exlude NULLS for EnvelopeAggregate`
`769`		`- sql += "GEOM IS NOT NULL";`
	`769`	`+ sql += $"{GeometryColumn} IS NOT NULL";`
`770`	`770`	`}`
`771`	`771`
`772`	`772`	`if (_logger.IsDebugEnabled) _logger.DebugFormat("GetExtents {0} {1}", ExtentsMode, sql);`
`@@ -805,7 +805,7 @@ public override Envelope GetExtents()`
`805`	`805`	`{`
`806`	`806`	`sql += String.IsNullOrEmpty(DefinitionQuery) ? " WHERE " : " AND ";`
`807`	`807`	`// MUST explicitly exlude NULLS / Invalids PRIOR to EnvelopeAggregate`
`808`		`- sql += "GEOM IS NOT NULL AND GEOM.STIsValid()=1";`
	`808`	`+ sql += $"{GeometryColumn} IS NOT NULL AND {GeometryColumn}.STIsValid()=1";`
`809`	`809`	`}`
`810`	`810`
`811`	`811`	`if (_logger.IsDebugEnabled) _logger.DebugFormat("GetExtents {0} {1}", ExtentsMode, sql);`