ZhangChaoming commented on code in PR #18386:
URL: https://github.com/apache/flink/pull/18386#discussion_r846407990
##########
flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala:
##########
@@ -696,15 +695,46 @@ class TableEnvironmentTest {
@Test
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)
- assertEquals(
- ResolvedSchema.of(Column.physical("database name", DataTypes.STRING())),
- tableResult2.getResolvedSchema)
- checkData(
- util.Arrays.asList(Row.of("default_database"), Row.of("db1")).iterator(),
- tableResult2.collect())
+ assertThat(tableResult1.getResultKind).isEqualTo(ResultKind.SUCCESS)
+ val tableResult2 = tableEnv.executeSql("CREATE DATABASE db2 COMMENT
'db2_comment'")
+ assertThat(tableResult2.getResultKind).isEqualTo(ResultKind.SUCCESS)
+ val tableResult3 = tableEnv.executeSql("CREATE DATABASE pre_db3 COMMENT
'db3_comment'")
+ assertThat(tableResult3.getResultKind).isEqualTo(ResultKind.SUCCESS)
+
+ val tableResult4 = tableEnv.executeSql("SHOW DATABASES")
+
assertThat(tableResult4.getResultKind).isEqualTo(ResultKind.SUCCESS_WITH_CONTENT)
+ assertThat(ResolvedSchema.of(Column.physical("database name",
DataTypes.STRING())))
+ .isEqualTo(tableResult4.getResolvedSchema)
+ assertThat(CollectionUtil.iteratorToList(tableResult4.collect).toArray())
+ .isEqualTo(util.Arrays.asList(
Review Comment:
OK
##########
flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/TableEnvironmentImpl.java:
##########
@@ -562,11 +563,26 @@ public Table from(TableDescriptor descriptor) {
@Override
public String[] listDatabases() {
- return catalogManager
- .getCatalog(catalogManager.getCurrentCatalog())
- .get()
- .listDatabases()
- .toArray(new String[0]);
+ return listDatabases(catalogManager.getCurrentCatalog());
+ }
+
+ @Override
+ public String[] listDatabases(String catalogName) {
+ return
catalogManager.getCatalog(catalogName).get().listDatabases().stream()
+ .toArray(String[]::new);
+ }
+
+ public String[] listDatabases(String catalogName, boolean notLike, String
likePattern) {
Review Comment:
Fine
--
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
