Fixed bug#22179637: INSERT INTO TABLE FROM SELECT ACCEPTS TO INSERT INTO

Benny Wang · Benny Wang · commit db827c3f2446 · 2015-12-01T05:02:55.000+01:00
GENERATED COLUMNS

In current version, miss to constraint generated columns assignment to be only
DEFAULT value for INSERT...SELECT statement. This patch provides such a check.
diff --git a/mysql-test/suite/gcol/inc/gcol_ins_upd.inc b/mysql-test/suite/gcol/inc/gcol_ins_upd.inc
@@ -105,7 +105,9 @@ select a,b,c from t1;
 --echo # CREATE new_table ... LIKE old_table
 --echo # INSERT INTO new_table SELECT * from old_table
 create table t2 like t1;
+--error ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN
 insert into t2 select * from t1;
+insert into t2(a) select a from t1;
 select * from t1;
 drop table t2;
 
@@ -114,7 +116,9 @@ drop table t2;
 insert into t1 values (1,default,default);
 select * from t1;
 create table t2 like t1;
+--error ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN
 insert into t2 (a,b) select a,b from t1;
+insert into t2 (a) select a from t1;
 select * from t2;
 drop table t2;
 drop table t1;
@@ -526,3 +530,32 @@ INSERT INTO t2(c2) VALUES(DEFAULT);
 SELECT * FROM t2;
 DROP TABLE t, t1, t2;
 
+--echo # Bug#22179637: INSERT INTO TABLE FROM SELECT ACCEPTS TO INSERT INTO
+--echo #              GENERATED COLUMNS
+CREATE TABLE t1 (
+  i1 INTEGER,
+  i2 INTEGER GENERATED ALWAYS AS (i1 + i1)
+);
+--error ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN
+INSERT INTO t1 (i1, i2) SELECT 5, 6;
+INSERT INTO t1 (i1) SELECT 5;
+--error ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN
+INSERT INTO t1 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= 4;
+INSERT INTO t1 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= DEFAULT;
+SELECT * FROM t1;
+
+CREATE TABLE t2 (
+  i1 INTEGER,
+  i2 INTEGER GENERATED ALWAYS AS (i1 + i1) STORED
+);
+--error ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN
+INSERT INTO t2 (i1, i2) SELECT 5, 6;
+--error ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN
+INSERT INTO t2 (i1, i2) SELECT * FROM t1;
+INSERT INTO t2 (i1) SELECT 5;
+--error ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN
+INSERT INTO t2 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= 4;
+INSERT INTO t2 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= DEFAULT;
+SELECT * FROM t2;
+
+DROP TABLE t1,t2;
diff --git a/mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result b/mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result
@@ -98,6 +98,8 @@ a	b	c
 # INSERT INTO new_table SELECT * from old_table
 create table t2 like t1;
 insert into t2 select * from t1;
+ERROR HY000: The value specified for generated column 'b' in table 't2' is not allowed.
+insert into t2(a) select a from t1;
 select * from t1;
 a	b	c
 2	-2	-2
@@ -111,6 +113,8 @@ a	b	c
 1	-1	-1
 create table t2 like t1;
 insert into t2 (a,b) select a,b from t1;
+ERROR HY000: The value specified for generated column 'b' in table 't2' is not allowed.
+insert into t2 (a) select a from t1;
 select * from t2;
 a	b	c
 2	-2	-2
@@ -650,6 +654,39 @@ SELECT * FROM t2;
 c1	c2
 1	2
 DROP TABLE t, t1, t2;
+# Bug#22179637: INSERT INTO TABLE FROM SELECT ACCEPTS TO INSERT INTO
+#              GENERATED COLUMNS
+CREATE TABLE t1 (
+i1 INTEGER,
+i2 INTEGER GENERATED ALWAYS AS (i1 + i1)
+);
+INSERT INTO t1 (i1, i2) SELECT 5, 6;
+ERROR HY000: The value specified for generated column 'i2' in table 't1' is not allowed.
+INSERT INTO t1 (i1) SELECT 5;
+INSERT INTO t1 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= 4;
+ERROR HY000: The value specified for generated column 'i2' in table 't1' is not allowed.
+INSERT INTO t1 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= DEFAULT;
+SELECT * FROM t1;
+i1	i2
+5	10
+5	10
+CREATE TABLE t2 (
+i1 INTEGER,
+i2 INTEGER GENERATED ALWAYS AS (i1 + i1) STORED
+);
+INSERT INTO t2 (i1, i2) SELECT 5, 6;
+ERROR HY000: The value specified for generated column 'i2' in table 't2' is not allowed.
+INSERT INTO t2 (i1, i2) SELECT * FROM t1;
+ERROR HY000: The value specified for generated column 'i2' in table 't2' is not allowed.
+INSERT INTO t2 (i1) SELECT 5;
+INSERT INTO t2 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= 4;
+ERROR HY000: The value specified for generated column 'i2' in table 't2' is not allowed.
+INSERT INTO t2 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= DEFAULT;
+SELECT * FROM t2;
+i1	i2
+5	10
+5	10
+DROP TABLE t1,t2;
 DROP VIEW  IF EXISTS v1,v2;
 DROP TABLE IF EXISTS t1,t2,t3;
 DROP PROCEDURE IF EXISTS p1;
