Merge pull request #55215 from rschu1ze/more-mysql-compat

Add `information_schema.columns.extra` and `information_schema.tables.table_rows`
ClickHouse · Oct 8, 2023 · 282200e · 282200e
2 parents 20868f3 + f4bc58e
commit 282200e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 23 deletions.
diff --git a/docs/en/operations/system-tables/information_schema.md b/docs/en/operations/system-tables/information_schema.md
@@ -69,6 +69,7 @@ Columns:
 - `domain_catalog` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
 - `domain_schema` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
 - `domain_name` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `NULL`, not supported.
+- `extra` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — `STORED GENERATED` for `MATERIALIZED`-type columns, `VIRTUAL GENERATED` for `ALIAS`-type columns, `DEFAULT_GENERATED` for `DEFAULT`-type columns, or `NULL`.
 
 **Example**
 
@@ -198,6 +199,8 @@ Columns:
     - `FOREIGN TABLE`
     - `LOCAL TEMPORARY`
     - `SYSTEM VIEW`
+- `table_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The total
+  number of rows. NULL if it could not be determined.
 - `data_length` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The size of
   the data on-disk. NULL if it could not be determined.
 - `table_collation` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — The table default collation. Always `utf8mb4_0900_ai_ci`.

diff --git a/src/Storages/System/attachInformationSchemaTables.cpp b/src/Storages/System/attachInformationSchemaTables.cpp
@@ -61,13 +61,15 @@ static constexpr std::string_view tables = R"(
         `table_schema` String,
         `table_name` String,
         `table_type` String,
+        `table_rows` Nullable(UInt64),
         `data_length` Nullable(UInt64),
         `table_collation` Nullable(String),
         `table_comment` Nullable(String),
         `TABLE_CATALOG` String,
         `TABLE_SCHEMA` String,
         `TABLE_NAME` String,
         `TABLE_TYPE` String,
+        `TABLE_ROWS` Nullable(UInt64),
         `DATA_LENGTH` Nullable(UInt64),
         `TABLE_COLLATION` Nullable(String),
         `TABLE_COMMENT` Nullable(String)
@@ -82,13 +84,15 @@ static constexpr std::string_view tables = R"(
                 has_own_data = 0,      'FOREIGN TABLE',
                 'BASE TABLE'
                 )            AS table_type,
+        total_rows AS table_rows,
         total_bytes AS data_length,
         'utf8mb4_0900_ai_ci' AS table_collation,
         comment              AS table_comment,
         table_catalog        AS TABLE_CATALOG,
         table_schema         AS TABLE_SCHEMA,
         table_name           AS TABLE_NAME,
         table_type           AS TABLE_TYPE,
+        table_rows           AS TABLE_ROWS,
         data_length          AS DATA_LENGTH,
         table_collation      AS TABLE_COLLATION,
         table_comment        AS TABLE_COMMENT
@@ -170,6 +174,7 @@ static constexpr std::string_view columns = R"(
         `domain_catalog` Nullable(String),
         `domain_schema` Nullable(String),
         `domain_name` Nullable(String),
+        `extra` Nullable(String),
         `column_comment` String,
         `column_type` String,
         `TABLE_CATALOG` String,
@@ -195,6 +200,7 @@ static constexpr std::string_view columns = R"(
         `DOMAIN_CATALOG` Nullable(String),
         `DOMAIN_SCHEMA` Nullable(String),
         `DOMAIN_NAME` Nullable(String),
+        `EXTRA` Nullable(String),
         `COLUMN_COMMENT` String,
         `COLUMN_TYPE` String
     ) AS
@@ -222,6 +228,11 @@ static constexpr std::string_view columns = R"(
         NULL AS domain_catalog,
         NULL AS domain_schema,
         NULL AS domain_name,
+        multiIf(default_kind = 'DEFAULT',      'DEFAULT_GENERATED',
+                default_kind = 'MATERIALIZED', 'STORED GENERATED',
+                default_kind = 'ALIAS',        'VIRTUAL GENERATED',
+                ''
+               ) AS extra,
         comment AS column_comment,
         type AS column_type,
         table_catalog AS TABLE_CATALOG,
@@ -247,6 +258,7 @@ static constexpr std::string_view columns = R"(
         domain_catalog AS DOMAIN_CATALOG,
         domain_schema AS DOMAIN_SCHEMA,
         domain_name AS DOMAIN_NAME,
+        extra AS EXTRA,
         column_comment AS COLUMN_COMMENT,
         column_type AS COLUMN_TYPE
     FROM system.columns

diff --git a/tests/queries/0_stateless/01161_information_schema.reference b/tests/queries/0_stateless/01161_information_schema.reference
@@ -26,28 +26,28 @@ views
 INFORMATION_SCHEMA	INFORMATION_SCHEMA	default	\N	\N	\N	\N	INFORMATION_SCHEMA	INFORMATION_SCHEMA	default	\N	\N	\N	\N
 information_schema	information_schema	default	\N	\N	\N	\N	information_schema	information_schema	default	\N	\N	\N	\N
 -- information_schema.tables
-default	default	kcu1	BASE TABLE	0	utf8mb4_0900_ai_ci		default	default	kcu1	BASE TABLE	0	utf8mb4_0900_ai_ci	
-default	default	kcu2	BASE TABLE	0	utf8mb4_0900_ai_ci		default	default	kcu2	BASE TABLE	0	utf8mb4_0900_ai_ci	
-default	default	mv	VIEW	0	utf8mb4_0900_ai_ci		default	default	mv	VIEW	0	utf8mb4_0900_ai_ci	
-default	default	t	FOREIGN TABLE	0	utf8mb4_0900_ai_ci		default	default	t	FOREIGN TABLE	0	utf8mb4_0900_ai_ci	
-default	default	v	VIEW	\N	utf8mb4_0900_ai_ci		default	default	v	VIEW	\N	utf8mb4_0900_ai_ci	
+default	default	kcu1	BASE TABLE	0	0	utf8mb4_0900_ai_ci		default	default	kcu1	BASE TABLE	0	0	utf8mb4_0900_ai_ci	
+default	default	kcu2	BASE TABLE	0	0	utf8mb4_0900_ai_ci		default	default	kcu2	BASE TABLE	0	0	utf8mb4_0900_ai_ci	
+default	default	mv	VIEW	0	0	utf8mb4_0900_ai_ci		default	default	mv	VIEW	0	0	utf8mb4_0900_ai_ci	
+default	default	t	FOREIGN TABLE	0	0	utf8mb4_0900_ai_ci		default	default	t	FOREIGN TABLE	0	0	utf8mb4_0900_ai_ci	
+default	default	v	VIEW	\N	\N	utf8mb4_0900_ai_ci		default	default	v	VIEW	\N	\N	utf8mb4_0900_ai_ci	
 -- information_schema.views
 default	default	mv	SELECT * FROM system.one	NONE	NO	YES	NO	NO	NO	default	default	mv	SELECT * FROM system.one	NONE	NO	YES	NO	NO	NO
 default	default	v	SELECT n, f FROM default.t	NONE	NO	NO	NO	NO	NO	default	default	v	SELECT n, f FROM default.t	NONE	NO	NO	NO	NO	NO
 -- information_schema.columns
-default	default	kcu1	i	1		0	UInt32	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UInt32	default	default	kcu1	i	1		0	UInt32	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UInt32
-default	default	kcu1	s	2		0	String	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		String	default	default	kcu1	s	2		0	String	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		String
-default	default	kcu2	d	2		0	Date	\N	\N	\N	\N	\N	0	\N	\N	\N	\N	\N	\N	\N	\N	\N		Date	default	default	kcu2	d	2		0	Date	\N	\N	\N	\N	\N	0	\N	\N	\N	\N	\N	\N	\N	\N	\N		Date
-default	default	kcu2	i	1		0	UInt32	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UInt32	default	default	kcu2	i	1		0	UInt32	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UInt32
-default	default	kcu2	u	3		0	UUID	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UUID	default	default	kcu2	u	3		0	UUID	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UUID
-default	default	mv	dummy	1		0	UInt8	\N	\N	8	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UInt8	default	default	mv	dummy	1		0	UInt8	\N	\N	8	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UInt8
-default	default	t	d	5		0	Decimal(9, 6)	\N	\N	9	10	6	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Decimal(9, 6)	default	default	t	d	5		0	Decimal(9, 6)	\N	\N	9	10	6	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Decimal(9, 6)
-default	default	t	f	2		0	Float32	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Float32	default	default	t	f	2		0	Float32	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Float32
-default	default	t	fs	4		0	FixedString(42)	42	42	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		FixedString(42)	default	default	t	fs	4		0	FixedString(42)	42	42	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		FixedString(42)
-default	default	t	n	1		0	UInt64	\N	\N	64	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UInt64	default	default	t	n	1		0	UInt64	\N	\N	64	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UInt64
-default	default	t	s	3		0	String	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		String	default	default	t	s	3		0	String	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		String
-default	default	v	f	2		0	Float64	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Float64	default	default	v	f	2		0	Float64	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Float64
-default	default	v	n	1		1	Nullable(Int32)	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Nullable(Int32)	default	default	v	n	1		1	Nullable(Int32)	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Nullable(Int32)
+default	default	kcu1	i	1		0	UInt32	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			UInt32	default	default	kcu1	i	1		0	UInt32	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			UInt32
+default	default	kcu1	s	2		0	String	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			String	default	default	kcu1	s	2		0	String	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			String
+default	default	kcu2	d	2		0	Date	\N	\N	\N	\N	\N	0	\N	\N	\N	\N	\N	\N	\N	\N	\N			Date	default	default	kcu2	d	2		0	Date	\N	\N	\N	\N	\N	0	\N	\N	\N	\N	\N	\N	\N	\N	\N			Date
+default	default	kcu2	i	1		0	UInt32	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			UInt32	default	default	kcu2	i	1		0	UInt32	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			UInt32
+default	default	kcu2	u	3		0	UUID	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			UUID	default	default	kcu2	u	3		0	UUID	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			UUID
+default	default	mv	dummy	1		0	UInt8	\N	\N	8	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			UInt8	default	default	mv	dummy	1		0	UInt8	\N	\N	8	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			UInt8
+default	default	t	d	5		0	Decimal(9, 6)	\N	\N	9	10	6	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			Decimal(9, 6)	default	default	t	d	5		0	Decimal(9, 6)	\N	\N	9	10	6	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			Decimal(9, 6)
+default	default	t	f	2		0	Float32	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			Float32	default	default	t	f	2		0	Float32	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			Float32
+default	default	t	fs	4		0	FixedString(42)	42	42	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			FixedString(42)	default	default	t	fs	4		0	FixedString(42)	42	42	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			FixedString(42)
+default	default	t	n	1		0	UInt64	\N	\N	64	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			UInt64	default	default	t	n	1		0	UInt64	\N	\N	64	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			UInt64
+default	default	t	s	3		0	String	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			String	default	default	t	s	3		0	String	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			String
+default	default	v	f	2		0	Float64	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			Float64	default	default	v	f	2		0	Float64	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			Float64
+default	default	v	n	1		1	Nullable(Int32)	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			Nullable(Int32)	default	default	v	n	1		1	Nullable(Int32)	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N			Nullable(Int32)
 -- information_schema.key_column_usage
 def	default	PRIMARY	def	default	kcu1	i	1	\N	\N	\N	\N	def	default	PRIMARY	def	default	kcu1	i	1	\N	\N	\N	\N
 def	default	PRIMARY	def	default	kcu2	d	1	\N	\N	\N	\N	def	default	PRIMARY	def	default	kcu2	d	1	\N	\N	\N	\N