MDEV-9255 Add generation_expression to information_schema.columns.

Added IS_GENERATED and GENERATION_EXPRESSION columns required by the SQL standard
MariaDB · Mar 28, 2017 · da5c3e0 · da5c3e0
1 parent 93dd70c
commit da5c3e0
Show file tree

Hide file tree

Showing 16 changed files with 2,709 additions and 2,556 deletions.
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
@@ -222,8 +222,8 @@ Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 c	varchar(64)	utf8_general_ci	NO				select,insert,update,references	
 select * from information_schema.COLUMNS where table_name="t1"
 and column_name= "a";
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-def	mysqltest	t1	a	1	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references	
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
+def	mysqltest	t1	a	1	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
 show columns from mysqltest.t1 where field like "%a%";
 Field	Type	Null	Key	Default	Extra
 a	int(11)	YES		NULL	
@@ -844,6 +844,7 @@ table_schema	table_name	column_name
 information_schema	ALL_PLUGINS	PLUGIN_DESCRIPTION
 information_schema	COLUMNS	COLUMN_DEFAULT
 information_schema	COLUMNS	COLUMN_TYPE
+information_schema	COLUMNS	GENERATION_EXPRESSION
 information_schema	EVENTS	EVENT_DEFINITION
 information_schema	PARAMETERS	DTD_IDENTIFIER
 information_schema	PARTITIONS	PARTITION_EXPRESSION
@@ -1577,9 +1578,9 @@ WHERE TABLE_SCHEMA='mysql' and TABLE_NAME= 'db';
 TABLE_COLLATION
 utf8_bin
 select * from information_schema.columns where table_schema = NULL;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
 select * from `information_schema`.`COLUMNS` where `TABLE_NAME` = NULL;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
 select * from `information_schema`.`KEY_COLUMN_USAGE` where `TABLE_SCHEMA` = NULL;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 select * from `information_schema`.`KEY_COLUMN_USAGE` where `TABLE_NAME` = NULL;
@@ -1920,7 +1921,7 @@ LEFT JOIN INFORMATION_SCHEMA.COLUMNS
 USING (TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME)
 WHERE COLUMNS.TABLE_SCHEMA = 'test'
 AND COLUMNS.TABLE_NAME = 't1';
-TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME	TABLE_CATALOG	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME	TABLE_CATALOG	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
 #
 # A test case for Bug#56540 "Exception (crash) in sql_show.cc
 # during rqg_info_schema test on Windows"

diff --git a/mysql-test/r/information_schema_parameters.result b/mysql-test/r/information_schema_parameters.result
@@ -44,6 +44,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -64,6 +66,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -84,6 +88,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -104,6 +110,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -124,6 +132,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -144,6 +154,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -164,6 +176,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -184,6 +198,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -204,6 +220,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -224,6 +242,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -244,6 +264,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -264,6 +286,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -284,6 +308,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -304,6 +330,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -324,6 +352,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
@@ -344,6 +374,8 @@ COLUMN_KEY
 EXTRA	
 PRIVILEGES	#
 COLUMN_COMMENT	
+IS_GENERATED	NEVER
+GENERATION_EXPRESSION	NULL
 DESCRIBE INFORMATION_SCHEMA.PARAMETERS;
 Field	Type	Null	Key	Default	Extra
 SPECIFIC_CATALOG	varchar(512)	NO