diff --git a/mysql-test/suite/gcol/r/gcol_ins_upd_myisam.result b/mysql-test/suite/gcol/r/gcol_ins_upd_myisam.result
@@ -98,6 +98,8 @@ a	b	c
 # INSERT INTO new_table SELECT * from old_table
 create table t2 like t1;
 insert into t2 select * from t1;
+ERROR HY000: The value specified for generated column 'b' in table 't2' is not allowed.
+insert into t2(a) select a from t1;
 select * from t1;
 a	b	c
 2	-2	-2
@@ -111,6 +113,8 @@ a	b	c
 1	-1	-1
 create table t2 like t1;
 insert into t2 (a,b) select a,b from t1;
+ERROR HY000: The value specified for generated column 'b' in table 't2' is not allowed.
+insert into t2 (a) select a from t1;
 select * from t2;
 a	b	c
 2	-2	-2
@@ -500,6 +504,39 @@ SELECT * FROM t2;
 c1	c2
 1	2
 DROP TABLE t, t1, t2;
+# Bug#22179637: INSERT INTO TABLE FROM SELECT ACCEPTS TO INSERT INTO
+#              GENERATED COLUMNS
+CREATE TABLE t1 (
+i1 INTEGER,
+i2 INTEGER GENERATED ALWAYS AS (i1 + i1)
+);
+INSERT INTO t1 (i1, i2) SELECT 5, 6;
+ERROR HY000: The value specified for generated column 'i2' in table 't1' is not allowed.
+INSERT INTO t1 (i1) SELECT 5;
+INSERT INTO t1 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= 4;
+ERROR HY000: The value specified for generated column 'i2' in table 't1' is not allowed.
+INSERT INTO t1 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= DEFAULT;
+SELECT * FROM t1;
+i1	i2
+5	10
+5	10
+CREATE TABLE t2 (
+i1 INTEGER,
+i2 INTEGER GENERATED ALWAYS AS (i1 + i1) STORED
+);
+INSERT INTO t2 (i1, i2) SELECT 5, 6;
+ERROR HY000: The value specified for generated column 'i2' in table 't2' is not allowed.
+INSERT INTO t2 (i1, i2) SELECT * FROM t1;
+ERROR HY000: The value specified for generated column 'i2' in table 't2' is not allowed.
+INSERT INTO t2 (i1) SELECT 5;
+INSERT INTO t2 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= 4;
+ERROR HY000: The value specified for generated column 'i2' in table 't2' is not allowed.
+INSERT INTO t2 (i1) SELECT 5 ON DUPLICATE KEY UPDATE i2= DEFAULT;
+SELECT * FROM t2;
+i1	i2
+5	10
+5	10
+DROP TABLE t1,t2;
 DROP VIEW  IF EXISTS v1,v2;
 DROP TABLE IF EXISTS t1,t2,t3;
 DROP PROCEDURE IF EXISTS p1;
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
@@ -1304,7 +1304,7 @@ bool Sql_cmd_insert_base::mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
                         insert_value_list, SELECT_ACL, NULL, false, false);
     if (!res)
       res= check_valid_table_refs(table_list, insert_value_list, map);
-    if (!res && lex->insert_table_leaf->table->vfield)
+    if (!res && lex->insert_table_leaf->table->has_gcol())
       res= validate_gc_assignment(thd, &insert_field_list, values,
                                   lex->insert_table_leaf->table);
     thd->lex->in_update_value_clause= false;
@@ -1319,7 +1319,7 @@ bool Sql_cmd_insert_base::mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
                         insert_update_list, UPDATE_ACL, NULL, false, true);
       if (!res)
         res= check_valid_table_refs(table_list, insert_update_list, map);
-      if (!res && lex->insert_table_leaf->table->vfield)
+      if (!res && lex->insert_table_leaf->table->has_gcol())
         res= validate_gc_assignment(thd, &insert_update_list,
                                     &insert_value_list,
                                     lex->insert_table_leaf->table);
@@ -2019,6 +2019,10 @@ int Query_result_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
     res= setup_fields(thd, Ref_ptr_array(), values, SELECT_ACL, NULL,
                       false, false);
 
+  if (!res && lex->insert_table_leaf->table->has_gcol())
+    res= validate_gc_assignment(thd, fields, &values,
+                                lex->insert_table_leaf->table);
+
   if (duplicate_handling == DUP_UPDATE && !res)
   {
     Name_resolution_context *const context= &lex->select_lex->context;
@@ -2037,6 +2041,11 @@ int Query_result_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
     if (!res)
       res= setup_fields(thd, Ref_ptr_array(), *update.get_changed_columns(),
                         UPDATE_ACL, NULL, false, true);
+
+    if (!res && lex->insert_table_leaf->table->has_gcol())
+      res= validate_gc_assignment(thd, update.get_changed_columns(),
+                                  update.update_values,
+                                  lex->insert_table_leaf->table);
     /*
       When we are not using GROUP BY and there are no ungrouped aggregate
       functions 
