ZhangChaoming commented on a change in pull request #18386: URL: https://github.com/apache/flink/pull/18386#discussion_r840195326
########## File path: flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala ########## @@ -656,14 +656,49 @@ class TableEnvironmentTest { def testExecuteSqlWithShowDatabases(): Unit = { val tableResult1 = tableEnv.executeSql("CREATE DATABASE db1 COMMENT 'db1_comment'") assertEquals(ResultKind.SUCCESS, tableResult1.getResultKind) - val tableResult2 = tableEnv.executeSql("SHOW DATABASES") - assertEquals(ResultKind.SUCCESS_WITH_CONTENT, tableResult2.getResultKind) + val tableResult2 = tableEnv.executeSql("CREATE DATABASE db2 COMMENT 'db2_comment'") + assertEquals(ResultKind.SUCCESS, tableResult2.getResultKind) + val tableResult3 = tableEnv.executeSql("CREATE DATABASE pre_db3 COMMENT 'db3_comment'") + assertEquals(ResultKind.SUCCESS, tableResult3.getResultKind) + + val tableResult4 = tableEnv.executeSql("SHOW DATABASES") + assertEquals(ResultKind.SUCCESS_WITH_CONTENT, tableResult4.getResultKind) assertEquals( ResolvedSchema.of(Column.physical("database name", DataTypes.STRING())), - tableResult2.getResolvedSchema) + tableResult4.getResolvedSchema) checkData( - util.Arrays.asList(Row.of("default_database"), Row.of("db1")).iterator(), - tableResult2.collect()) + util.Arrays.asList(Row.of("default_database"), + Row.of("db1"), + Row.of("db2"), + Row.of("pre_db3")).iterator(), + tableResult4.collect()) + + val tableResult5 = tableEnv.executeSql("SHOW DATABASES LIKE 'db%'") + assertEquals(ResultKind.SUCCESS_WITH_CONTENT, tableResult5.getResultKind) + assertEquals( + ResolvedSchema.of(Column.physical("database name", DataTypes.STRING())), + tableResult5.getResolvedSchema) + checkData( + util.Arrays.asList(Row.of("db1"), Row.of("db2")).iterator(), + tableResult5.collect()) + + val tableResult6 = tableEnv.executeSql("SHOW DATABASES LIKE '_re%'") + assertEquals(ResultKind.SUCCESS_WITH_CONTENT, tableResult6.getResultKind) + assertEquals( + ResolvedSchema.of(Column.physical("database name", DataTypes.STRING())), + tableResult6.getResolvedSchema) Review comment: OK ########## File path: flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala ########## @@ -656,14 +656,49 @@ class TableEnvironmentTest { def testExecuteSqlWithShowDatabases(): Unit = { val tableResult1 = tableEnv.executeSql("CREATE DATABASE db1 COMMENT 'db1_comment'") assertEquals(ResultKind.SUCCESS, tableResult1.getResultKind) - val tableResult2 = tableEnv.executeSql("SHOW DATABASES") - assertEquals(ResultKind.SUCCESS_WITH_CONTENT, tableResult2.getResultKind) + val tableResult2 = tableEnv.executeSql("CREATE DATABASE db2 COMMENT 'db2_comment'") + assertEquals(ResultKind.SUCCESS, tableResult2.getResultKind) + val tableResult3 = tableEnv.executeSql("CREATE DATABASE pre_db3 COMMENT 'db3_comment'") + assertEquals(ResultKind.SUCCESS, tableResult3.getResultKind) + + val tableResult4 = tableEnv.executeSql("SHOW DATABASES") + assertEquals(ResultKind.SUCCESS_WITH_CONTENT, tableResult4.getResultKind) assertEquals( ResolvedSchema.of(Column.physical("database name", DataTypes.STRING())), - tableResult2.getResolvedSchema) + tableResult4.getResolvedSchema) checkData( - util.Arrays.asList(Row.of("default_database"), Row.of("db1")).iterator(), - tableResult2.collect()) + util.Arrays.asList(Row.of("default_database"), + Row.of("db1"), + Row.of("db2"), + Row.of("pre_db3")).iterator(), + tableResult4.collect()) Review comment: OK ########## File path: flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/operations/SqlToOperationConverterTest.java ########## @@ -1668,6 +1669,41 @@ public void testShowJars() { assertThat(showModulesOperation.asSummaryString()).isEqualTo("SHOW JARS"); } + @Test + public void testShowDatabase() { + Operation operation = parse("SHOW DATABASES like 't%'", SqlDialect.DEFAULT); + assert operation instanceof ShowDatabasesOperation; + + ShowDatabasesOperation showTablesOperation = (ShowDatabasesOperation) operation; + assertThat(showTablesOperation.getCatalogName()).isEqualTo(null); Review comment: OK -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@flink.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org