Add MultiPoint datatype support

contrib/babelfishpg_common/sql/geography.sql

@@ -228,6 +228,33 @@ CREATE OR REPLACE FUNCTION sys.Geography__stgeomfromtext(sys.NVARCHAR, integer)
 	END;
 	$$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE;
 
+CREATE OR REPLACE FUNCTION sys.Geography__STMPointFromText(sys.NVARCHAR, srid integer)
+    RETURNS sys.GEOGRAPHY
+    AS $$
+    DECLARE
+        Geomtype text;
+        geog sys.GEOGRAPHY;
+    BEGIN
+        IF $2 IS NULL THEN
+            RAISE EXCEPTION '''geography::STMPointFromText'' failed because parameter 2 is not allowed to be null.';
+        ELSIF $1 IS NULL THEN
+            RETURN NULL;
+        ELSIF $2 < 0 THEN
+            RAISE EXCEPTION 'SRID value must be non-negative.';
+        END IF;
+
+        geog = sys.geogfromtext_helper($1::text, $2);
+        Geomtype = sys.ST_GeometryType(geog::sys.GEOMETRY);
+
+        IF Geomtype = 'ST_MultiPoint' THEN
+            RETURN geog;
+        ELSE
+            RAISE EXCEPTION 'Expected "MULTIPOINT" at Position 1. The input has %s', $1;
+        END IF;
+    END;
+    $$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE;
+
+
 CREATE OR REPLACE FUNCTION sys.STAsText(sys.GEOGRAPHY)
 	RETURNS sys.NVARCHAR
 	AS $$

contrib/babelfishpg_common/sql/geometry.sql

@@ -313,6 +313,32 @@ CREATE OR REPLACE FUNCTION sys.Geometry__STPolyFromText(sys.NVARCHAR,srid intege
 	END;
 	$$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE;
 
+CREATE OR REPLACE FUNCTION sys.Geometry__STMPointFromText(sys.NVARCHAR, srid integer)
+    RETURNS sys.GEOMETRY
+    AS $$
+    DECLARE
+        Geomtype text;
+        geom sys.GEOMETRY;
+    BEGIN
+        IF $2 IS NULL THEN
+            RAISE EXCEPTION '''geometry::STMPointFromText'' failed because parameter 2 is not allowed to be null.';
+        ELSIF $1 IS NULL THEN
+            RETURN NULL;
+        ELSIF $2 < 0 THEN
+            RAISE EXCEPTION 'SRID value must be non-negative.';
+        END IF;
+
+        geom = sys.geomfromtext_helper($1::text, $2);
+        Geomtype = sys.ST_GeometryType(geom);
+
+        IF Geomtype = 'ST_MultiPoint' THEN
+            RETURN geom;
+        ELSE
+            RAISE EXCEPTION 'Expected "MULTIPOINT" at Position 1. The input has %s', $1;
+        END IF;
+    END;
+    $$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE;
+
 CREATE OR REPLACE FUNCTION sys.ST_GeometryType(sys.GEOMETRY)
 	RETURNS text
 	AS '$libdir/postgis-3', 'geometry_geometrytype'

contrib/babelfishpg_common/sql/upgrades/spatial_types--5.5.0--5.6.0.sql

@@ -149,3 +149,61 @@ CREATE OR REPLACE FUNCTION sys.STGeometryType(geog sys.GEOGRAPHY)
 	    RAISE EXCEPTION 'Unexpected geometry type format: %. Expected ST_* prefix.', geom_type;
 	END;
 	$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
+
+--geometry
+--STMPointFromText
+
+CREATE OR REPLACE FUNCTION sys.Geometry__STMPointFromText(sys.NVARCHAR, srid integer)
+    RETURNS sys.GEOMETRY
+    AS $$
+    DECLARE
+        Geomtype text;
+        geom sys.GEOMETRY;
+    BEGIN
+        IF $2 IS NULL THEN
+            RAISE EXCEPTION '''geometry::STMPointFromText'' failed because parameter 2 is not allowed to be null.';
+        ELSIF $1 IS NULL THEN
+            RETURN NULL;
+        ELSIF $2 < 0 THEN
+            RAISE EXCEPTION 'SRID value must be non-negative.';
+        END IF;
+
+        geom = sys.geomfromtext_helper($1::text, $2);
+        Geomtype = sys.ST_GeometryType(geom);
+
+        IF Geomtype = 'ST_MultiPoint' THEN
+            RETURN geom;
+        ELSE
+            RAISE EXCEPTION 'Expected "MULTIPOINT" at Position 1. The input has %s', $1;
+        END IF;
+    END;
+    $$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE;
+
+--Geography 
+--STMPointFromText
+
+CREATE OR REPLACE FUNCTION sys.Geography__STMPointFromText(sys.NVARCHAR, srid integer)
+    RETURNS sys.GEOGRAPHY
+    AS $$
+    DECLARE
+        Geomtype text;
+        geog sys.GEOGRAPHY;
+    BEGIN
+        IF $2 IS NULL THEN
+            RAISE EXCEPTION '''geography::STMPointFromText'' failed because parameter 2 is not allowed to be null.';
+        ELSIF $1 IS NULL THEN
+            RETURN NULL;
+        ELSIF $2 < 0 THEN
+            RAISE EXCEPTION 'SRID value must be non-negative.';
+        END IF;
+
+        geog = sys.geogfromtext_helper($1::text, $2);
+        Geomtype = sys.ST_GeometryType(geog::sys.GEOMETRY);
+
+        IF Geomtype = 'ST_MultiPoint' THEN
+            RETURN geog;
+        ELSE
+            RAISE EXCEPTION 'Expected "MULTIPOINT" at Position 1. The input has %s', $1;
+        END IF;
+    END;
+    $$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE;

