This is an automated email from the ASF dual-hosted git repository. abulatski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 76b2387342f04124aaa220ca816d440e5122bce5 Author: Arseni Bulatski <[email protected]> AuthorDate: Mon Sep 2 15:42:38 2019 +0300 CAY-2612 Modeler: add lazy-loading to dbImport tab --- .../java/org/apache/cayenne/dbsync/merge/DbEntityDictionary.java | 7 +++---- .../org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbEntityDictionary.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbEntityDictionary.java index 84319d5..3cb950d 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbEntityDictionary.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbEntityDictionary.java @@ -19,14 +19,14 @@ package org.apache.cayenne.dbsync.merge; +import java.util.Collection; +import java.util.LinkedList; + import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig; import org.apache.cayenne.dbsync.reverse.filters.TableFilter; import org.apache.cayenne.map.DataMap; import org.apache.cayenne.map.DbEntity; -import java.util.Collection; -import java.util.LinkedList; - class DbEntityDictionary extends MergerDictionary<DbEntity> { private final DataMap container; @@ -40,7 +40,6 @@ class DbEntityDictionary extends MergerDictionary<DbEntity> { @Override String getName(DbEntity entity) { -// return entity.getFullyQualifiedName(); return entity.getName(); } diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java index a4e044d..0fddbba 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java @@ -75,7 +75,7 @@ class EntityLoader extends PerCatalogAndSchemaLoader { } DetectedDbEntity table = new DetectedDbEntity(name); - table.setCatalog(catalogName); + table.setCatalog(catalogName != null ? catalogName : catalog.name); table.setSchema(schemaName); table.setType(type); addDbEntityToMap(table, map);
