cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skolbac...@apache.org
Subject [2/9] cayenne git commit: Merge branch 'master' of git://git.apache.org/cayenne into modeler-reverseengineering-added-relation-fix
Date Wed, 16 Nov 2016 18:45:57 GMT
Merge branch 'master' of git://git.apache.org/cayenne into modeler-reverseengineering-added-relation-fix


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

Branch: refs/heads/master
Commit: db9a49da9dd4813bb87db3a2d41477dce2db5904
Parents: f2842b9 7293ed6
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Fri Nov 4 17:24:28 2016 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Fri Nov 4 17:24:28 2016 +0300

----------------------------------------------------------------------
 .../dbsync/merge/EntityMergeSupport.java        |  2 +-
 .../naming/DefaultObjectNameGenerator.java      | 69 +++++++++++----
 .../naming/LegacyObjectNameGenerator.java       | 58 -------------
 .../dbsync/naming/ObjectNameGenerator.java      | 24 +++---
 .../cayenne/dbsync/reverse/db/DbLoader.java     | 19 ++--
 .../cayenne/dbsync/reverse/db/ExportedKey.java  |  4 +-
 .../dbsync/merge/EntityMergeSupportIT.java      | 15 ++--
 .../naming/DefaultObjectNameGeneratorTest.java  | 91 +++++++++++---------
 .../naming/LegacyObjectNameGeneratorTest.java   | 55 ------------
 .../dbimport/ManyToManyCandidateEntity.java     | 12 +--
 .../dbimport/ManyToManyCandidateEntityTest.java |  4 +-
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |  1 +
 docs/doc/src/main/resources/UPGRADE.txt         |  4 +
 .../InferRelationshipsControllerBase.java       | 60 +++++++------
 .../dialog/objentity/ObjRelationshipInfo.java   | 21 ++---
 .../modeler/util/NameGeneratorPreferences.java  | 10 +--
 .../tools/dbimport/testOneToOne.map.xml-result  |  4 +-
 17 files changed, 187 insertions(+), 266 deletions(-)
----------------------------------------------------------------------



Mime
View raw message