contrib/babelfishpg_common/src/geo.c

@@ -667,3 +667,90 @@ rewrite_dim_polygon_query(PointArrayList *pal)
 
     return output.data;
 }
+
+char* 
+rewrite_multipoint_wkt(PointArray *pa) 
+{
+    DimensionType type;
+    StringInfoData output;
+
+    if (!pa) 
+        return NULL;
+
+    if (pa->count == 0)
+    {
+        if (pa->points)
+            pfree(pa->points);
+        pfree(pa);
+        return pstrdup("MULTIPOINT EMPTY");
+    }
+    initStringInfo(&output);
+
+    type = determine_ptarray_type(pa);
+
+    appendStringInfoString(&output, "MULTIPOINT");
+
+    if (type == M) 
+        appendStringInfoString(&output, " M");
+
+    appendStringInfoChar(&output, '(');
+
+    transform_points(pa, type);
+
+    for (int i = 0; i < pa->count; i++) 
+    {
+        POINT p = pa->points[i];
+
+        appendStringInfoChar(&output, '(');
+        format_tsql_point_coordinates(&output, p);  
+        appendStringInfoChar(&output, ')');
+
+        if (i < pa->count - 1) 
+            appendStringInfoString(&output, ", ");
+    }
+
+    appendStringInfoChar(&output, ')');
+
+    pfree(pa->points);
+    pfree(pa);
+
+    return output.data;
+}
+
+
+char* 
+rewrite_dim_multipoint_wkt(PointArray *pa) 
+{
+    StringInfoData output;
+
+    if (!pa || pa->count == 0)
+    {
+        if (pa) {
+            pfree(pa->points);
+            pfree(pa);
+        }
+        return pstrdup("MULTIPOINT EMPTY");
+    }
+
+    initStringInfo(&output);
+    appendStringInfoString(&output, "MULTIPOINT(");
+
+    for (int i = 0; i < pa->count; i++) 
+    {
+        POINT p = pa->points[i];
+
+        appendStringInfoChar(&output, '(');
+        format_postgis_point_coordinates(&output, p);
+        appendStringInfoChar(&output, ')');
+
+        if (i < pa->count - 1) 
+            appendStringInfoString(&output, ", ");
+    }
+
+    appendStringInfoChar(&output, ')');
+
+    pfree(pa->points);
+    pfree(pa);
+
+    return output.data;
+}

contrib/babelfishpg_common/src/geo_data.h

@@ -79,5 +79,9 @@ char* rewrite_polygon_query(PointArrayList *pal);
 char* rewrite_dim_polygon_query(PointArrayList *pal);
 DimensionType determine_ring_type(PointArrayList *pal);
 
+char* rewrite_multipoint_wkt(PointArray *pa);
+char* rewrite_dim_multipoint_wkt(PointArray *pa);
+
+
 #endif /* GEO_DATA_H */
 

contrib/babelfishpg_common/src/geo_parser.y

@@ -27,6 +27,8 @@ static int      scanbuflen;
 %type <pointarray> ptarray ptarraym ptarrayzm ptarrayz
 %type <pointarraylist> ringlist ringlistm ringlistz ringlistzm
 %type <str> geospatial_query point_query linestring_query polygon_query 
+%type <str> multipoint_query
+%type <pointarray> mpoint_list mpoint_list_z mpoint_list_m mpoint_list_zm
 
 %start geospatial_query
 %define api.prefix {geo_yy}
@@ -39,6 +41,7 @@ geospatial_query:
     linestring_query { $$ = $1; *result = $$;  }
     | point_query { $$ = $1; *result = $$;  }
     | polygon_query { $$ = $1; *result = $$;  }
+    | multipoint_query { $$ = $1; *result = $$;  }
     ;
 
 point_query:
@@ -230,6 +233,98 @@ coordinate:
         { $$ = create_point($1, $2, 0, $4, 0, 1); }
     ;
 
