Bug#19880316 ALTER TABLE INSERTS INVALID VALUES IN GEOMETRY COLUMNS

Problem: ALTER TABLE ADD/MODIFY COLUMN may create geometry columns
with invalid data.

Geometry value validation was implemented in the fix for bug #19593342
and checks all values inserted into a geometry field with
Field::store(). However, in some cases, ALTER TABLE bypasses
Field::store(), and thereby also the validation.

Fix: Return an error when trying to add NOT NULL geometry type
columns, or trying to convert nullable columns of other types to NOT
NULL geometry types, if the table is not empty. Use do_conv_blob() to
copy geometry fields if the types aren't guaranteed to match.

Since there is no default value, ALTER TABLE ADD COLUMN can only add a
geometry column if the table is empty or the column is nullable.

ALTER TABLE MODIFY COLUMN can only change a column to a geometry type
if all values in the column can be interpreted as a valid value of
that type.

Author: nryeng

mysql-test/r/gis.result

@@ -105,15 +105,18 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 ALTER TABLE tab ADD SPATIAL INDEX idx6(c2 ASC) USING HASH;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USING HASH' at line 1
 ALTER TABLE tab CHANGE c2 c2 MULTIPOINT NOT NULL FIRST, ALGORITHM=COPY;
+ERROR 22004: Invalid use of NULL value
 ALTER TABLE tab MODIFY COLUMN c3 MULTILINESTRING NOT NULL,ALGORITHM=COPY;
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 ALTER TABLE tab MODIFY COLUMN c4 MULTIPOLYGON NOT NULL;
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 SHOW CREATE TABLE tab;
 Table	Create Table
 tab	CREATE TABLE `tab` (
-  `c2` multipoint NOT NULL,
   `c1` int(11) NOT NULL,
-  `c3` multilinestring NOT NULL,
-  `c4` multipolygon NOT NULL,
+  `c2` point NOT NULL,
+  `c3` linestring NOT NULL,
+  `c4` polygon NOT NULL,
   `c5` geometry NOT NULL,
   PRIMARY KEY (`c1`),
   SPATIAL KEY `idx2` (`c2`),
@@ -144,8 +147,8 @@ ALTER TABLE tab CHANGE COLUMN c4 c44 POLYGON NOT NULL;
 SHOW CREATE TABLE tab;
 Table	Create Table
 tab	CREATE TABLE `tab` (
-  `c22` point NOT NULL,
   `c1` int(11) NOT NULL,
+  `c22` point NOT NULL,
   `c33` linestring NOT NULL,
   `c44` polygon NOT NULL,
   `c5` geometry NOT NULL,
@@ -170,8 +173,8 @@ ALTER TABLE tab CHANGE COLUMN c44 c4 POLYGON NOT NULL;
 SHOW CREATE TABLE tab;
 Table	Create Table
 tab	CREATE TABLE `tab` (
-  `c2` point NOT NULL,
   `c1` int(11) NOT NULL,
+  `c2` point NOT NULL,
   `c3` linestring NOT NULL,
   `c4` polygon NOT NULL,
   `c5` geometry NOT NULL,
@@ -269,8 +272,8 @@ CREATE SPATIAL INDEX idx5 ON temp_tab(c5);
 SHOW CREATE TABLE temp_tab;
 Table	Create Table
 temp_tab	CREATE TEMPORARY TABLE `temp_tab` (
-  `c2` point NOT NULL,
   `c1` int(11) NOT NULL,
+  `c2` point NOT NULL,
   `c3` linestring NOT NULL,
   `c4` polygon NOT NULL,
   `c5` geometry NOT NULL,
@@ -292,8 +295,8 @@ c1	ST_Astext(c2)	ST_Astext(c4)
 SHOW CREATE TABLE tab;
 Table	Create Table
 tab	CREATE TABLE `tab` (
-  `c2` point NOT NULL,
   `c1` int(11) NOT NULL,
+  `c2` point NOT NULL,
   `c3` linestring NOT NULL,
   `c4` polygon NOT NULL,
   `c5` geometry NOT NULL,
@@ -315,8 +318,8 @@ ALTER TABLE tab ADD CONSTRAINT const_1 UNIQUE(c2);
 SHOW CREATE TABLE tab;
 Table	Create Table
 tab	CREATE TABLE `tab` (
-  `c2` point NOT NULL,
   `c1` int(11) NOT NULL,
+  `c2` point NOT NULL,
   `c3` linestring NOT NULL,
   `c4` polygon NOT NULL,
   `c5` geometry NOT NULL,
@@ -349,8 +352,8 @@ ALTER TABLE tab ADD CONSTRAINT const_1 UNIQUE(c5(10));
 SHOW CREATE TABLE tab;
 Table	Create Table
 tab	CREATE TABLE `tab` (
-  `c2` point NOT NULL,
   `c1` int(11) NOT NULL,
+  `c2` point NOT NULL,
   `c3` linestring NOT NULL,
   `c4` polygon NOT NULL,
   `c5` geometry NOT NULL,
@@ -429,18 +432,19 @@ ALTER TABLE tab ADD SPATIAL KEY idx5(c5 ASC) COMMENT 'testing spatial index on G
 ALTER TABLE tab ADD INDEX idx6(c4(10)) USING BTREE;
 ALTER TABLE tab MODIFY COLUMN c2 GEOMETRY NOT NULL;
 ALTER TABLE tab MODIFY COLUMN c3 POLYGON NOT NULL;
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 ALTER TABLE tab add COLUMN c7 POINT NOT NULL;
+ERROR 22004: Invalid use of NULL value
 ALTER TABLE tab add COLUMN c8 POINT NOT NULL, ALGORITHM = INPLACE, LOCK=NONE;
 ERROR 0A000: LOCK=NONE is not supported. Reason: Do not support online operation on table with GIS index. Try LOCK=SHARED.
 SHOW CREATE TABLE tab;
 Table	Create Table
 tab	CREATE TABLE `tab` (
   `c1` int(11) NOT NULL,
   `c2` geometry NOT NULL,
-  `c3` polygon NOT NULL,
+  `c3` linestring NOT NULL,
   `c4` polygon NOT NULL,
   `c5` geometry NOT NULL,
-  `c7` point NOT NULL,
   PRIMARY KEY (`c1`),
   SPATIAL KEY `idx2` (`c2`),
   SPATIAL KEY `idx3` (`c3`),
@@ -466,16 +470,16 @@ DELETE FROM tab WHERE MBRContains(tab.c4, @g1);
 SELECT c1,ST_Astext(c2),ST_Astext(c4) FROM tab WHERE MBRContains(tab.c4, @g1) ORDER BY c1;
 c1	ST_Astext(c2)	ST_Astext(c4)
 ALTER TABLE tab MODIFY COLUMN c2 POLYGON NOT NULL;
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 ALTER TABLE tab MODIFY COLUMN c4 GEOMETRY NOT NULL;
 SHOW CREATE TABLE tab;
 Table	Create Table
 tab	CREATE TABLE `tab` (
   `c1` int(11) NOT NULL,
-  `c2` polygon NOT NULL,
-  `c3` polygon NOT NULL,
+  `c2` geometry NOT NULL,
+  `c3` linestring NOT NULL,
   `c4` geometry NOT NULL,
   `c5` geometry NOT NULL,
-  `c7` point NOT NULL,
   PRIMARY KEY (`c1`),
   SPATIAL KEY `idx2` (`c2`),
   SPATIAL KEY `idx3` (`c3`),
@@ -502,11 +506,10 @@ c1	ST_Astext(c2)	ST_AsText(c3)	ST_Astext(c4)
 10	POINT(160 160)	LINESTRING(140 140,150 150,160 160)	POLYGON((5010 5010,5020 5020,5030 5030,5040 5030,5020 5010,5010 5010))
 UPDATE tab SET C2 = ST_GeomFromText('POINT(2000 2000)')
 WHERE MBREquals(tab.c4, @g1) AND MBREquals(tab.c3,@g2);
-ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 SELECT c1,ST_Astext(c2),ST_AsText(c3),ST_Astext(c4) FROM tab WHERE MBREquals(tab.c4, @g1) 
 AND MBREquals(tab.c3,@g2) ORDER BY c1;
 c1	ST_Astext(c2)	ST_AsText(c3)	ST_Astext(c4)
-10	POINT(160 160)	LINESTRING(140 140,150 150,160 160)	POLYGON((5010 5010,5020 5020,5030 5030,5040 5030,5020 5010,5010 5010))
+10	POINT(2000 2000)	LINESTRING(140 140,150 150,160 160)	POLYGON((5010 5010,5020 5020,5030 5030,5040 5030,5020 5010,5010 5010))
 DELETE FROM tab WHERE MBREquals(tab.c4, @g1) AND MBREquals(tab.c3,@g2);
 SELECT c1,ST_Astext(c2),ST_AsText(c3),ST_Astext(c4) FROM tab WHERE MBREquals(tab.c4, @g1)
 AND MBREquals(tab.c3,@g2) ORDER BY c1;
@@ -527,7 +530,6 @@ tab	CREATE TABLE `tab` (
   `c3` linestring NOT NULL,
   `c4` polygon NOT NULL,
   `c5` geometry NOT NULL,
-  `c7` point NOT NULL,
   PRIMARY KEY (`c1`),
   SPATIAL KEY `idx2` (`c2`),
   SPATIAL KEY `idx3` (`c3`),
@@ -659,19 +661,23 @@ create table t1 (c1 int) engine=innodb;
 insert into t1 values(NULL);
 alter table t1 add b geometry, add spatial index(b), algorithm=inplace;
 ERROR 42000: All parts of a SPATIAL index must be NOT NULL
-alter table t1 add b geometry not null, algorithm=inplace;
+alter table t1 add b geometry, algorithm=inplace;
 update t1 set b = st_geomfromtext('point(0 0)');
 alter table t1 add spatial index(b), algorithm=inplace;
+ERROR 42000: All parts of a SPATIAL index must be NOT NULL
 delete from t1;
 DROP table t1;
 create table t1 (c1 int) engine=innodb;
 insert into t1 values(NULL);
 alter table t1 add b geometry, add spatial index(b), algorithm=copy;
 ERROR 42000: All parts of a SPATIAL index must be NOT NULL
 alter table t1 add b geometry not null, add spatial index(b), algorithm=copy;
-ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
+ERROR 22004: Invalid use of NULL value
 alter table t1 add b geometry not null, algorithm=copy;
+ERROR 22004: Invalid use of NULL value
 update t1 set b = st_geomfromtext('point(0 0)');
+ERROR 42S22: Unknown column 'b' in 'field list'
 alter table t1 add spatial index(b), algorithm=copy;
+ERROR 42000: Key column 'b' doesn't exist in table
 delete from t1;
 DROP table t1;

mysql-test/suite/innodb_gis/r/alter_spatial_index.result

@@ -67,18 +67,20 @@ SELECT name, mtype, prtype, len FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS WHERE
 name	mtype	prtype	len
 p	14	1535	12
 g	14	1535	12
-ALTER TABLE t1 ADD COLUMN p1 POINT NOT NULL, ADD COLUMN p2 POINT NOT NULL, ADD KEY(p), ADD KEY(p1), ADD KEY(p2);
+ALTER TABLE t1 ADD COLUMN p1 POINT, ADD COLUMN p2 POINT, ADD KEY(p);
 SELECT name, mtype, prtype, len FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS WHERE name = 'p' OR name = 'g' OR name = 'p1' OR name = 'p2';
 name	mtype	prtype	len
 p	14	1535	12
 g	14	1535	12
-p1	14	1535	12
-p2	14	1535	12
+p1	14	1279	12
+p2	14	1279	12
 # NOT NULL POINT will use ''
 SELECT count(*) AS `Expect 4` FROM t1 WHERE p1 = '';
-ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
+Expect 4
+0
 SELECT count(*) AS `Expect 4` FROM t1 WHERE p2 = '';
-ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
+Expect 4
+0
 SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE p = p1;
 ST_AsText(p)	ST_AsText(p1)
 SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE p = p2;
@@ -90,7 +92,7 @@ SELECT name, mtype, prtype, len FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS WHERE
 name	mtype	prtype	len
 p	14	1535	12
 g	14	1535	12
-p1	14	1535	12
+p1	14	1279	12
 p2	14	1279	12
 SELECT count(*) AS `Expect 4` FROM t1 WHERE p2 IS NULL;
 Expect 4
@@ -102,7 +104,7 @@ SELECT name, mtype, prtype, len FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS WHERE
 name	mtype	prtype	len
 p	14	1535	12
 g	14	1535	12
-p1	14	1535	12
+p1	14	1279	12
 SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE p = p1;
 ST_AsText(p)	ST_AsText(p1)
 INSERT INTO t1 VALUES (ST_PointFromText('POINT(0.5 0.5)'), ST_PointFromText('POINT(0 1)'), ST_PointFromText('POINT(10 19)'));
@@ -122,11 +124,12 @@ POINT(10 20)
 POINT(10 20)
 # Add spatial keys on the table
 ALTER TABLE t1 ADD SPATIAL(p), ADD SPATIAL(p1);
+ERROR 42000: All parts of a SPATIAL index must be NOT NULL
 SELECT name, mtype, prtype, len FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS WHERE name = 'p' OR name = 'g' OR name = 'p1';
 name	mtype	prtype	len
 p	14	1535	12
 g	14	1535	12
-p1	14	1535	12
+p1	14	1279	12
 SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE p1 = ST_PointFromText('POINT(10 30)');
 ST_AsText(p)	ST_AsText(p1)
 SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE p1 = ST_PointFromText('POINT(10 20)');
@@ -146,11 +149,12 @@ ST_AsText(p)	ST_AsText(p1)
 POINT(0 0)	POINT(10 20)
 # Drop spatial keys on the table
 ALTER TABLE t1 DROP KEY p, DROP KEY p1;
+ERROR 42000: Can't DROP 'p1'; check that column/key exists
 SELECT name, mtype, prtype, len FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS WHERE name = 'p' OR name = 'g' OR name = 'p1';
 name	mtype	prtype	len
 p	14	1535	12
 g	14	1535	12
-p1	14	1535	12
+p1	14	1279	12
 SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE p1 = ST_PointFromText('POINT(10 30)');
 ST_AsText(p)	ST_AsText(p1)
 SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE p1 = ST_PointFromText('POINT(10 20)');
@@ -173,18 +177,18 @@ ALTER TABLE t1 DROP COLUMN p, DROP COLUMN p1;
 SELECT name, mtype, prtype, len FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS WHERE name = 'p' OR name = 'g' OR name = 'p1';
 name	mtype	prtype	len
 g	14	1535	12
-ALTER TABLE t1 ADD COLUMN p POINT NOT NULL, ADD COLUMN p1 POINT NOT NULL;
+ALTER TABLE t1 ADD COLUMN p POINT, ADD COLUMN p1 POINT;
 SELECT name, mtype, prtype, len FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS WHERE name = 'p' OR name = 'g' OR name = 'p1';
 name	mtype	prtype	len
 g	14	1535	12
-p	14	1535	12
-p1	14	1535	12
+p	14	1279	12
+p1	14	1279	12
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `g` geometry NOT NULL,
-  `p` point NOT NULL,
-  `p1` point NOT NULL
+  `p` point DEFAULT NULL,
+  `p1` point DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES(ST_PointFromText('POINT(0.5 0.5)'), ST_PointFromText('POINT(0 1)'), ST_PointFromText('POINT(10 19)'));
 INSERT INTO t1 VALUES(ST_PointFromText('POINT(0.6 0.6)'), ST_PointFromText('POINT(1 1)'), ST_PointFromText('POINT(10 20)'));
@@ -202,12 +206,12 @@ POINT(1 1)	POINT(10 20)
 SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE MBRWithin(p, ST_GeomFromText('POLYGON((-1 0.5, -1 -0.5, 1 -0.5, 1 0.5, -1 0.5))'));
 ST_AsText(p)	ST_AsText(p1)
 POINT(0 0)	POINT(10 22)
-ALTER TABLE t1 DROP COLUMN p1, ADD COLUMN p1 POINT NOT NULL, CHANGE COLUMN p pp POINT NOT NULL AFTER p1;
+ALTER TABLE t1 DROP COLUMN p1, ADD COLUMN p1 POINT, CHANGE COLUMN p pp POINT AFTER p1;
 SELECT name, mtype, prtype, len FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS WHERE name = 'pp' OR name = 'g' OR name = 'p1';
 name	mtype	prtype	len
 g	14	1535	12
-p1	14	1535	12
-pp	14	1535	12
+p1	14	1279	12
+pp	14	1279	12
 UPDATE t1 SET p1 = ST_PointFromText('POINT(5 5)');
 SELECT ST_AsText(pp), ST_AsText(p1) FROM t1;
 ST_AsText(pp)	ST_AsText(p1)
@@ -216,11 +220,12 @@ POINT(1 1)	POINT(5 5)
 POINT(1 0)	POINT(5 5)
 POINT(0 0)	POINT(5 5)
 ALTER TABLE t1 ADD SPATIAL(p1), ADD SPATIAL(pp), ALGORITHM = COPY;
+ERROR 42000: All parts of a SPATIAL index must be NOT NULL
 SELECT name, mtype, prtype, len FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS WHERE name = 'pp' OR name = 'g' OR name = 'p1';
 name	mtype	prtype	len
 g	14	1535	12
-p1	14	1535	12
-pp	14	1535	12
+p1	14	1279	12
+pp	14	1279	12
 SELECT ST_AsText(pp), ST_AsText(p1) FROM t1 WHERE p1 = ST_PointFromText('POINT(10 30)');
 ST_AsText(pp)	ST_AsText(p1)
 SELECT ST_AsText(pp), ST_AsText(p1) FROM t1 WHERE p1 = ST_PointFromText('POINT(10 20)');

mysql-test/suite/innodb_gis/r/point_basic.result

@@ -169,11 +169,13 @@ ALTER TABLE tab ADD SPATIAL INDEX idx6(c2 ASC) USING BTREE;
 --error ER_PARSE_ERROR
 ALTER TABLE tab ADD SPATIAL INDEX idx6(c2 ASC) USING HASH;
 
-
+--error ER_INVALID_USE_OF_NULL
 ALTER TABLE tab CHANGE c2 c2 MULTIPOINT NOT NULL FIRST, ALGORITHM=COPY;
 
+--error ER_CANT_CREATE_GEOMETRY_OBJECT
 ALTER TABLE tab MODIFY COLUMN c3 MULTILINESTRING NOT NULL,ALGORITHM=COPY;
 
+--error ER_CANT_CREATE_GEOMETRY_OBJECT
 ALTER TABLE tab MODIFY COLUMN c4 MULTIPOLYGON NOT NULL;
 
 SHOW CREATE TABLE tab;
@@ -455,8 +457,10 @@ ALTER TABLE tab ADD INDEX idx6(c4(10)) USING BTREE;
 
 ALTER TABLE tab MODIFY COLUMN c2 GEOMETRY NOT NULL;
 
+--error ER_CANT_CREATE_GEOMETRY_OBJECT
 ALTER TABLE tab MODIFY COLUMN c3 POLYGON NOT NULL;
 
+--error ER_INVALID_USE_OF_NULL
 ALTER TABLE tab add COLUMN c7 POINT NOT NULL;
 
 --error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
@@ -478,6 +482,7 @@ DELETE FROM tab WHERE MBRContains(tab.c4, @g1);
 
 SELECT c1,ST_Astext(c2),ST_Astext(c4) FROM tab WHERE MBRContains(tab.c4, @g1) ORDER BY c1;
 
+--error ER_CANT_CREATE_GEOMETRY_OBJECT
 ALTER TABLE tab MODIFY COLUMN c2 POLYGON NOT NULL;
 
 ALTER TABLE tab MODIFY COLUMN c4 GEOMETRY NOT NULL;
@@ -496,7 +501,6 @@ SET @g2 = ST_GeomFromText('LINESTRING(140 140,150 150,160 160)');
 SELECT c1,ST_Astext(c2),ST_AsText(c3),ST_Astext(c4) FROM tab WHERE MBREquals(tab.c4, @g1) 
 AND MBREquals(tab.c3,@g2) ORDER BY c1;
 
---error ER_CANT_CREATE_GEOMETRY_OBJECT
 UPDATE tab SET C2 = ST_GeomFromText('POINT(2000 2000)')
 WHERE MBREquals(tab.c4, @g1) AND MBREquals(tab.c3,@g2);
 
@@ -668,7 +672,7 @@ alter table t1 add b geometry, add spatial index(b), algorithm=inplace;
 # alter table t1 add b geometry not null, add spatial index(b), algorithm=inplace;
 
 # Add a geometry column.
-alter table t1 add b geometry not null, algorithm=inplace;
+alter table t1 add b geometry, algorithm=inplace;
 
 # Add spatial index fail, since there's a NULL or invalid geo data.
 # The case has to be commented because it no longer fails and following cases
@@ -680,6 +684,7 @@ alter table t1 add b geometry not null, algorithm=inplace;
 update t1 set b = st_geomfromtext('point(0 0)');
 
 # Add spatial index success.
+--error ER_SPATIAL_CANT_HAVE_NULL
 alter table t1 add spatial index(b), algorithm=inplace;
 
 # Delete rows.
@@ -697,10 +702,11 @@ insert into t1 values(NULL);
 alter table t1 add b geometry, add spatial index(b), algorithm=copy;
 
 # Add spatial index fail, since there's a NULL or invalid geo data.
---error ER_CANT_CREATE_GEOMETRY_OBJECT
+--error ER_INVALID_USE_OF_NULL
 alter table t1 add b geometry not null, add spatial index(b), algorithm=copy;
 
 # Add a geometry column.
+--error ER_INVALID_USE_OF_NULL
 alter table t1 add b geometry not null, algorithm=copy;
 
 # Add spatial index.
@@ -710,9 +716,11 @@ alter table t1 add b geometry not null, algorithm=copy;
 #alter table t1 add spatial index(b), algorithm=copy;
 
 # Update invalide geo data to point(0 0).
+--error ER_BAD_FIELD_ERROR
 update t1 set b = st_geomfromtext('point(0 0)');
 
 # Add spatial index success.
+--error ER_KEY_COLUMN_DOES_NOT_EXITS
 alter table t1 add spatial index(b), algorithm=copy;
 
 # Delete rows.