cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject cayenne git commit: CAY-2501 Modeler: DbImport ui not loading columns for MySQL connector v8.0
Date Tue, 11 Dec 2018 13:21:09 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master f41f1e9e6 -> 3d3332d2e


CAY-2501 Modeler: DbImport ui not loading columns for MySQL connector v8.0


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3d3332d2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3d3332d2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3d3332d2

Branch: refs/heads/master
Commit: 3d3332d2edcf98ff5450d7cb8fb6e781decc3029
Parents: f41f1e9
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Tue Dec 11 16:20:52 2018 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Tue Dec 11 16:20:52 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                                                  | 1 +
 .../cayenne/modeler/editor/dbimport/DatabaseSchemaLoader.java      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/3d3332d2/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 45a03a4..1ee77c6 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -50,6 +50,7 @@ CAY-2484 maven plugins missing in 4.1.M2 release
 CAY-2490 Added dbEntities from other datamaps in dbRelationship dialog.
 CAY-2496 Fixed wrong table behavior: focus color, cleanup DBAttribute Path cell on select.
 CAY-2497 Modeler: SQL Scripts tab isn't scrollable
+CAY-2501 Modeler: DbImport ui not loading columns for MySQL connector v8.0
 
 ----------------------------------
 Release: 4.1.M2

http://git-wip-us.apache.org/repos/asf/cayenne/blob/3d3332d2/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DatabaseSchemaLoader.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DatabaseSchemaLoader.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DatabaseSchemaLoader.java
index 43dc96c..c18dedf 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DatabaseSchemaLoader.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DatabaseSchemaLoader.java
@@ -84,7 +84,7 @@ public class DatabaseSchemaLoader {
         String tableName = path.getPathComponent(2).toString();
 
         try (Connection connection = connectionInfo.makeDataSource(loadingService).getConnection())
{
-            try (ResultSet rs = connection.getMetaData().getColumns(catalogName, schemaName,
tableName, "")) {
+            try (ResultSet rs = connection.getMetaData().getColumns(catalogName, schemaName,
tableName, null)) {
                 while (rs.next()) {
                     String column = rs.getString(4);
                     packTable(tableName, catalogName, schemaName, column);


Mime
View raw message