You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/12/19 11:47:24 UTC
[2/2] cayenne git commit: Merge branch '158'
Merge branch '158'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/63ce5710
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/63ce5710
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/63ce5710
Branch: refs/heads/master
Commit: 63ce5710303480c73fbf53249adcf8170c787087
Parents: 2713876 802a525
Author: Savva Kolbachev <s....@gmail.com>
Authored: Mon Dec 19 14:47:03 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Mon Dec 19 14:47:03 2016 +0300
----------------------------------------------------------------------
.../merge/context/EntityMergeSupport.java | 3 ++
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../cayenne/tools/DbImporterMojoTest.java | 5 +++
.../dbimport/testFkAttributeRename-pom.xml | 46 ++++++++++++++++++++
.../dbimport/testFkAttributeRename.map.xml | 44 +++++++++++++++++++
.../testFkAttributeRename.map.xml-result | 45 +++++++++++++++++++
.../tools/dbimport/testFkAttributeRename.sql | 33 ++++++++++++++
7 files changed, 177 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/63ce5710/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/63ce5710/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index 55b2757,238791b..bfa6f15
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -19,10 -19,9 +19,11 @@@ CAY-2165 Explicit "contribution" API fo
CAY-2166 Auto-loading of Cayenne modules
CAY-2168 Split DbLoader to parts and clean it up
CAY-2169 Split DbMerger to parts and clean it up
+CAY-2172 Cleanup Modeler import and migrate db actions
+CAY-2176 Java 7 diamond class generation templates
Bug Fixes:
+ CAY-2174 Change FK attribute name cause ObjAttribute appear after Reverse Engineering
----------------------------------
Release: 4.0.M4