Skip to content

Commit

Permalink
Modified error messages for Invalid Geospatial SRID's.
Browse files Browse the repository at this point in the history 
Signed-off-by: Anikait Agrawal <[email protected]>
  • Loading branch information
Anikait Agrawal committed Nov 23, 2023
1 parent 0b4d629 commit 0065ef3
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions contrib/babelfishpg_common/sql/geography.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ CREATE OR REPLACE FUNCTION sys.Geography__stgeomfromtext(text, integer)
ELSEIF lat < -90.0 OR lat > 90.0 THEN
RAISE EXCEPTION 'Latitude values must be between -90 and 90 degrees';
ELSE
RAISE EXCEPTION 'Inavalid SRID';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid.';
END IF;
ELSE
RAISE EXCEPTION '% is not supported', Geomtype;
Expand Down Expand Up @@ -358,7 +358,7 @@ CREATE OR REPLACE FUNCTION sys.Geography__Point(float8, float8, srid integer)
ELSEIF lat < -90.0 OR lat > 90.0 THEN
RAISE EXCEPTION 'Latitude values must be between -90 and 90 degrees';
ELSE
RAISE EXCEPTION 'Inavalid SRID';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid.';
END IF;
END;
$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
Expand Down Expand Up @@ -402,7 +402,7 @@ CREATE OR REPLACE FUNCTION sys.Geography__STPointFromText(text, integer)
ELSEIF lat < -90.0 OR lat > 90.0 THEN
RAISE EXCEPTION 'Latitude values must be between -90 and 90 degrees';
ELSE
RAISE EXCEPTION 'Inavalid SRID';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid.';
END IF;
ELSE
RAISE EXCEPTION '% is not supported', Geomtype;
Expand Down
6 changes: 3 additions & 3 deletions contrib/babelfishpg_common/sql/geometry.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ CREATE OR REPLACE FUNCTION sys.Geometry__stgeomfromtext(text, integer)
RAISE EXCEPTION '% is not supported', Geomtype;
END IF;
ELSE
RAISE EXCEPTION 'SRID value should be between 0 and 999999';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid. SRIDs must be between 0 and 999999.';
END IF;
END;
$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
Expand Down Expand Up @@ -261,7 +261,7 @@ CREATE OR REPLACE FUNCTION sys.Geometry__Point(float8, float8, srid integer)
-- Call the underlying function after preprocessing
RETURN (SELECT sys.GeomPoint_helper($1, $2, $3));
ELSE
RAISE EXCEPTION 'SRID value should be between 0 and 999999';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid. SRIDs must be between 0 and 999999.';
END IF;
END;
$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
Expand Down Expand Up @@ -294,7 +294,7 @@ CREATE OR REPLACE FUNCTION sys.Geometry__STPointFromText(text, integer)
RAISE EXCEPTION '% is not supported', Geomtype;
END IF;
ELSE
RAISE EXCEPTION 'SRID value should be between 0 and 999999';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid. SRIDs must be between 0 and 999999.';
END IF;
END;
$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
Expand Down
12 changes: 6 additions & 6 deletions contrib/babelfishpg_common/sql/upgrades/spatial_types--3.2.0--3.3.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ CREATE OR REPLACE FUNCTION sys.Geometry__stgeomfromtext(text, integer)
RAISE EXCEPTION '% is not supported', Geomtype;
END IF;
ELSE
RAISE EXCEPTION 'SRID value should be between 0 and 999999';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid. SRIDs must be between 0 and 999999.';
END IF;
END;
$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
Expand Down Expand Up @@ -265,7 +265,7 @@ CREATE OR REPLACE FUNCTION sys.Geometry__Point(float8, float8, srid integer)
-- Call the underlying function after preprocessing
RETURN (SELECT sys.GeomPoint_helper($1, $2, $3));
ELSE
RAISE EXCEPTION 'SRID value should be between 0 and 999999';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid. SRIDs must be between 0 and 999999.';
END IF;
END;
$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
Expand Down Expand Up @@ -298,7 +298,7 @@ CREATE OR REPLACE FUNCTION sys.Geometry__STPointFromText(text, integer)
RAISE EXCEPTION '% is not supported', Geomtype;
END IF;
ELSE
RAISE EXCEPTION 'SRID value should be between 0 and 999999';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid. SRIDs must be between 0 and 999999.';
END IF;
END;
$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
Expand Down Expand Up @@ -710,7 +710,7 @@ CREATE OR REPLACE FUNCTION sys.Geography__stgeomfromtext(text, integer)
ELSEIF lat < -90.0 OR lat > 90.0 THEN
RAISE EXCEPTION 'Latitude values must be between -90 and 90 degrees';
ELSE
RAISE EXCEPTION 'Inavalid SRID';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid.';
END IF;
ELSE
RAISE EXCEPTION '% is not supported', Geomtype;
Expand Down Expand Up @@ -751,7 +751,7 @@ CREATE OR REPLACE FUNCTION sys.Geography__Point(float8, float8, srid integer)
ELSEIF lat < -90.0 OR lat > 90.0 THEN
RAISE EXCEPTION 'Latitude values must be between -90 and 90 degrees';
ELSE
RAISE EXCEPTION 'Inavalid SRID';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid.';
END IF;
END;
$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
Expand Down Expand Up @@ -795,7 +795,7 @@ CREATE OR REPLACE FUNCTION sys.Geography__STPointFromText(text, integer)
ELSEIF lat < -90.0 OR lat > 90.0 THEN
RAISE EXCEPTION 'Latitude values must be between -90 and 90 degrees';
ELSE
RAISE EXCEPTION 'Inavalid SRID';
RAISE EXCEPTION 'The spatial reference identifier (SRID) is not valid.';
END IF;
ELSE
RAISE EXCEPTION '% is not supported', Geomtype;
Expand Down
10 changes: 5 additions & 5 deletions test/JDBC/expected/TestSpatialPoint-vu-prepare.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ INSERT INTO SPATIALPOINTGEOM_dt (location) VALUES ( geometry::STGeomFromText('Po
INSERT INTO SPATIALPOINTGEOM_dt (location) VALUES ( geometry::STGeomFromText('Point(47.65100 -22.34900)', 1000000000 ) )
~~ERROR (Code: 33557097)~~

~~ERROR (Message: SRID value should be between 0 and 999999)~~
~~ERROR (Message: The spatial reference identifier (SRID) is not valid. SRIDs must be between 0 and 999999.)~~


#Negative Test for STGeomFromText with SRID < 0
#SRID should be between 0 to 999999
INSERT INTO SPATIALPOINTGEOM_dt (location) VALUES ( geometry::STGeomFromText('Point(47.65100 -22.34900)', -1) )
~~ERROR (Code: 33557097)~~

~~ERROR (Message: SRID value should be between 0 and 999999)~~
~~ERROR (Message: The spatial reference identifier (SRID) is not valid. SRIDs must be between 0 and 999999.)~~


#Negative Test for STGeomFromText when a coordinate is missing
Expand Down Expand Up @@ -191,7 +191,7 @@ INSERT INTO SPATIALPOINTGEOG_dt (location) VALUES ( geography::STGeomFromText('P
INSERT INTO SPATIALPOINTGEOG_dt (location) VALUES ( geography::STGeomFromText('Point(47.65100 -22.34900)', 0) )
~~ERROR (Code: 33557097)~~

~~ERROR (Message: Inavalid SRID)~~
~~ERROR (Message: The spatial reference identifier (SRID) is not valid.)~~


#Negative Test for STGeomFromText for Geography when lat > 90 or < -90
Expand Down Expand Up @@ -222,14 +222,14 @@ INSERT INTO SPATIALPOINTGEOG_dt (location) VALUES ( STGeomFromText('Point(47.651
INSERT INTO SPATIALPOINTGEOG_dt (location) VALUES ( geography::STGeomFromText('Point(47.65100 -22.34900)', 1000000000 ) )
~~ERROR (Code: 33557097)~~

~~ERROR (Message: Inavalid SRID)~~
~~ERROR (Message: The spatial reference identifier (SRID) is not valid.)~~


#Negative Test for STGeomFromText with SRID < 0
INSERT INTO SPATIALPOINTGEOG_dt (location) VALUES ( geography::STGeomFromText('Point(47.65100 -22.34900)', -1) )
~~ERROR (Code: 33557097)~~

~~ERROR (Message: Inavalid SRID)~~
~~ERROR (Message: The spatial reference identifier (SRID) is not valid.)~~


#Negative Test for STGeomFromText when a coordinate is missing
Expand Down

0 comments on commit 0065ef3

Please sign in to comment.