github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#7712] Add support for Catalogs in JDBCDatabase

Browse Source
This commit is contained in:
lukaseder 2018-08-02 18:13:23 +02:00
parent fb09fbbb81
commit c09ca54349
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jOOQ-meta/src/main/java/org/jooq/meta/jdbc/JDBCDatabase.java
View File

@ -42,6 +42,7 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import org.jooq.Catalog;
import org.jooq.DSLContext;
import org.jooq.Field;
import org.jooq.Schema;
@ -73,7 +74,8 @@ import org.jooq.meta.UDTDefinition;
*/
public class JDBCDatabase extends AbstractDatabase {
private List<Schema> schemas;
private List<Catalog> catalogs;
private List<Schema> schemas;
@Override
protected DSLContext create0() {
@ -119,18 +121,39 @@ public class JDBCDatabase extends AbstractDatabase {
@Override
protected List<CatalogDefinition> getCatalogs0() throws SQLException {
List<CatalogDefinition> result = new ArrayList<CatalogDefinition>();
result.add(new CatalogDefinition(this, "", ""));
for (Catalog catalog : getCatalogsFromMeta())
result.add(new CatalogDefinition(this, catalog.getName(), ""));
return result;
}
private List<Catalog> getCatalogsFromMeta() {
if (catalogs == null) {
catalogs = new ArrayList<Catalog>();
for (Catalog catalog : create().meta().getCatalogs())
catalogs.add(catalog);
}
return catalogs;
}
@Override
protected List<SchemaDefinition> getSchemata0() throws SQLException {
List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
for (Schema schema : getSchemasFromMeta()) {
result.add(new SchemaDefinition(this, schema.getName(), ""));
if (schema.getCatalog() != null) {
if (getCatalog(schema.getCatalog().getName()) != null) {
result.add(new SchemaDefinition(this, schema.getName(), "", getCatalog(schema.getCatalog().getName())));
}
}
else
result.add(new SchemaDefinition(this, schema.getName(), ""));
}
return result;
}
@ -139,8 +162,7 @@ public class JDBCDatabase extends AbstractDatabase {
schemas = new ArrayList<Schema>();
for (Schema schema : create().meta().getSchemas())
if (getInputSchemata().contains(schema.getName()))
schemas.add(schema);
schemas.add(schema);
}
return schemas;
@ -175,11 +197,9 @@ public class JDBCDatabase extends AbstractDatabase {
for (Schema schema : getSchemasFromMeta()) {
SchemaDefinition sd = getSchema(schema.getName());
if (sd != null) {
for (Table<?> table : schema.getTables()) {
if (sd != null)
for (Table<?> table : schema.getTables())
result.add(new JDBCTableDefinition(sd, table));
}
}
}
return result;