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 277cf0f9716a3aeac1b999c9d370d5943232bfa4
Merge: a216c7f e1cbbb7
Author: Arseni Bulatski <ancars...@gmail.com>
AuthorDate: Mon Sep 2 16:35:06 2019 +0300
Merger PR #405
RELEASE-NOTES.txt | 1 +
.../cayenne/dbsync/merge/DbEntityDictionary.java | 7 +-
.../dbsync/reverse/dbload/EntityLoader.java | 4 +-
.../cayenne/dbsync/reverse/dbload/ExportedKey.java | 8 +-
.../dbsync/reverse/dbload/ExportedKeyLoader.java | 8 +-
.../dbsync/reverse/dbload/ExportedKeyTest.java | 6 +-
.../org/apache/cayenne/dba/mysql/MySQLAdapter.java | 4 +-
.../cayenne/dba/postgres/PostgresAdapter.java | 32 ++--
.../cayenne/dba/sqlserver/SQLServerAdapter.java | 5 +-
.../cayenne/modeler/action/LoadDbSchemaAction.java | 69 +++++++--
.../editor/dbimport/DatabaseSchemaLoader.java | 169 ++++++++++++---------
.../modeler/editor/dbimport/DbImportTree.java | 60 ++++----
.../editor/dbimport/PrintColumnsBiFunction.java | 55 +++++++
.../editor/dbimport/PrintTablesBiFunction.java | 65 ++++++++
14 files changed, 339 insertions(+), 154 deletions(-)
diff --cc RELEASE-NOTES.txt
index 21fa8ca,2f57bc1..989fc11
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -42,9 -42,9 +42,10 @@@ CAY-2590 Add method to set query timeou
CAY-2592 Modeler: make all datamaps selected in global cgen tab
CAY-2593 Add tableTypes field to dbImport config in dataMap
CAY-2602 Remove RTRIM of char columns in Sybase
+CAY-2604 Specialization of property API for PK
CAY-2610 Align methods in ObjectSelect and SQLSelect
CAY-2611 Exclude system catalogs and schemas when run dbImport without config
+ CAY-2612 Modeler: add lazy-loading to dbImport tab
Bug Fixes:
