MakeValid implementation for geometry and geography by Gopalverma062 · Pull Request #4513 · babelfish-for-postgresql/babelfish_extensions

Gopalverma062 · 2026-02-02T12:38:26Z

Implement MakeValid GeoSpatial TSQL Function

Implemented the MakeValid GeoSpatial TSQL function that was previously unsupported in Babelfish.

What's Changed

Function Implementation

Added sys.MakeValid(geom sys.GEOMETRY) function in geometry.sql
Added sys.MakeValid(geog sys.GEOGRAPHY) function in geography.sql
Delegates to respective helper functions for processing invalid geometries
Functions are marked as IMMUTABLE STRICT PARALLEL SAFE for optimal performance

Error Handling

Returns NULL for NULL input instances (handled by STRICT)
Returns original geometry/geography for empty instances
Returns original geometry/geography for already valid instances
Applies correction logic for invalid instances

Examples

Point (Already Valid)

DECLARE @point geometry;
SET @point = geometry::STGeomFromText('POINT(10 20)', 0);
SELECT @point.MakeValid().STAsText() AS result, @point.MakeValid().STIsValid() AS is_valid;
-- Output: POINT (10 20), 1

Invalid Self-Intersecting Polygon

DECLARE @polygon geometry;
SET @polygon = geometry::STGeomFromText('POLYGON((0 0, 10 10, 10 0, 0 10, 0 0))', 0);
SELECT @polygon.STIsValid() AS before_valid, @polygon.MakeValid().STIsValid() AS after_valid;
-- Output: 0, 1

Geography Instance

DECLARE @geog geography;
SET @geog = geography::STGeomFromText('POINT(-122.349 47.651)', 4326);
SELECT @geog.MakeValid().STAsText() AS result, @geog.MakeValid().STIsValid() AS is_valid;
-- Output: POINT (-122.349 47.651), 1

Empty Instance

DECLARE @empty geometry;
SET @empty = geometry::STGeomFromText('POINT EMPTY', 0);
SELECT @empty.MakeValid().STAsText() AS result;
-- Output: POINT EMPTY

Issues Resolved

Task: BABEL-6331

Test Coverage

Use case based
Boundary conditions
Arbitrary inputs
Negative test cases

Checklist

Commits are signed per the DCO using --signoff
Contribution is under Apache 2.0 and PostgreSQL licenses

Signed-off-by: Gopal Verma [email protected]

Authored-by: Gopal Verma [email protected]

By submitting this pull request, I confirm that my contribution is under the terms of the Apache 2.0 and PostgreSQL licenses, and grant any person obtaining a copy of the contribution permission to relicense all or a portion of my contribution to the PostgreSQL License solely to contribute all or a portion of my contribution to the PostgreSQL open source project.

coveralls · 2026-02-02T13:06:38Z

Pull Request Test Coverage Report for Build 22111839764

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

For more information on this, see Tracking coverage changes with pull request builds.
To avoid this issue with future PRs, see these Recommended CI Configurations.
For a quick fix, rebase this PR at GitHub. Your next report should be accurate.

Details

0 of 0 changed or added relevant lines in 0 files are covered.
1081 unchanged lines in 9 files lost coverage.
Overall coverage increased (+0.01%) to 77.001%

Files with Coverage Reduction	New Missed Lines	%
contrib/babelfishpg_tsql/src/hooks.c	1	85.82%
contrib/babelfishpg_tds/src/backend/tds/tdsresponse.c	2	80.9%
contrib/babelfishpg_tsql/src/session.c	4	96.62%
contrib/babelfishpg_tds/src/backend/tds/tdslogin.c	31	77.42%
contrib/babelfishpg_tsql/src/collation.c	32	80.88%
contrib/babelfishpg_tds/src/include/tds_request.h	36	76.22%
contrib/babelfishpg_tds/src/backend/tds/tdstypeio.c	103	87.44%
contrib/babelfishpg_tsql/src/pl_handler.c	215	90.82%
contrib/babelfishpg_tsql/src/pl_exec.c	657	44.52%

