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 2017/06/07 15:00:59 UTC

[2/2] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/226' into asf-STABLE-4.0

Merge remote-tracking branch 'remotes/parent/pr/226' into asf-STABLE-4.0


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

Branch: refs/heads/STABLE-4.0
Commit: b9e7fd9744a9306ca87f3eccde2a31d1e7eb1aae
Parents: 43d2ae6 e37312d
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Jun 7 18:00:26 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Jun 7 18:00:26 2017 +0300

----------------------------------------------------------------------
 .../dbsync/merge/DbRelationshipMerger.java      | 10 ++--
 .../cayenne/tools/DbImporterMojoTest.java       |  5 ++
 .../dbimport/testImportNewRelationship-pom.xml  | 44 ++++++++++++++++++
 .../dbimport/testImportNewRelationship.map.xml  | 32 +++++++++++++
 .../testImportNewRelationship.map.xml-result    | 48 ++++++++++++++++++++
 .../dbimport/testImportNewRelationship.sql      | 33 ++++++++++++++
 6 files changed, 168 insertions(+), 4 deletions(-)
----------------------------------------------------------------------