+multipoint_query:
+    MPOINT_TOK LPAREN mpoint_list RPAREN
+        { $$ = rewrite_multipoint_wkt($3); }
+    | MPOINT_TOK LPAREN ptarray RPAREN
+        { $$ = rewrite_multipoint_wkt($3); }      
+    | MPOINT_TOK EMPTY_TOK
+        { $$ = pstrdup("MULTIPOINT EMPTY"); }
+    | MPOINT_TOK Z_TOK LPAREN mpoint_list_z RPAREN
+        { $$ = rewrite_dim_multipoint_wkt($4); }  
+    | MPOINT_TOK M_TOK LPAREN mpoint_list_m RPAREN
+        { $$ = rewrite_dim_multipoint_wkt($4); }  
+    | MPOINT_TOK ZM_TOK LPAREN mpoint_list_zm RPAREN
+        { $$ = rewrite_dim_multipoint_wkt($4); } 
+    | MPOINT_TOK Z_TOK LPAREN ptarrayz RPAREN
+        { $$ = rewrite_dim_multipoint_wkt($4); }
+    | MPOINT_TOK M_TOK LPAREN ptarraym RPAREN
+        { $$ = rewrite_dim_multipoint_wkt($4); }
+    | MPOINT_TOK ZM_TOK LPAREN ptarrayzm RPAREN
+        { $$ = rewrite_dim_multipoint_wkt($4); } 
+    | MPOINT_TOK Z_TOK EMPTY_TOK
+        { $$ = pstrdup("MULTIPOINT EMPTY"); }
+    | MPOINT_TOK M_TOK EMPTY_TOK
+        { $$ = pstrdup("MULTIPOINT EMPTY"); }
+    | MPOINT_TOK ZM_TOK EMPTY_TOK
+        { $$ = pstrdup("MULTIPOINT EMPTY"); }
+    ;
+
+
+/* 2D MULTIPOINT: MULTIPOINT((x y), (x y), ...) */
+mpoint_list:
+    LPAREN coordinate RPAREN
+        {
+            PointArray *pa = palloc(sizeof(PointArray));
+            init_point_array(pa);
+            add_point(pa, $2);
+            $$ = pa;
+        }
+    | mpoint_list COMMA_TOK LPAREN coordinate RPAREN
+        {
+            add_point($1, $4);
+            $$ = $1;
+        }
+    ;
+
+/* Z MULTIPOINT: MULTIPOINT Z((x y z), (x y z), ...) */
+mpoint_list_z:
+    LPAREN coordz RPAREN
+        {
+            PointArray *pa = palloc(sizeof(PointArray));
+            init_point_array(pa);
+            add_point(pa, $2);
+            $$ = pa;
+        }
+    | mpoint_list_z COMMA_TOK LPAREN coordz RPAREN
+        {
+            add_point($1, $4);
+            $$ = $1;
+        }
+    ;
+
+/* M MULTIPOINT: MULTIPOINT M((x y m), (x y m), ...) */
+mpoint_list_m:
+    LPAREN coordm RPAREN
+        {
+            PointArray *pa = palloc(sizeof(PointArray));
+            init_point_array(pa);
+            add_point(pa, $2);
+            $$ = pa;
+        }
+    | mpoint_list_m COMMA_TOK LPAREN coordm RPAREN
+        {
+            add_point($1, $4);
+            $$ = $1;
+        }
+    ;
+
+/* ZM MULTIPOINT: MULTIPOINT ZM((x y z m), (x y z m), ...) */
+mpoint_list_zm:
+    LPAREN coordzm RPAREN
+        {
+            PointArray *pa = palloc(sizeof(PointArray));
+            init_point_array(pa);
+            add_point(pa, $2);
+            $$ = pa;
+        }
+    | mpoint_list_zm COMMA_TOK LPAREN coordzm RPAREN
+        {
+            add_point($1, $4);
+            $$ = $1;
+        }
+    ;
+
 %%
 
 /* Include lexer after parser to avoid circular dependencies and ensure shared context */

contrib/babelfishpg_common/src/geo_scan.l

@@ -23,7 +23,7 @@ POINT                 { return POINT_TOK; }
 LINESTRING            { return LINESTRING_TOK; }
 POLYGON               { return POLYGON_TOK; }
 CIRCULARSTRING        { yyerror(NULL, "CIRCULARSTRING is not supported"); return CIRCULARSTRING_TOK; }
-MULTIPOINT            { yyerror(NULL, "MULTIPOINT is not supported");  return MPOINT_TOK; }
+MULTIPOINT            { return MPOINT_TOK; }
 MULTILINESTRING       { yyerror(NULL, "MULTILINESTRING is not supported"); return MLINESTRING_TOK; }
 MULTIPOLYGON          { yyerror(NULL, "MULTIPOLYGON is not supported");  return MPOLYGON_TOK; }
 CURVEPOLYGON          { yyerror(NULL, "CURVEPOLYGON is not supported");  return CURVEPOLYGON_TOK; }