Totals
Change from base Build 21506975134:	0.01%
Covered Lines:	52726
Relevant Lines:	68474

💛 - Coveralls

…t files - Update upgrade schedules to include new test

Mohitraj-g · 2026-02-11T12:17:03Z

test/JDBC/expected/Test-spatial-functions-3-vu-prepare.out

+INSERT INTO TestSpatialFunc3_MakeValidGeomTemp (ID, GeomColumn, Description) VALUES (2, geometry::STGeomFromText('POINT(30 40)', 4326), 'Valid Point with SRID');
+~~ROW COUNT: 1~~
+
+INSERT INTO TestSpatialFunc3_MakeValidGeomTemp (ID, GeomColumn, Description) VALUES (3, geometry::STGeomFromText('LINESTRING(0 0, 10 10, 20 20)', 0), 'Valid LineString');


We need to add more tests for invalid linestring and invalid polygon with MakeValid function. Most cases cover only valid instances.

i have added

Mohitraj-g · 2026-02-11T12:18:04Z

test/JDBC/input/datatypes/Test-spatial-functions-2-vu-cleanup.txt

 DROP TABLE TestGeospatialMethods_SPATIALPOINTGEOG_dttemp 

-DROP DATABASE TestGeospatialMethods_DB 
+DROP DATABASE TestGeospatialMethods_DB 


Please remove this, unnecessary change.

Mohitraj-g · 2026-02-11T12:18:48Z

test/JDBC/input/datatypes/Test-spatial-functions-2-vu-prepare.txt

 CREATE VIEW TestGeospatialMethods_empty_ValFromGeomTemp AS SELECT location.STIsEmpty() FROM TestGeospatialMethods_SPATIALPOINTGEOM_dttemp ORDER BY location.STX;

-CREATE VIEW TestGeospatialMethods_empty_TextFromGeomTemp AS SELECT  location.STIsEmpty() AS Dimension FROM TestGeospatialMethods_SPATIALPOINTGEOG_dttemp ORDER BY location.Lat;
+CREATE VIEW TestGeospatialMethods_empty_TextFromGeomTemp AS SELECT  location.STIsEmpty() AS Dimension FROM TestGeospatialMethods_SPATIALPOINTGEOG_dttemp ORDER BY location.Lat;


same as above, we don't need to change any Test-spatial-functions-2 file

ahmed-shameem · 2026-02-16T16:01:48Z

contrib/babelfishpg_tsql/antlr/TSqlLexer.g4

 M_DOUBLE_QUOTE:                                  ["] M ["] {pltsql_quoted_identifier == true}?;
 M_SQBRACKET:                                     '[' M ']';
 MANUAL:                                          M A N U A L;
+MAKEVALID:                                       'MakeValid';    


Why aren't we using M A K E V A L I D?

Fixed ,Updated to M A K E V A L I D for case-insensitive matching

ahmed-shameem · 2026-02-16T16:02:36Z

test/JDBC/input/datatypes/Test-spatial-functions-3-vu-prepare.txt

@@ -0,0 +1,65 @@
+CREATE DATABASE TestSpatialFunc3_DB;


What's the point of creating TestSpatialFunc3_DB db? All the objects are created inside master db

Fixed I've now created the test tables inside TestSpatialFunc3_DB and added the corresponding tests in the verify file.

ahmed-shameem · 2026-02-16T16:02:53Z

test/JDBC/input/datatypes/Test-spatial-functions-3-vu-verify.sql

@@ -0,0 +1,334 @@
+--MakeValid


Please add comments stating what are testing?

Done Added comments explaining what each test case is validating.

…stgresql#4513) Implemented the MakeValid GeoSpatial TSQL function that was previously unsupported in Babelfish. Added sys.MakeValid(geom sys.GEOMETRY) function in geometry.sql Added sys.MakeValid(geog sys.GEOGRAPHY) function in geography.sql Delegates to respective helper functions for processing invalid geometries. Functions are marked as IMMUTABLE STRICT PARALLEL SAFE for optimal performance. Task: BABEL-6310 Signed-off-by: Gopal Verma <[email protected]>

