Merge PR #334
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5855ffc7 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5855ffc7 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5855ffc7 Branch: refs/heads/master Commit: 5855ffc71869661d6efe01105934ad81be97ee7b Parents: 23dc84b 4dbcfd3 Author: Nikita Timofeev <stari...@gmail.com> Authored: Thu Oct 18 16:50:32 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Thu Oct 18 16:50:32 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + .../validation/DbRelationshipValidator.java | 11 +++++++++++ .../validation/ObjRelationshipValidator.java | 17 ++++++++++++++--- .../org/apache/cayenne/map/DbRelationship.java | 6 +++--- 4 files changed, 29 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5855ffc7/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc RELEASE-NOTES.txt index 6762076,c670328..e1c1e28 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -19,8 -19,7 +19,9 @@@ CAY-2471 Support multiple XML project v CAY-2473 Modeler: cleanup attributes and relationship editors CAY-2474 Modeler: swap buttons in dialog toolbar CAY-2475 Modeler: move inheritance icon to name column in objAttr table and objRel table +CAY-2481 Support for Object[] as return type in SQLTemplate and SQLExec +CAY-2487 Removed usage of CayenneException. + CAY-2489 Add validation to the case of not to PK relationships Bug Fixes:
