You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/05/17 15:12:27 UTC
[1/2] cayenne git commit: CAY-2435 cdbimport: procedure parameters
are not imported
Repository: cayenne
Updated Branches:
refs/heads/master b659b69d5 -> c24c8b9ff
CAY-2435 cdbimport: procedure parameters are not imported
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/17ad5f83
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/17ad5f83
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/17ad5f83
Branch: refs/heads/master
Commit: 17ad5f839e2e3dc73c1d17696b8d27c35a8b67dd
Parents: b659b69
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu May 17 18:07:48 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu May 17 18:07:48 2018 +0300
----------------------------------------------------------------------
.../cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/17ad5f83/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
index f4096a1..23ba96c 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
@@ -58,7 +58,7 @@ public class ProcedureColumnLoader extends PerCatalogAndSchemaLoader {
String procCatalog = rs.getString("PROCEDURE_CAT");
String name = rs.getString("PROCEDURE_NAME");
String key = Procedure.generateFullyQualifiedName(procCatalog, procSchema, name);
- Procedure procedure = map.getProcedure(key);
+ Procedure procedure = map.getProcedure(name);
if (procedure == null) {
return;
}
[2/2] cayenne git commit: code cleanup
Posted by nt...@apache.org.
code cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c24c8b9f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c24c8b9f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c24c8b9f
Branch: refs/heads/master
Commit: c24c8b9ffef4837697cf8717fd6c2287526d62b7
Parents: 17ad5f8
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu May 17 18:08:09 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu May 17 18:08:09 2018 +0300
----------------------------------------------------------------------
.../apache/cayenne/dbsync/reverse/dbload/EntityLoader.java | 2 +-
.../cayenne/modeler/dialog/db/load/DbLoaderContext.java | 9 ++-------
2 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c24c8b9f/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java
----------------------------------------------------------------------
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 7d279a2..ce0d1fd 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
@@ -82,7 +82,7 @@ class EntityLoader extends PerCatalogAndSchemaLoader {
private void addDbEntityToMap(DetectedDbEntity table, DbLoadDataStore map) {
DbEntity oldEnt = map.addDbEntitySafe(table);
if (oldEnt != null) {
- LOGGER.debug("Overwrite DbEntity: " + oldEnt.getName());
+ LOGGER.warn("Overwrite DbEntity: " + oldEnt.getName());
delegate.dbEntityRemoved(oldEnt);
}
delegate.dbEntityAdded(table);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c24c8b9f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
index 4f22c77..9ee8e8f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
@@ -192,12 +192,7 @@ public class DbLoaderContext {
public void processException(final Throwable th, final String message) {
LOGGER.info("Exception on reverse engineering", Util.unwindException(th));
- SwingUtilities.invokeLater(new Runnable() {
-
- public void run() {
- JOptionPane.showMessageDialog(Application.getFrame(), th.getMessage(), message,
- JOptionPane.ERROR_MESSAGE);
- }
- });
+ SwingUtilities.invokeLater(() -> JOptionPane
+ .showMessageDialog(Application.getFrame(), th.getMessage(), message, JOptionPane.ERROR_MESSAGE));
}
}