Implemented the MakeValid GeoSpatial TSQL function that was previously unsupported in Babelfish. Added sys.MakeValid(geom sys.GEOMETRY) function in geometry.sql Added sys.MakeValid(geog sys.GEOGRAPHY) function in geography.sql Delegates to respective helper functions for processing invalid geometries. Functions are marked as IMMUTABLE STRICT PARALLEL SAFE for optimal performance. Task: BABEL-6310 Signed-off-by: Gopal Verma <[email protected]>

Gopal Verma added 2 commits January 31, 2026 19:56

MakeValid implementation for geometry and geography

f22c1c2

FIX MakeValid function implementation and update test expectations

3a0e5f9

Gopal Verma added 4 commits February 3, 2026 10:33

fix in testcases

2d45ff3

fix in expected dependency file

c2d7be1

makevalid_final

86febfa

- Remove deprecated Test-spatial-functions-2-before-17_9-or-16_13 tes…

1b78895

…t files - Update upgrade schedules to include new test

rishabhtanwar29 previously approved these changes Feb 11, 2026

View reviewed changes

Mohitraj-g reviewed Feb 11, 2026

View reviewed changes

adding more testcases

cc09837

Gopalverma062 dismissed rishabhtanwar29’s stale review via cc09837 February 11, 2026 19:37

fixing some

5f9a444

ahmed-shameem suggested changes Feb 16, 2026

View reviewed changes

adding comment on testcases

3937d13

rishabhtanwar29 previously approved these changes Feb 18, 2026

View reviewed changes

Gopal Verma added 2 commits March 4, 2026 09:01

Merge upstream/BABEL_5_X_DEV

cbc75c3

fixing testcases

c3128cd

Gopalverma062 dismissed rishabhtanwar29’s stale review via c3128cd March 5, 2026 10:26

rishabhtanwar29 approved these changes Mar 5, 2026

View reviewed changes

empty commit

327e68d

Mohitraj-g approved these changes Mar 6, 2026

View reviewed changes

ahmed-shameem approved these changes Mar 9, 2026

View reviewed changes

shardgupta merged commit 1ff559d into babelfish-for-postgresql:BABEL_5_X_DEV Mar 9, 2026
47 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MakeValid implementation for geometry and geography#4513

MakeValid implementation for geometry and geography#4513
shardgupta merged 12 commits intobabelfish-for-postgresql:BABEL_5_X_DEVfrom
Gopalverma062:BABEL_6310_MAKEVALID

Gopalverma062 commented Feb 2, 2026 •

edited

Loading

Uh oh!

coveralls commented Feb 2, 2026 •

edited

Loading

Uh oh!

Mohitraj-g Feb 11, 2026

Uh oh!

Gopalverma062 Feb 16, 2026

Uh oh!

Mohitraj-g Feb 11, 2026

Uh oh!

Mohitraj-g Feb 11, 2026

Uh oh!

ahmed-shameem Feb 16, 2026

Uh oh!

Gopalverma062 Feb 18, 2026

Uh oh!

ahmed-shameem Feb 16, 2026

Uh oh!

Gopalverma062 Feb 18, 2026

Uh oh!

ahmed-shameem Feb 16, 2026

Uh oh!

Gopalverma062 Feb 18, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

Gopalverma062 commented Feb 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Implement MakeValid GeoSpatial TSQL Function

What's Changed

Function Implementation

Error Handling

Examples

Point (Already Valid)

Invalid Self-Intersecting Polygon

Geography Instance

Empty Instance

Issues Resolved

Test Coverage

Checklist

Uh oh!

coveralls commented Feb 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Test Coverage Report for Build 22111839764

Warning: This coverage report may be inaccurate.

Details

💛 - Coveralls

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Gopalverma062 commented Feb 2, 2026 •

edited

Loading

coveralls commented Feb 2, 2026 •

edited

Loading