Support SHOW TABLES LIKE pattern and Where expr

query/src/sql/plan_parser.rs

@@ -62,6 +62,7 @@ use sqlparser::ast::Query;
 use sqlparser::ast::Statement;
 use sqlparser::ast::TableFactor;
 
+use super::DfShowTables;
 use crate::catalogs::catalog::Catalog;
 use crate::functions::ContextFunction;
 use crate::sessions::DatafuseQueryContextRef;
@@ -133,13 +134,29 @@ impl PlanParser {
             DfStatement::ShowCreateTable(v) => self.sql_show_create_table_to_plan(v),
 
             // TODO: support like and other filters in show queries
-            DfStatement::ShowTables(_) => self.build_from_sql(
-                format!(
-                    "SELECT name FROM system.tables where database = '{}' ORDER BY database, name",
-                    self.ctx.get_current_database()
-                )
-                .as_str(),
-            ),
+            DfStatement::ShowTables(df) => {
+                let show_sql = match df {
+                    DfShowTables::All => {
+                        format!(
+                            "SELECT name FROM system.tables where database = '{}' ORDER BY database, name",
+                            self.ctx.get_current_database()
+                        )
+                    }
+                    DfShowTables::Like(i) => {
+                        format!(
+                            "SELECT name FROM system.tables where database = '{}' AND name LIKE {} ORDER BY database, name",
+                            self.ctx.get_current_database(), i,
+                        )
+                    }
+                    DfShowTables::Where(e) => {
+                        format!(
+                            "SELECT name FROM system.tables where database = '{}' AND ({}) ORDER BY database, name",
+                            self.ctx.get_current_database(), e,
+                        )
+                    }
+                };
+                self.build_from_sql(show_sql.as_str())
+            }
             DfStatement::ShowSettings(_) => self.build_from_sql("SELECT name FROM system.settings"),
             DfStatement::ShowProcessList(_) => {
                 self.build_from_sql("SELECT * FROM system.processes")

query/src/sql/sql_parser.rs

@@ -163,7 +163,20 @@ impl<'a> DfParser<'a> {
                         self.parser.next_token();
 
                         if self.consume_token("TABLES") {
-                            Ok(DfStatement::ShowTables(DfShowTables))
+                            let tok = self.parser.next_token();
+                            match &tok {
+                                Token::EOF => Ok(DfStatement::ShowTables(DfShowTables::All)),
+                                Token::Word(w) => match w.keyword {
+                                    Keyword::LIKE => Ok(DfStatement::ShowTables(
+                                        DfShowTables::Like(self.parser.parse_identifier()?),
+                                    )),
+                                    Keyword::WHERE => Ok(DfStatement::ShowTables(
+                                        DfShowTables::Where(self.parser.parse_expr()?),
+                                    )),
+                                    _ => self.expected("like or where", tok),
+                                },
+                                _ => self.expected("like or where", tok),
+                            }
                         } else if self.consume_token("DATABASES") {
                             Ok(DfStatement::ShowDatabases(DfShowDatabases))
                         } else if self.consume_token("SETTINGS") {

query/src/sql/sql_parser_test.rs

@@ -222,9 +222,47 @@ mod tests {
 
     #[test]
     fn show_queries() -> Result<()> {
+        use sqlparser::dialect::GenericDialect;
+        use sqlparser::parser::Parser;
+        use sqlparser::tokenizer::Tokenizer;
+
         // positive case
-        expect_parse_ok("SHOW TABLES", DfStatement::ShowTables(DfShowTables))?;
+        expect_parse_ok("SHOW TABLES", DfStatement::ShowTables(DfShowTables::All))?;
         expect_parse_ok("SHOW SETTINGS", DfStatement::ShowSettings(DfShowSettings))?;
+        expect_parse_ok(
+            "SHOW TABLES LIKE 'aaa'",
+            DfStatement::ShowTables(DfShowTables::Like(Ident::with_quote('\'', "aaa"))),
+        )?;
+
+        expect_parse_ok(
+            "SHOW TABLES --comments should not in sql case1",
+            DfStatement::ShowTables(DfShowTables::All),
+        )?;
+
+        expect_parse_ok(
+            "SHOW TABLES LIKE 'aaa' --comments should not in sql case2",
+            DfStatement::ShowTables(DfShowTables::Like(Ident::with_quote('\'', "aaa"))),
+        )?;
+
+        let parse_sql_to_expr = |query_expr: &str| -> Expr {
+            let dialect = GenericDialect {};
+            let mut tokenizer = Tokenizer::new(&dialect, &query_expr);
+            let tokens = tokenizer.tokenize().unwrap();
+            let mut parser = Parser::new(tokens, &dialect);
+            return parser.parse_expr().unwrap();
+        };
+
+        expect_parse_ok(
+            "SHOW TABLES WHERE t LIKE 'aaa'",
+            DfStatement::ShowTables(DfShowTables::Where(parse_sql_to_expr("t LIKE 'aaa'"))),
+        )?;
+
+        expect_parse_ok(
+            "SHOW TABLES WHERE t LIKE 'aaa' AND t LIKE 'a%'",
+            DfStatement::ShowTables(DfShowTables::Where(parse_sql_to_expr(
+                "t LIKE 'aaa' AND t LIKE 'a%'",
+            ))),
+        )?;
 
         Ok(())
     }

query/src/sql/sql_statement.rs

@@ -22,13 +22,18 @@ use nom::character::complete::multispace0;
 use nom::character::complete::multispace1;
 use nom::IResult;
 use sqlparser::ast::ColumnDef;
+use sqlparser::ast::Expr;
 use sqlparser::ast::Ident;
 use sqlparser::ast::ObjectName;
 use sqlparser::ast::SqlOption;
 use sqlparser::ast::Statement as SQLStatement;
 
 #[derive(Debug, Clone, PartialEq)]
-pub struct DfShowTables;
+pub enum DfShowTables {
+    All,
+    Like(Ident),
+    Where(Expr),
+}
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct DfShowDatabases;

tests/suites/0_stateless/06_0000_show_queries.result

@@ -1 +1,14 @@
-t
+t1
+t2
+t3
+t1
+t2
+t3
+t2
+t1
+t2
+t3
+t1
+t2
+t3
+t2

tests/suites/0_stateless/06_0000_show_queries.sql

@@ -1,6 +1,22 @@
-DROP TABLE IF EXISTS t;
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+
+CREATE TABLE t1(c1 int) ENGINE = Null;
+CREATE TABLE t2(c1 int) ENGINE = Null;
+CREATE TABLE t3(c1 int) ENGINE = Null;
 
-CREATE TABLE t(c1 int) ENGINE = Null;
 SHOW TABLES;
 
-DROP TABLE IF EXISTS t;
+SHOW TABLES LIKE 't%';
+SHOW TABLES LIKE 't2';
+SHOW TABLES LIKE 't';
+
+SHOW TABLES WHERE name LIKE 't%';
+SHOW TABLES WHERE name = 't%' AND 1 = 0;
+SHOW TABLES WHERE name = 't2' OR 1 = 1;
+SHOW TABLES WHERE name = 't2' AND 1 = 1;
+
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;