Naming fixes

ClickHouse · Oct 7, 2023 · 0450da9 · 0450da9
1 parent cfa2e99
commit 0450da9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/docs/en/operations/system-tables/information_schema.md b/docs/en/operations/system-tables/information_schema.md
@@ -69,7 +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.
-- `extras` ([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`.
+- `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**
 
@@ -199,7 +199,7 @@ Columns:
     - `FOREIGN TABLE`
     - `LOCAL TEMPORARY`
     - `SYSTEM VIEW`
-- `data_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The total
+- `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.

diff --git a/src/Storages/System/attachInformationSchemaTables.cpp b/src/Storages/System/attachInformationSchemaTables.cpp
@@ -61,15 +61,15 @@ static constexpr std::string_view tables = R"(
         `table_schema` String,
         `table_name` String,
         `table_type` String,
-        `data_rows` Nullable(UInt64),
+        `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,
-        `DATA_ROWS` Nullable(UInt64),
+        `TABLE_ROWS` Nullable(UInt64),
         `DATA_LENGTH` Nullable(UInt64),
         `TABLE_COLLATION` Nullable(String),
         `TABLE_COMMENT` Nullable(String)
@@ -84,15 +84,15 @@ static constexpr std::string_view tables = R"(
                 has_own_data = 0,      'FOREIGN TABLE',
                 'BASE TABLE'
                 )            AS table_type,
-        total_rows AS data_rows,
+        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,
-        data_rows            AS DATA_ROWS,
+        table_rows           AS TABLE_ROWS,
         data_length          AS DATA_LENGTH,
         table_collation      AS TABLE_COLLATION,
         table_comment        AS TABLE_COMMENT
@@ -174,7 +174,7 @@ static constexpr std::string_view columns = R"(
         `domain_catalog` Nullable(String),
         `domain_schema` Nullable(String),
         `domain_name` Nullable(String),
-        `extras` Nullable(String),
+        `extra` Nullable(String),
         `column_comment` String,
         `column_type` String,
         `TABLE_CATALOG` String,
@@ -200,7 +200,7 @@ static constexpr std::string_view columns = R"(
         `DOMAIN_CATALOG` Nullable(String),
         `DOMAIN_SCHEMA` Nullable(String),
         `DOMAIN_NAME` Nullable(String),
-        `EXTRAS` Nullable(String),
+        `EXTRA` Nullable(String),
         `COLUMN_COMMENT` String,
         `COLUMN_TYPE` String
     ) AS
@@ -232,7 +232,7 @@ static constexpr std::string_view columns = R"(
                 default_kind = 'MATERIALIZED', 'STORED GENERATED',
                 default_kind = 'ALIAS',        'VIRTUAL GENERATED',
                 ''
-               ) AS extras,
+               ) AS extra,
         comment AS column_comment,
         type AS column_type,
         table_catalog AS TABLE_CATALOG,
@@ -258,7 +258,7 @@ static constexpr std::string_view columns = R"(
         domain_catalog AS DOMAIN_CATALOG,
         domain_schema AS DOMAIN_SCHEMA,
         domain_name AS DOMAIN_NAME,
-        extras AS EXTRAS,
+        extra AS EXTRA,
         column_comment AS COLUMN_COMMENT,
         column_type AS COLUMN_TYPE
     FROM system.columns