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 2018/01/19 12:28:12 UTC
[3/5] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/253' into asf-master
Merge remote-tracking branch 'remotes/parent/pr/253' into asf-master
# Conflicts:
# docs/doc/src/main/resources/RELEASE-NOTES.txt
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3fa68189
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3fa68189
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3fa68189
Branch: refs/heads/master
Commit: 3fa68189fa90883fa4f0ecadf2da3f76408e2107
Parents: 1e8ed89 66af8b3
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Jan 19 15:21:30 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Jan 19 15:21:30 2018 +0300
----------------------------------------------------------------------
.../apache/cayenne/tools/DbImporterTask.java | 10 +-
.../cayenne/tools/DbImporterTaskTest.java | 39 ++---
.../testExcludeRelationshipFirst.map.xml-result | 40 ++++++
.../tools/testExcludeRelationshipFirst.xml | 38 +++++
.../tools/testExcludeRelationshipFirst.xml.sql | 37 +++++
.../cayenne/dbsync/merge/DataMapMerger.java | 2 +-
.../dbsync/merge/DbRelationshipDictionary.java | 31 +++-
.../dbsync/merge/DbRelationshipMerger.java | 9 +-
.../reverse/dbimport/ExcludeRelationship.java | 34 +++++
.../reverse/dbimport/FilterContainer.java | 26 +++-
.../dbsync/reverse/dbimport/IncludeTable.java | 29 ++++
.../reverse/dbload/RelationshipLoader.java | 39 ++---
.../reverse/filters/FiltersConfigBuilder.java | 63 +++++++-
.../cayenne/tools/model/FilterContainer.java | 20 +++
.../cayenne/tools/model/IncludeTable.java | 21 +++
.../cayenne/tools/model/PatternParam.java | 7 +
.../org/apache/cayenne/tools/DbImportIT.java | 20 +++
.../cayenne/tools/model/IncludeTableTest.java | 12 ++
.../cayenne/tools/dbimport_excludeRel.gradle | 43 ++++++
.../apache/cayenne/tools/exclude_Table.map.xml | 44 ++++++
.../org/apache/cayenne/tools/exclude_Table.sql | 40 ++++++
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
docs/doc/src/main/resources/UPGRADE.txt | 2 +
.../cayenne/tools/DbImporterMojoTest.java | 10 ++
.../dbimport/testExcludeRelationship-pom.xml | 55 +++++++
.../dbimport/testExcludeRelationship.map.xml | 142 +++++++++++++++++++
.../testExcludeRelationship.map.xml-result | 138 ++++++++++++++++++
.../tools/dbimport/testExcludeRelationship.sql | 105 ++++++++++++++
.../testExcludeRelationshipFirst-pom.xml | 49 +++++++
.../testExcludeRelationshipFirst.map.xml-result | 40 ++++++
.../dbimport/testExcludeRelationshipFirst.sql | 37 +++++
31 files changed, 1127 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3fa68189/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index cb8b27c,67e3e02..053c8f7
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -15,7 -15,7 +15,8 @@@ Changes/New Features
CAY-2372 Extract new modules from cayenne-server
CAY-2377 Cleanup deprecated code.
+ CAY-2391 Add excludeRelationship in dbImport
+CAY-2393 Add sqlserver-docker profile to automate tests on SQLServer
Bug Fixes: