Skip to content

Commit 924deba

Browse files
committed
WL#10166 Require WKB input in WKB parsing functions
Give a deprication warning when using geometries as parameters to the FromWKB functions. This functionality will be removed in 8.0.
2 parents 64b29d4 + 0996bb6 commit 924deba

16 files changed

+2013
-0
lines changed

mysql-test/r/archive_gis.result

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,37 @@ INSERT INTO gis_line VALUES
5656
(105, ST_LineFromText('LINESTRING(0 0,0 10,10 0)')),
5757
(106, ST_LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')),
5858
(107, ST_LineStringFromWKB(LineString(Point(10, 10), Point(40, 10))));
59+
Warnings:
60+
Warning 3195 st_geometryfromwkb(geometry) is deprecated and will be replaced by st_srid(geometry, 0) in a future version. Use st_geometryfromwkb(st_aswkb(geometry), 0) instead.
5961
INSERT INTO gis_polygon VALUES
6062
(108, ST_PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')),
6163
(109, ST_PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')),
6264
(110, ST_PolyFromWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))));
65+
Warnings:
66+
Warning 3195 st_geometryfromwkb(geometry) is deprecated and will be replaced by st_srid(geometry, 0) in a future version. Use st_geometryfromwkb(st_aswkb(geometry), 0) instead.
6367
INSERT INTO gis_multi_point VALUES
6468
(111, ST_MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')),
6569
(112, ST_MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')),
6670
(113, ST_MPointFromWKB(MultiPoint(Point(3, 6), Point(4, 10))));
71+
Warnings:
72+
Warning 3195 st_geometryfromwkb(geometry) is deprecated and will be replaced by st_srid(geometry, 0) in a future version. Use st_geometryfromwkb(st_aswkb(geometry), 0) instead.
6773
INSERT INTO gis_multi_line VALUES
6874
(114, ST_MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')),
6975
(115, ST_MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')),
7076
(116, ST_MLineFromWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))));
77+
Warnings:
78+
Warning 3195 st_geometryfromwkb(geometry) is deprecated and will be replaced by st_srid(geometry, 0) in a future version. Use st_geometryfromwkb(st_aswkb(geometry), 0) instead.
7179
INSERT INTO gis_multi_polygon VALUES
7280
(117, ST_MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')),
7381
(118, ST_MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')),
7482
(119, ST_MPolyFromWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))));
83+
Warnings:
84+
Warning 3195 st_geometryfromwkb(geometry) is deprecated and will be replaced by st_srid(geometry, 0) in a future version. Use st_geometryfromwkb(st_aswkb(geometry), 0) instead.
7585
INSERT INTO gis_geometrycollection VALUES
7686
(120, ST_GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')),
7787
(121, ST_GeometryFromWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))));
88+
Warnings:
89+
Warning 3195 st_geometryfromwkb(geometry) is deprecated and will be replaced by st_srid(geometry, 0) in a future version. Use st_geometryfromwkb(st_aswkb(geometry), 0) instead.
7890
INSERT into gis_geometry SELECT * FROM gis_point;
7991
INSERT into gis_geometry SELECT * FROM gis_line;
8092
INSERT into gis_geometry SELECT * FROM gis_polygon;

mysql-test/r/gis-precise.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,9 @@ SET sql_mode = default;
288288
select ST_astext(ST_geomfromwkb(st_intersection(linestring(point(-59,82),point(32,29)), point(2,-5)))) as result;
289289
result
290290
GEOMETRYCOLLECTION EMPTY
291+
GEOMETRYCOLLECTION()
292+
Warnings:
293+
Warning 3195 st_geometryfromwkb(geometry) is deprecated and will be replaced by st_srid(geometry, 0) in a future version. Use st_geometryfromwkb(st_aswkb(geometry), 0) instead.
291294
SELECT ST_AsText(ST_Symdifference(ST_GeomFromText('POLYGON((5 0,15 25,25 0,15 5,5 0))'),ST_GeomFromText('POLYGON((5 0,15 25,25 0,15 5,5 0))')));
292295
ST_AsText(ST_Symdifference(ST_GeomFromText('POLYGON((5 0,15 25,25 0,15 5,5 0))'),ST_GeomFromText('POLYGON((5 0,15 25,25 0,15 5,5 0))')))
293296
GEOMETRYCOLLECTION EMPTY

mysql-test/r/gis-rtree.result

Lines changed: 200 additions & 0 deletions
Large diffs are not rendered by default.

mysql-test/r/gis.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,8 @@ INSERT INTO t1 VALUES(ST_GeomFromText('POINT(580848489 219587743)'));
591591
INSERT INTO t1 VALUES(ST_GeomFromText('POINT(11247614 782797569)'));
592592
drop table t1;
593593
create table t1 select ST_GeomFromWKB(POINT(1,3));
594+
Warnings:
595+
Warning 3195 st_geometryfromwkb(geometry) is deprecated and will be replaced by st_srid(geometry, 0) in a future version. Use st_geometryfromwkb(st_aswkb(geometry), 0) instead.
594596
show create table t1;
595597
Table Create Table
596598
t1 CREATE TABLE `t1` (
@@ -1016,6 +1018,8 @@ ST_GEOMFROMTEXT(
10161018
# must not crash
10171019
SELECT 1 FROM t1 WHERE a <> (SELECT ST_GEOMETRYCOLLECTIONFROMWKB(b) FROM t1);
10181020
1
1021+
Warnings:
1022+
Warning 3195 st_geometryfromwkb(geometry) is deprecated and will be replaced by st_srid(geometry, 0) in a future version. Use st_geometryfromwkb(st_aswkb(geometry), 0) instead.
10191023
DROP TABLE t1;
10201024
#
10211025
# Bug #49250 : spatial btree index corruption and crash

0 commit comments

Comments
 (0)