This is an automated email from the ASF dual-hosted git repository.
wuchunfu pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 3cf09f61ca [Improve][Jdbc] Remove oracle 'v$database' query (#8571)
3cf09f61ca is described below
commit 3cf09f61ca1774002f53913702dbca67067e2efa
Author: hailin0 <[email protected]>
AuthorDate: Thu Jan 23 10:47:58 2025 +0800
[Improve][Jdbc] Remove oracle 'v$database' query (#8571)
---
.../jdbc/catalog/oracle/OracleCatalog.java | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oracle/OracleCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oracle/OracleCatalog.java
index ccbbfb509d..3a90c61c6d 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oracle/OracleCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oracle/OracleCatalog.java
@@ -21,6 +21,7 @@ import org.apache.seatunnel.api.table.catalog.CatalogTable;
import org.apache.seatunnel.api.table.catalog.Column;
import org.apache.seatunnel.api.table.catalog.ConstraintKey;
import org.apache.seatunnel.api.table.catalog.TablePath;
+import org.apache.seatunnel.api.table.catalog.exception.CatalogException;
import org.apache.seatunnel.api.table.converter.BasicTypeDefine;
import org.apache.seatunnel.common.utils.JdbcUrlUtil;
import
org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.AbstractJdbcCatalog;
@@ -36,6 +37,7 @@ import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
@Slf4j
@@ -100,11 +102,6 @@ public class OracleCatalog extends AbstractJdbcCatalog {
this.decimalTypeNarrowing = decimalTypeNarrowing;
}
- @Override
- protected String getDatabaseWithConditionSql(String databaseName) {
- return String.format(getListDatabaseSql() + " where name = '%s'",
databaseName);
- }
-
@Override
protected String getTableWithConditionSql(TablePath tablePath) {
return getListTableSql(tablePath.getDatabaseName())
@@ -116,8 +113,13 @@ public class OracleCatalog extends AbstractJdbcCatalog {
}
@Override
- protected String getListDatabaseSql() {
- return "SELECT name FROM v$database";
+ public boolean databaseExists(String databaseName) throws CatalogException
{
+ return true;
+ }
+
+ @Override
+ public List<String> listDatabases() throws CatalogException {
+ return new ArrayList<>(Collections.singletonList("default"));
}
@Override
@@ -195,11 +197,6 @@ public class OracleCatalog extends AbstractJdbcCatalog {
return tablePath.getSchemaAndTableName();
}
- private List<String> listTables() {
- List<String> databases = listDatabases();
- return listTables(databases.get(0));
- }
-
@Override
public CatalogTable getTable(String sqlQuery) throws SQLException {
Connection defaultConnection = getConnection(defaultUrl);