Supported PostGIS Function: STNumPoints for Geospatial datatypes (#4510)

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

BABEL-6329

---------

Co-authored-by: Gopal Verma <gopalgv@amazon.com>

Author: Gopalverma062

contrib/babelfishpg_common/sql/geography.sql

@@ -433,6 +433,19 @@ CREATE OR REPLACE FUNCTION sys.STDimension(geom sys.GEOGRAPHY)
 	END;
 	$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
 
+--STNumPoints
+CREATE OR REPLACE FUNCTION sys.STNumPoints(geog sys.GEOGRAPHY)
+	RETURNS integer
+	AS $$
+	BEGIN
+		IF sys.STIsValid(geog) = 0 THEN
+			RAISE EXCEPTION 'The geography instance is not valid';
+		ELSE
+			RETURN sys.STNumPoints_helper(geog);
+		END IF;
+	END;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
+
 --Parse
 CREATE OR REPLACE FUNCTION sys.Geography__Parse(geography_tagged_text sys.NVARCHAR)
     RETURNS sys.GEOGRAPHY
@@ -665,6 +678,11 @@ CREATE OR REPLACE FUNCTION sys.STDimension_helper(sys.GEOGRAPHY)
         AS '$libdir/postgis-3','LWGEOM_dimension'
         LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE;
 
+CREATE OR REPLACE FUNCTION sys.STNumPoints_helper(sys.GEOGRAPHY)
+    RETURNS integer
+    AS '$libdir/postgis-3', 'LWGEOM_npoints'
+    LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE;
+
 CREATE OR REPLACE FUNCTION sys.STIntersects_helper(geom1 sys.GEOGRAPHY, geom2 sys.GEOGRAPHY)
         RETURNS sys.BIT
         AS '$libdir/postgis-3','ST_Intersects'

contrib/babelfishpg_common/sql/geometry.sql

@@ -462,6 +462,19 @@ CREATE OR REPLACE FUNCTION sys.Geometry__Parse(geometry_tagged_text sys.NVARCHAR
     END;
     $$ LANGUAGE plpgsql STRICT IMMUTABLE PARALLEL SAFE;
 
+--STNumPoints
+CREATE OR REPLACE FUNCTION sys.STNumPoints(geom sys.GEOMETRY)
+    RETURNS integer
+    AS $$
+    BEGIN
+        IF STIsValid(geom) = 0 THEN
+            RAISE EXCEPTION 'The geometry instance is not valid';
+        ELSE
+            RETURN sys.STNumPoints_helper(geom);
+        END IF;
+    END;
+    $$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
+	
 -- STDisjoint
 -- Checks if two geometries have no points in common
 CREATE OR REPLACE FUNCTION sys.STDisjoint(geom1 sys.GEOMETRY, geom2 sys.GEOMETRY)
@@ -656,6 +669,11 @@ CREATE OR REPLACE FUNCTION sys.STDimension_helper(sys.GEOMETRY)
         RETURNS integer
         AS '$libdir/postgis-3','LWGEOM_dimension'
         LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE;
+		
+CREATE OR REPLACE FUNCTION sys.STNumPoints_helper(sys.GEOMETRY)
+    RETURNS integer
+    AS '$libdir/postgis-3','LWGEOM_npoints'
+    LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE;
 
 CREATE OR REPLACE FUNCTION sys.STIntersects_helper(geom1 sys.GEOMETRY, geom2 sys.GEOMETRY)
         RETURNS sys.BIT

contrib/babelfishpg_common/sql/upgrades/spatial_types--6.0.0--6.1.0.sql

@@ -1,6 +1,45 @@
 -------------------------------------------------------
 ---- Include changes related to spatial types here ----
 -------------------------------------------------------
+
+--STNumPoints
+-- geometry
+
+CREATE OR REPLACE FUNCTION sys.STNumPoints(geom sys.GEOMETRY)
+    RETURNS integer
+    AS $$
+    BEGIN
+        IF STIsValid(geom) = 0 THEN
+            RAISE EXCEPTION 'The geometry instance is not valid';
+        ELSE
+            RETURN sys.STNumPoints_helper(geom);
+        END IF;
+    END;
+    $$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE OR REPLACE FUNCTION sys.STNumPoints_helper(sys.GEOMETRY)
+    RETURNS integer
+    AS '$libdir/postgis-3','LWGEOM_npoints'
+    LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE;
+
+-- Geography
+
+CREATE OR REPLACE FUNCTION sys.STNumPoints(geog sys.GEOGRAPHY)
+	RETURNS integer
+	AS $$
+	BEGIN
+		IF sys.STIsValid(geog) = 0 THEN
+			RAISE EXCEPTION 'The geography instance is not valid';
+		ELSE
+			RETURN sys.STNumPoints_helper(geog);
+		END IF;
+	END;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE OR REPLACE FUNCTION sys.STNumPoints_helper(sys.GEOGRAPHY)
+    RETURNS integer
+    AS '$libdir/postgis-3', 'LWGEOM_npoints'
+    LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE;
 --parse
 --Geometry 
 CREATE OR REPLACE FUNCTION sys.Geometry__Parse(geometry_tagged_text sys.NVARCHAR)

contrib/babelfishpg_tsql/antlr/TSqlLexer.g4

@@ -986,6 +986,7 @@ STISCLOSED:                                      'STIsClosed';
 STISEMPTY:                                       'STIsEmpty';
 STISVALID:                                       'STIsValid';
 STLINEFROMTEXT:                                  'STLineFromText';
+STNUMPOINTS:                                     'STNumPoints';
 STOP:                                            S T O P;
 STOPAT:                                          S T O P A T;
 STOPATMARK:                                      S T O P A T M A R K;

contrib/babelfishpg_tsql/antlr/TSqlParser.g4

@@ -3946,6 +3946,7 @@ geospatial_func_no_arg
     | STISCLOSED
     | STISEMPTY
     | STISVALID
+    | STNUMPOINTS
     ;
 
 geospatial_func_arg
@@ -5088,6 +5089,7 @@ keyword
     | STISEMPTY
     | STISVALID
     | STLINEFROMTEXT
+    | STNUMPOINTS
     | STOP
     | STOPAT
     | STOPATMARK

test/JDBC/expected/Numeric_Decimal_tests.out

@@ -4884,34 +4884,38 @@ GO
 -- GEOMETRY -> NUMERIC
 SELECT CAST(GEOMETRY::STGeomFromText('LINESTRING(0 0, 1 1, 2 2)', 0).STNumPoints() AS NUMERIC(10,0));
 GO
-~~ERROR (Code: 33557097)~~
-
-~~ERROR (Message: syntax error at or near ".")~~
+~~START~~
+numeric
+3
+~~END~~
 
 
 -- GEOMETRY -> DECIMAL
 SELECT CAST(GEOMETRY::STGeomFromText('LINESTRING(0 0, 1 1, 2 2)', 0).STNumPoints() AS DECIMAL(10,0));
 GO
-~~ERROR (Code: 33557097)~~
-
-~~ERROR (Message: syntax error at or near ".")~~
+~~START~~
+numeric
+3
+~~END~~
 
 
 -- GEOGRAPHY -> NUMERIC/DECIMAL (using STNumPoints() method)
 -- GEOGRAPHY -> NUMERIC
 SELECT CAST(GEOGRAPHY::STGeomFromText('LINESTRING(-122.34 47.65, -122.35 47.66)', 4326).STNumPoints() AS NUMERIC(10,0));
 GO
-~~ERROR (Code: 33557097)~~
-
-~~ERROR (Message: syntax error at or near ".")~~
+~~START~~
+numeric
+2
+~~END~~
 
 
 -- GEOGRAPHY -> DECIMAL
 SELECT CAST(GEOGRAPHY::STGeomFromText('LINESTRING(-122.34 47.65, -122.35 47.66)', 4326).STNumPoints() AS DECIMAL(10,0));
 GO
-~~ERROR (Code: 33557097)~~
-
-~~ERROR (Message: syntax error at or near ".")~~
+~~START~~
+numeric
+2
+~~END~~
 
 
 -- ROWVERSION/TIMESTAMP -> NUMERIC/DECIMAL
@@ -5807,33 +5811,37 @@ GO
 -- GEOMETRY -> NUMERIC using CONVERT
 SELECT CONVERT(NUMERIC(10,0), GEOMETRY::STGeomFromText('LINESTRING(0 0, 1 1, 2 2)', 0).STNumPoints());
 GO
-~~ERROR (Code: 33557097)~~
-
-~~ERROR (Message: syntax error at or near ".")~~
+~~START~~
+numeric
+3
+~~END~~
 
 
 -- GEOMETRY -> DECIMAL using CONVERT
 SELECT CONVERT(DECIMAL(10,0), GEOMETRY::STGeomFromText('LINESTRING(0 0, 1 1, 2 2)', 0).STNumPoints());
 GO
-~~ERROR (Code: 33557097)~~
-
-~~ERROR (Message: syntax error at or near ".")~~
+~~START~~
+numeric
+3
+~~END~~
 
 
 -- GEOGRAPHY -> NUMERIC using CONVERT
 SELECT CONVERT(NUMERIC(10,0), GEOGRAPHY::STGeomFromText('LINESTRING(-122.34 47.65, -122.35 47.66)', 4326).STNumPoints());
 GO
-~~ERROR (Code: 33557097)~~
-
-~~ERROR (Message: syntax error at or near ".")~~
+~~START~~
+numeric
+2
+~~END~~
 
 
 -- GEOGRAPHY -> DECIMAL using CONVERT
 SELECT CONVERT(DECIMAL(10,0), GEOGRAPHY::STGeomFromText('LINESTRING(-122.34 47.65, -122.35 47.66)', 4326).STNumPoints());
 GO
-~~ERROR (Code: 33557097)~~
-
-~~ERROR (Message: syntax error at or near ".")~~
+~~START~~
+numeric
+2
+~~END~~
 
 
 -- ROWVERSION/TIMESTAMP -> NUMERIC/DECIMAL using CONVERT

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

@@ -1,3 +1,21 @@
+USE TestSTNumPoints_DB;
+
+DROP VIEW STNumPoints_geog_view_db;
+DROP VIEW STNumPoints_geom_view_db;
+
+DROP TABLE STNumPoints_geog_test_db;
+DROP TABLE STNumPoints_geom_test_db;
+
+USE MASTER;
+
+DROP VIEW STNumPoints_geog_view;
+DROP VIEW STNumPoints_geom_view;
+
+DROP TABLE STNumPoints_geog_test;
+DROP TABLE STNumPoints_geom_test;
+
+DROP DATABASE TestSTNumPoints_DB;
+
 USE TestGeospatialParse_DB 
 
 DROP TABLE TestGeospatialParse_GeometryTable3