fix test_unit

TCeason · TCeason · commit 82e4ea22357d · 2023-03-23T20:36:53.000+08:00
diff --git a/src/query/ast/src/ast/statements/columns.rs b/src/query/ast/src/ast/statements/columns.rs
@@ -33,16 +33,16 @@ impl Display for ShowColumnsStmt {
         if self.full {
             write!(f, " FULL")?;
         }
-        write!(f, " COLUMNS FROM")?;
+        write!(f, " COLUMNS FROM {}", self.table)?;
 
         if let Some(database) = &self.database {
+            write!(f, " FROM ")?;
             if let Some(catalog) = &self.catalog {
                 write!(f, "{catalog}.",)?;
             }
-            write!(f, "{database}.",)?;
+            write!(f, "{database}")?;
         }
 
-        write!(f, " {}", self.table)?;
         if let Some(limit) = &self.limit {
             write!(f, " {limit}")?;
         }
diff --git a/src/query/ast/src/parser/statement.rs b/src/query/ast/src/parser/statement.rs
@@ -399,9 +399,14 @@ pub fn statement(i: Input) -> IResult<StatementMsg> {
     );
     let show_columns = map(
         rule! {
-            SHOW ~ FULL? ~ COLUMNS ~ ( FROM | IN ) ~ #period_separated_idents_1_to_3 ~ #show_limit?
+            SHOW ~ FULL? ~ COLUMNS ~ ( FROM | IN ) ~ #ident ~ ((FROM | IN) ~ #period_separated_idents_1_to_2)? ~ #show_limit?
         },
-        |(_, opt_full, _, _, (catalog, database, table), limit)| {
+        |(_, opt_full, _, _, table, ctl_db, limit)| {
+            let (catalog, database) = match ctl_db {
+                Some((_, (Some(c), d))) => (Some(c), Some(d)),
+                Some((_, (None, d))) => (None, Some(d)),
+                _ => (None, None),
+            };
             Statement::ShowColumns(ShowColumnsStmt {
                 catalog,
                 database,
@@ -1108,7 +1113,7 @@ pub fn statement(i: Input) -> IResult<StatementMsg> {
         ),
         rule!(
             #show_tables : "`SHOW [FULL] TABLES [FROM <database>] [<show_limit>]`"
-            | #show_columns : "`SHOW [FULL] COLUMNS FROM [[<database>.]<table>] [<show_limit>]`"
+            | #show_columns : "`SHOW [FULL] COLUMNS FROM <table> [FROM|IN <catalog>.<database>] [<show_limit>]`"
             | #show_create_table : "`SHOW CREATE TABLE [<database>.]<table>`"
             | #describe_table : "`DESCRIBE [<database>.]<table>`"
             | #show_fields : "`SHOW FIELDS FROM [<database>.]<table>`"
diff --git a/src/query/ast/tests/it/parser.rs b/src/query/ast/tests/it/parser.rs
@@ -70,6 +70,9 @@ fn test_statement() {
         r#"show full tables"#,
         r#"show full tables from db"#,
         r#"show full tables from ctl.db"#,
+        r#"show full columns in t in db"#,
+        r#"show columns in t from ctl.db"#,
+        r#"show full columns from t from db like 'id%'"#,
         r#"show processlist;"#,
         r#"show create table a.b;"#,
         r#"show create table a.b format TabSeparatedWithNamesAndTypes;"#,
diff --git a/src/query/ast/tests/it/testdata/statement-error.txt b/src/query/ast/tests/it/testdata/statement-error.txt
@@ -275,7 +275,7 @@ error:
   --> SQL:1:6
   |
 1 | SHOW GRANT FOR ROLE role1;
-  |      ^^^^^ expected `SETTINGS`, `STAGES`, `ENGINES`, `PROCESSLIST`, `METRICS`, `FUNCTIONS`, or 14 more ...
+  |      ^^^^^ expected `SETTINGS`, `STAGES`, `ENGINES`, `PROCESSLIST`, `METRICS`, `FUNCTIONS`, or 15 more ...
 
 
 ---------- Input ----------
diff --git a/src/query/ast/tests/it/testdata/statement.txt b/src/query/ast/tests/it/testdata/statement.txt
@@ -138,6 +138,108 @@ ShowTables(
 )
 
 
+---------- Input ----------
+show full columns in t in db
+---------- Output ---------
+SHOW FULL COLUMNS FROM t FROM db
+---------- AST ------------
+ShowColumns(
+    ShowColumnsStmt {
+        catalog: None,
+        database: Some(
+            Identifier {
+                name: "db",
+                quote: None,
+                span: Some(
+                    26..28,
+                ),
+            },
+        ),
+        table: Identifier {
+            name: "t",
+            quote: None,
+            span: Some(
+                21..22,
+            ),
+        },
+        full: true,
+        limit: None,
+    },
+)
+
+
+---------- Input ----------
+show columns in t from ctl.db
+---------- Output ---------
+SHOW COLUMNS FROM t FROM ctl.db
+---------- AST ------------
+ShowColumns(
+    ShowColumnsStmt {
+        catalog: Some(
+            Identifier {
+                name: "ctl",
+                quote: None,
+                span: Some(
+                    23..26,
+                ),
+            },
+        ),
+        database: Some(
+            Identifier {
+                name: "db",
+                quote: None,
+                span: Some(
+                    27..29,
+                ),
+            },
+        ),
+        table: Identifier {
+            name: "t",
+            quote: None,
+            span: Some(
+                16..17,
+            ),
+        },
+        full: false,
+        limit: None,
+    },
+)
+
+
+---------- Input ----------
+show full columns from t from db like 'id%'
+---------- Output ---------
+SHOW FULL COLUMNS FROM t FROM db LIKE 'id%'
+---------- AST ------------
+ShowColumns(
+    ShowColumnsStmt {
+        catalog: None,
+        database: Some(
+            Identifier {
+                name: "db",
+                quote: None,
+                span: Some(
+                    30..32,
+                ),
+            },
+        ),
+        table: Identifier {
+            name: "t",
+            quote: None,
+            span: Some(
+                23..24,
+            ),
+        },
+        full: true,
+        limit: Some(
+            Like {
+                pattern: "id%",
+            },
+        ),
+    },
+)
+
+
 ---------- Input ----------
 show processlist;
 ---------- Output ---------
diff --git a/src/query/sql/src/planner/binder/ddl/column.rs b/src/query/sql/src/planner/binder/ddl/column.rs
@@ -66,33 +66,36 @@ impl Binder {
             table
         };
 
-        let mut select_builder = SelectBuilder::from("system.columns");
+        let mut select_builder = SelectBuilder::from("information_schema.columns");
 
         select_builder
-            .with_column("name AS Field")
-            .with_column("type AS Type")
+            .with_column("column_name AS `Field`")
+            .with_column("column_type AS `Type`")
             .with_column("is_nullable AS `Null`")
-            .with_column("data_type AS Data_Type")
-            .with_column("default_kind AS Default_Kind")
-            .with_column("default_expression AS Default_Expression");
+            .with_column("default AS `Default`")
+            .with_column("extra AS `Extra`")
+            .with_column("column_key AS `Key`");
 
         if *full {
-            select_builder.with_column("comment AS Comment");
+            select_builder
+                .with_column("collation_name AS `Collation`")
+                .with_column("privileges AS `Privileges`")
+                .with_column("column_comment AS Comment");
         }
 
         select_builder
-            .with_order_by("database")
-            .with_order_by("table")
-            .with_order_by("name");
+            .with_order_by("table_schema")
+            .with_order_by("table_name")
+            .with_order_by("column_name");
 
         select_builder
-            .with_filter(format!("database = '{database}'"))
-            .with_filter(format!("table = '{table}'"));
+            .with_filter(format!("table_schema = '{database}'"))
+            .with_filter(format!("table_name = '{table}'"));
 
         let query = match limit {
             None => select_builder.build(),
             Some(ShowLimit::Like { pattern }) => {
-                select_builder.with_filter(format!("name LIKE '{pattern}'"));
+                select_builder.with_filter(format!("column_name LIKE '{pattern}'"));
                 select_builder.build()
             }
             Some(ShowLimit::Where { selection }) => {
diff --git a/src/query/storages/information-schema/src/columns_table.rs b/src/query/storages/information-schema/src/columns_table.rs
@@ -39,7 +39,7 @@ impl ColumnsTable {
             when is_nullable='YES' then 1
             end as nullable,
             is_nullable AS is_nullable,
-            data_type AS data_type,
+            type AS data_type,
             data_type AS column_type,
             NULL AS character_maximum_length,
             NULL AS character_octet_length,
@@ -56,6 +56,8 @@ impl ColumnsTable {
             NULL AS domain_catalog,
             NULL AS domain_schema,
             NULL AS domain_name,
+            NULL AS privileges,
+            default_expression as default,
             NULL AS extra
         FROM system.columns;";
 
diff --git a/tests/sqllogictests/suites/base/06_show/06_0015_show_columns b/tests/sqllogictests/suites/base/06_show/06_0015_show_columns
@@ -11,42 +11,45 @@ statement ok
 CREATE TABLE showcolumn.t2(c1 int) ENGINE = Null
 
 statement ok
-CREATE TABLE showcolumn.t3(c1 int null default null, c2 Datetime, c3 String Default 'c3') ENGINE = Null;
+CREATE TABLE showcolumn.t3(c1 int null default 4, c2 Datetime default '2022-02-02 12:00:00', c3 String Default 'c3') ENGINE = Null;
 
 query TTTTTT
-SHOW COLUMNS FROM showcolumn.t3
+SHOW COLUMNS FROM t3 FROM showcolumn
 ----
-c1 Nullable(Int32) YES INT DEFAULT NULL
-c2 Timestamp NO TIMESTAMP (empty) (empty)
-c3 String NO VARCHAR DEFAULT 'c3'
+c1 INT YES 4 NULL NULL
+c2 TIMESTAMP NO '2022-02-02 12:00:00' NULL NULL
+c3 VARCHAR NO 'c3' NULL NULL
 
 statement ok
 use showcolumn
 
 query TTTTTTT
 SHOW FULL COLUMNS IN t3
 ----
-c1 Nullable(Int32) YES INT DEFAULT NULL (empty)
-c2 Timestamp NO TIMESTAMP (empty) (empty) (empty)
-c3 String NO VARCHAR DEFAULT 'c3' (empty)
+c1 INT YES 4 NULL NULL NULL NULL NULL
+c2 TIMESTAMP NO '2022-02-02 12:00:00' NULL NULL NULL NULL NULL
+c3 VARCHAR NO 'c3' NULL NULL NULL NULL NULL
 
 query T
 explain show full columns in t3
 ----
 Sort
 ├── sort keys: [database ASC NULLS LAST, table ASC NULLS LAST, name ASC NULLS LAST]
 ├── estimated rows: 0.00
-└── Filter
-    ├── filters: [columns.database (#1) = "showcolumn", columns.table (#2) = "t3"]
+└── EvalScalar
+    ├── expressions: [NULL, NULL, NULL, NULL, NULL]
     ├── estimated rows: 0.00
-    └── TableScan
-        ├── table: default.system.columns
-        ├── read rows: 0
-        ├── read bytes: 0
-        ├── partitions total: 0
-        ├── partitions scanned: 0
-        ├── push downs: [filters: [columns.database (#1) = "showcolumn" AND columns.table (#2) = "t3"], limit: NONE]
-        └── estimated rows: 0.00
+    └── Filter
+        ├── filters: [columns.table_schema (#1) = "showcolumn", columns.table_name (#2) = "t3"]
+        ├── estimated rows: 0.00
+        └── TableScan
+            ├── table: default.system.columns
+            ├── read rows: 0
+            ├── read bytes: 0
+            ├── partitions total: 0
+            ├── partitions scanned: 0
+            ├── push downs: [filters: [columns.table_schema (#1) = "showcolumn" AND columns.table_name (#2) = "t3"], limit: NONE]
+            └── estimated rows: 0.00
 
 statement ok
 DROP DATABASE showcolumn
diff --git a/tests/sqllogictests/suites/base/20+_others/20_0000_describe_table b/tests/sqllogictests/suites/base/20+_others/20_0000_describe_table
@@ -81,6 +81,8 @@ collation_name NULL NO NULL (empty)
 domain_catalog NULL NO NULL (empty)
 domain_schema NULL NO NULL (empty)
 domain_name NULL NO NULL (empty)
+privileges NULL NO NULL (empty)
+default VARCHAR NO "" (empty)
 extra NULL NO NULL (empty)
 
 query TTT

Original file line number	Diff line number	Diff line change
`@@ -33,16 +33,16 @@ impl Display for ShowColumnsStmt {`
`33`	`33`	`if self.full {`
`34`	`34`	`write!(f, " FULL")?;`
`35`	`35`	`}`
`36`		`- write!(f, " COLUMNS FROM")?;`
	`36`	`+ write!(f, " COLUMNS FROM {}", self.table)?;`
`37`	`37`
`38`	`38`	`if let Some(database) = &self.database {`
	`39`	`+ write!(f, " FROM ")?;`
`39`	`40`	`if let Some(catalog) = &self.catalog {`
`40`	`41`	`write!(f, "{catalog}.",)?;`
`41`	`42`	`}`
`42`		`- write!(f, "{database}.",)?;`
	`43`	`+ write!(f, "{database}")?;`
`43`	`44`	`}`
`44`	`45`
`45`		`- write!(f, " {}", self.table)?;`
`46`	`46`	`if let Some(limit) = &self.limit {`
`47`	`47`	`write!(f, " {limit}")?;`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ error:`
`275`	`275`	`--> SQL:1:6`
`276`	`276`	`\|`
`277`	`277`	`1 \| SHOW GRANT FOR ROLE role1;`
`278`		- \| ^^^^^ expected `SETTINGS`, `STAGES`, `ENGINES`, `PROCESSLIST`, `METRICS`, `FUNCTIONS`, or 14 more ...
	`278`	+ \| ^^^^^ expected `SETTINGS`, `STAGES`, `ENGINES`, `PROCESSLIST`, `METRICS`, `FUNCTIONS`, or 15 more ...
`279`	`279`
`280`	`280`
`281`	`281`	`---------- Input ----------`