cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [2/2] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/226' into asf-master
Date Wed, 07 Jun 2017 14:59:51 GMT
Merge remote-tracking branch 'remotes/parent/pr/226' into asf-master


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

Branch: refs/heads/master
Commit: 0f948b3bc9df9c826e1a5d90ddeb6e196f7a12d0
Parents: 34e9609 e37312d
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Wed Jun 7 17:58:29 2017 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Wed Jun 7 17:58:29 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(-)
----------------------------------------------------------------------



Mime
View raw message