hailin0 commented on code in PR #7261:
URL: https://github.com/apache/seatunnel/pull/7261#discussion_r1693240911
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/redshift/RedshiftCatalog.java:
##########
@@ -80,6 +73,20 @@ public RedshiftCatalog(
this.connectionMap = new ConcurrentHashMap<>();
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where datname='%s'",
databaseName);
+ }
+
+ @Override
+ protected String getTableWithConditionSql(TablePath tablePath) {
+ return String.format(
+ getListTableSql(tablePath.getDatabaseName())
Review Comment:
remove ';' from `getListTableSql()`
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/dm/DamengCatalog.java:
##########
@@ -70,6 +68,20 @@ public DamengCatalog(
super(catalogName, username, pwd, urlInfo, defaultSchema);
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where name='%s'",
databaseName);
Review Comment:
```suggestion
return String.format(getListDatabaseSql() + " where name = '%s'",
databaseName);
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/redshift/RedshiftCatalog.java:
##########
@@ -80,6 +73,20 @@ public RedshiftCatalog(
this.connectionMap = new ConcurrentHashMap<>();
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where datname='%s'",
databaseName);
+ }
+
+ @Override
+ protected String getTableWithConditionSql(TablePath tablePath) {
+ return String.format(
+ getListTableSql(tablePath.getDatabaseName())
+ + " where table_schema = '%s' and table_name= '%s'",
Review Comment:
```suggestion
+ " where table_schema = '%s' and table_name = '%s'",
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/saphana/SapHanaCatalog.java:
##########
@@ -113,6 +109,18 @@ public SapHanaCatalog(
super(catalogName, username, pwd, urlInfo, defaultSchema);
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where SCHEMA_NAME='%s'",
databaseName);
+ }
+
+ @Override
+ protected String getTableWithConditionSql(TablePath tablePath) {
+ return String.format(
+ getListTableSql(tablePath.getDatabaseName()) + " and
TABLE_NAME='%s'",
Review Comment:
```suggestion
getListTableSql(tablePath.getDatabaseName()) + " and
TABLE_NAME = '%s'",
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/redshift/RedshiftCatalog.java:
##########
@@ -80,6 +73,20 @@ public RedshiftCatalog(
this.connectionMap = new ConcurrentHashMap<>();
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where datname='%s'",
databaseName);
Review Comment:
remove ';' from `getListDatabaseSql()`
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/dm/DamengCatalog.java:
##########
@@ -70,6 +68,20 @@ public DamengCatalog(
super(catalogName, username, pwd, urlInfo, defaultSchema);
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where name='%s'",
databaseName);
+ }
+
+ @Override
+ protected String getTableWithConditionSql(TablePath tablePath) {
+ return String.format(
+ getListTableSql(tablePath.getDatabaseName())
+ + " where OWNER = '%s' and TABLE_NAME= '%s'",
Review Comment:
```suggestion
+ " where OWNER = '%s' and TABLE_NAME = '%s'",
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/redshift/RedshiftCatalog.java:
##########
@@ -80,6 +73,20 @@ public RedshiftCatalog(
this.connectionMap = new ConcurrentHashMap<>();
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where datname='%s'",
databaseName);
Review Comment:
```suggestion
return String.format(getListDatabaseSql() + " where datname = '%s'",
databaseName);
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/iris/IrisCatalog.java:
##########
@@ -144,12 +137,24 @@ public boolean databaseExists(String databaseName) throws
CatalogException {
@Override
public boolean tableExists(TablePath tablePath) throws CatalogException {
- try {
- return listTables(tablePath.getSchemaName())
- .contains(tablePath.getSchemaAndTableName());
- } catch (DatabaseNotExistException e) {
+ if (EXCLUDED_SCHEMAS.contains(tablePath.getSchemaName())) {
return false;
}
+ return queryExists(
+ this.getUrlFromDatabaseName(tablePath.getDatabaseName()),
+ getTableWithConditionSql(tablePath));
+ }
+
+ @Override
+ protected String getTableWithConditionSql(TablePath tablePath) {
+ return String.format(
+ getListTableSql(tablePath.getSchemaName()) + " and TABLE_NAME=
'%s'",
Review Comment:
```suggestion
getListTableSql(tablePath.getSchemaName()) + " and
TABLE_NAME = '%s'",
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresCatalog.java:
##########
@@ -104,14 +102,28 @@ public PostgresCatalog(
super(catalogName, username, pwd, urlInfo, defaultSchema);
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where datname='%s'",
databaseName);
+ }
+
+ @Override
+ protected String getTableWithConditionSql(TablePath tablePath) {
+ return String.format(
+ getListTableSql(tablePath.getDatabaseName())
+ + " where table_schema = '%s' and table_name= '%s'",
Review Comment:
```suggestion
+ " where table_schema = '%s' and table_name = '%s'",
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oracle/OracleCatalog.java:
##########
@@ -110,6 +110,21 @@ public OracleCatalog(
super(catalogName, username, pwd, urlInfo, defaultSchema);
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where name = '%s'",
databaseName);
+ }
+
+ @Override
+ protected String getTableWithConditionSql(TablePath tablePath) {
+ return getListTableSql(tablePath.getDatabaseName())
+ + " and OWNER= '"
Review Comment:
```suggestion
+ " and OWNER = '"
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/saphana/SapHanaCatalog.java:
##########
@@ -113,6 +109,18 @@ public SapHanaCatalog(
super(catalogName, username, pwd, urlInfo, defaultSchema);
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where SCHEMA_NAME='%s'",
databaseName);
Review Comment:
```suggestion
return String.format(getListDatabaseSql() + " where SCHEMA_NAME =
'%s'", databaseName);
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/xugu/XuguCatalog.java:
##########
@@ -128,6 +124,20 @@ public XuguCatalog(
super(catalogName, username, pwd, urlInfo, defaultSchema);
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where DB_NAME='%s'",
databaseName);
+ }
+
+ @Override
+ protected String getTableWithConditionSql(TablePath tablePath) {
+ return String.format(
+ getListTableSql(tablePath.getDatabaseName())
+ + " where user_name= '%s' and table_name = '%s'",
Review Comment:
```suggestion
+ " where user_name = '%s' and table_name = '%s'",
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/sqlserver/SqlServerCatalog.java:
##########
@@ -69,6 +68,20 @@ public SqlServerCatalog(
super(catalogName, username, pwd, urlInfo, defaultSchema);
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where name='%s'",
databaseName);
+ }
+
+ @Override
+ protected String getTableWithConditionSql(TablePath tablePath) {
+ return String.format(
+ getListTableSql(tablePath.getDatabaseName())
+ + " and TABLE_SCHEMA= '%s' and TABLE_NAME = '%s'",
Review Comment:
```suggestion
+ " and TABLE_SCHEMA = '%s' and TABLE_NAME = '%s'",
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/xugu/XuguCatalog.java:
##########
@@ -128,6 +124,20 @@ public XuguCatalog(
super(catalogName, username, pwd, urlInfo, defaultSchema);
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where DB_NAME='%s'",
databaseName);
Review Comment:
```suggestion
return String.format(getListDatabaseSql() + " where DB_NAME =
'%s'", databaseName);
```
##########
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/sqlserver/SqlServerCatalog.java:
##########
@@ -69,6 +68,20 @@ public SqlServerCatalog(
super(catalogName, username, pwd, urlInfo, defaultSchema);
}
+ @Override
+ protected String getDatabaseWithConditionSql(String databaseName) {
+ return String.format(getListDatabaseSql() + " where name='%s'",
databaseName);
Review Comment:
```suggestion
return String.format(getListDatabaseSql() + " where name = '%s'",
databaseName);
```
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
