Skip to content

Add a Browse button to select a schema #5438 #8179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hansva merged 1 commit into from
Aug 31, 2026
Merged

Add a Browse button to select a schema #5438 #8179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 26 additions & 78 deletions core/src/main/java/org/apache/hop/core/database/Database.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3783,16 +3783,15 @@ public IRowMeta getReturnRowMeta() {
}

public String[] getTableTypes() throws HopDatabaseException {
try {
try (ResultSet resultSet = getDatabaseMetaData().getTableTypes()) {
ArrayList<String> types = new ArrayList<>();

ResultSet rstt = getDatabaseMetaData().getTableTypes();
while (rstt.next()) {
String ttype = rstt.getString("TABLE_TYPE");
while (resultSet.next()) {
String ttype = resultSet.getString("TABLE_TYPE");
types.add(ttype);
}

return types.toArray(new String[types.size()]);
types.sort(String.CASE_INSENSITIVE_ORDER);
return types.toArray(new String[0]);
} catch (SQLException e) {
throw new HopDatabaseException("Unable to get table types from database!", e);
}
Expand Down Expand Up @@ -3827,7 +3826,7 @@ public String[] getTablenames(
}
}
res.sort(String.CASE_INSENSITIVE_ORDER);
return res.toArray(new String[res.size()]);
return res.toArray(new String[0]);
}

public Map<String, Collection<String>> getTableMap() throws HopDatabaseException {
Expand All @@ -3847,10 +3846,8 @@ public Map<String, Collection<String>> getTableMap(String schemanamein, Map<Stri
schemaname = resolve(databaseMeta.getUsername()).toUpperCase();
}
Map<String, Collection<String>> tableMap = new HashMap<>();
ResultSet alltables = null;
try {
alltables =
getDatabaseMetaData().getTables(null, schemaname, null, databaseMeta.getTableTypes());
try (ResultSet alltables =
getDatabaseMetaData().getTables(null, schemaname, null, databaseMeta.getTableTypes())) {
while (alltables.next()) {
String cat = "";
try {
Expand Down Expand Up @@ -3905,15 +3902,6 @@ public Map<String, Collection<String>> getTableMap(String schemanamein, Map<Stri
}
} catch (SQLException e) {
log.logError("Error getting tablenames from schema [" + schemaname + "]");
} finally {
try {
if (alltables != null) {
alltables.close();
}
} catch (SQLException e) {
throw new HopDatabaseException(
"Error closing resultset after getting views from schema [" + schemaname + "]", e);
}
}

if (log.isDetailed()) {
Expand Down Expand Up @@ -3945,7 +3933,7 @@ public String[] getViews(String schemanamein, boolean includeSchema) throws HopD
}
}
res.sort(String.CASE_INSENSITIVE_ORDER);
return res.toArray(new String[res.size()]);
return res.toArray(new String[0]);
}

public Map<String, Collection<String>> getViewMap() throws HopDatabaseException {
Expand All @@ -3964,10 +3952,8 @@ public Map<String, Collection<String>> getViewMap(String schemanamein)
}

Map<String, Collection<String>> viewMap = new HashMap<>();
ResultSet allviews = null;
try {
allviews =
getDatabaseMetaData().getTables(null, schemaname, null, databaseMeta.getViewTypes());
try (ResultSet allviews =
getDatabaseMetaData().getTables(null, schemaname, null, databaseMeta.getViewTypes())) {
while (allviews.next()) {
String cat = "";
try {
Expand Down Expand Up @@ -4005,15 +3991,6 @@ public Map<String, Collection<String>> getViewMap(String schemanamein)
}
} catch (SQLException e) {
throw new HopDatabaseException("Error getting views from schema [" + schemaname + "]", e);
} finally {
try {
if (allviews != null) {
allviews.close();
}
} catch (SQLException e) {
throw new HopDatabaseException(
"Error closing resultset after getting views from schema [" + schemaname + "]", e);
}
}

if (log.isDetailed()) {
Expand Down Expand Up @@ -4046,7 +4023,7 @@ public String[] getSynonyms(String schemanamein, boolean includeSchema)
}
}
res.sort(String.CASE_INSENSITIVE_ORDER);
return res.toArray(new String[res.size()]);
return res.toArray(new String[0]);
}

public Map<String, Collection<String>> getSynonymMap() throws HopDatabaseException {
Expand All @@ -4064,10 +4041,8 @@ public Map<String, Collection<String>> getSynonymMap(String schemanamein)
schemaname = resolve(databaseMeta.getUsername()).toUpperCase();
}
Map<String, Collection<String>> synonymMap = new HashMap<>();
ResultSet alltables = null;
try {
alltables =
getDatabaseMetaData().getTables(null, schemaname, null, databaseMeta.getSynonymTypes());
try (ResultSet alltables =
getDatabaseMetaData().getTables(null, schemaname, null, databaseMeta.getSynonymTypes())) {
while (alltables.next()) {
String cat = "";
try {
Expand Down Expand Up @@ -4105,15 +4080,6 @@ public Map<String, Collection<String>> getSynonymMap(String schemanamein)
}
} catch (SQLException e) {
throw new HopDatabaseException("Error getting synonyms from schema [" + schemaname + "]", e);
} finally {
try {
if (alltables != null) {
alltables.close();
}
} catch (SQLException e) {
throw new HopDatabaseException(
"Error closing resultset after getting synonyms from schema [" + schemaname + "]", e);
}
}

if (log.isDetailed()) {
Expand Down Expand Up @@ -4141,59 +4107,41 @@ private <K, V> int multimapSize(final Map<K, Collection<V>> map) {
}

public String[] getSchemas() throws HopDatabaseException {
ArrayList<String> catalogList = new ArrayList<>();
ResultSet catalogResultSet = null;
try {
catalogResultSet = getDatabaseMetaData().getSchemas();
ArrayList<String> schemaList = new ArrayList<>();
try (ResultSet resultSet = getDatabaseMetaData().getSchemas()) {
// Grab all the catalog names and put them in an array list
while (catalogResultSet != null && catalogResultSet.next()) {
catalogList.add(catalogResultSet.getString(1));
while (resultSet != null && resultSet.next()) {
schemaList.add(resultSet.getString(1));
}
} catch (SQLException e) {
throw new HopDatabaseException("Error getting schemas!", e);
} finally {
try {
if (catalogResultSet != null) {
catalogResultSet.close();
}
} catch (SQLException e) {
throw new HopDatabaseException("Error closing resultset after getting schemas!", e);
}
}

if (log.isDetailed()) {
log.logDetailed(CONST_READ + catalogList.size() + " schemas from db meta-data.");
log.logDetailed(CONST_READ + schemaList.size() + " schemas from db meta-data.");
}

return catalogList.toArray(new String[catalogList.size()]);
schemaList.sort(String.CASE_INSENSITIVE_ORDER);
return schemaList.toArray(new String[0]);
}

public String[] getCatalogs() throws HopDatabaseException {
ArrayList<String> catalogList = new ArrayList<>();
ResultSet catalogResultSet = null;
try {
catalogResultSet = getDatabaseMetaData().getCatalogs();
try (ResultSet resultSet = getDatabaseMetaData().getCatalogs()) {
// Grab all the catalog names and put them in an array list
while (catalogResultSet != null && catalogResultSet.next()) {
catalogList.add(catalogResultSet.getString(1));
while (resultSet != null && resultSet.next()) {
catalogList.add(resultSet.getString(1));
}
} catch (SQLException e) {
throw new HopDatabaseException("Error getting catalogs!", e);
} finally {
try {
if (catalogResultSet != null) {
catalogResultSet.close();
}
} catch (SQLException e) {
throw new HopDatabaseException("Error closing resultset after getting catalogs!", e);
}
}

if (log.isDetailed()) {
log.logDetailed(CONST_READ + catalogList.size() + " catalogs from db meta-data.");
}

return catalogList.toArray(new String[catalogList.size()]);
catalogList.sort(String.CASE_INSENSITIVE_ORDER);
return catalogList.toArray(new String[0]);
}

public String[] getProcedures() throws HopDatabaseException {
Expand Down
9 changes: 3 additions & 6 deletions ...ts/src/main/java/org/apache/hop/workflow/actions/tableexists/ActionTableExistsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,21 +191,18 @@ private void getSchemaNames() {
try (Database database = new Database(loggingObject, variables, databaseMeta)) {
database.connect();
String[] schemas = database.getSchemas();

if (null != schemas && schemas.length > 0) {
schemas = Const.sortStrings(schemas);
EnterSelectionDialog dialog =
new EnterSelectionDialog(
shell,
schemas,
BaseMessages.getString(
PKG, "System.Dialog.AvailableSchemas.Title", wConnection.getText()),
BaseMessages.getString(PKG, "System.Dialog.AvailableSchemas.Message"));
String d = dialog.open();
if (d != null) {
wSchemaname.setText(Const.NVL(d.toString(), ""));
String name = dialog.open();
if (name != null) {
wSchemaname.setText(name);
}

} else {
MessageBox mb = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR);
mb.setMessage(
Expand Down
Loading
Loading