MDEV-19908 Add class Type_collection

MariaDB · Jun 29, 2019 · cccfa9d · cccfa9d
1 parent 5de9dd7
commit cccfa9d
Show file tree

Hide file tree

Showing 4 changed files with 225 additions and 138 deletions.
diff --git a/mysql-test/main/gis-debug.result b/mysql-test/main/gis-debug.result
@@ -356,22 +356,16 @@ SET SESSION debug_dbug="-d,Item_func_in";
 # MDEV-12238 Add Type_handler::Item_func_{plus|minus|mul|div|mod}_fix_length_and_dec()
 #
 SET debug_dbug='+d,num_op';
-CREATE TABLE t1 AS SELECT
-POINT(0,0)+POINT(0,0),
-POINT(0,0)-POINT(0,0),
-POINT(0,0)*POINT(0,0),
-POINT(0,0)/POINT(0,0),
-POINT(0,0) MOD POINT(0,0) LIMIT 0;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `POINT(0,0)+POINT(0,0)` geometry DEFAULT NULL,
-  `POINT(0,0)-POINT(0,0)` geometry DEFAULT NULL,
-  `POINT(0,0)*POINT(0,0)` geometry DEFAULT NULL,
-  `POINT(0,0)/POINT(0,0)` geometry DEFAULT NULL,
-  `POINT(0,0) MOD POINT(0,0)` geometry DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-DROP TABLE t1;
+SELECT POINT(0,0)+POINT(0,0);
+ERROR HY000: Illegal parameter data types geometry and geometry for operation '+'
+SELECT POINT(0,0)-POINT(0,0);
+ERROR HY000: Illegal parameter data types geometry and geometry for operation '-'
+SELECT POINT(0,0)*POINT(0,0);
+ERROR HY000: Illegal parameter data types geometry and geometry for operation '*'
+SELECT POINT(0,0)/POINT(0,0);
+ERROR HY000: Illegal parameter data types geometry and geometry for operation '/'
+SELECT POINT(0,0) MOD POINT(0,0);
+ERROR HY000: Illegal parameter data types geometry and geometry for operation 'MOD'
 CREATE TABLE t1 AS SELECT
 POINT(0,0)+'0',
 POINT(0,0)-'0',

diff --git a/mysql-test/main/gis-debug.test b/mysql-test/main/gis-debug.test
@@ -73,15 +73,21 @@ SET SESSION debug_dbug="-d,Item_func_in";
 
 SET debug_dbug='+d,num_op';
 
-# (GEOMETRY,GEOMETRY) gives GEOMETRY for all operators
-CREATE TABLE t1 AS SELECT
-  POINT(0,0)+POINT(0,0),
-  POINT(0,0)-POINT(0,0),
-  POINT(0,0)*POINT(0,0),
-  POINT(0,0)/POINT(0,0),
-  POINT(0,0) MOD POINT(0,0) LIMIT 0;
-SHOW CREATE TABLE t1;
-DROP TABLE t1;
+# (GEOMETRY,GEOMETRY) goes through
+# Type_collection_geometry::aggregate_for_num_op() which fails.
+# Type pairs from Type_handler_data::m_type_aggregator_xxx are not even tested,
+# as both sides are from the same type collection.
+
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+SELECT POINT(0,0)+POINT(0,0);
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+SELECT POINT(0,0)-POINT(0,0);
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+SELECT POINT(0,0)*POINT(0,0);
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+SELECT POINT(0,0)/POINT(0,0);
+--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION
+SELECT POINT(0,0) MOD POINT(0,0);
 
 # (GEOMETRY,VARCHAR) gives GEOMETRY for all operators
 CREATE TABLE t1 AS SELECT