Merge remote-tracking branch 'remotes/parent/pr/187' 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/b451beaf Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b451beaf Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b451beaf Branch: refs/heads/master Commit: b451beafb7599964e71089c557c1925ab171bc7b Parents: c560193 e7e3190 Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Apr 7 17:16:02 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Apr 7 17:16:02 2017 +0300 ---------------------------------------------------------------------- .../dbsync/reverse/dbload/ExportedKey.java | 2 +- .../reverse/dbload/RelationshipLoader.java | 22 ++++- .../dbsync/reverse/dbload/ExportedKeyTest.java | 89 ++++++++++++++++++++ docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + 4 files changed, 109 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/b451beaf/docs/doc/src/main/resources/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt index 7ce3bc5,61055f7..3ede2b4 --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@@ -31,9 -30,9 +31,10 @@@ CAY-2277 Create ClientRuntime with Clie Bug Fixes: + CAY-2021 cdbimport: detect when same FK constraint is defined twice CAY-2077 Bug in CayenneRuntimeException using wrong specified string in Formatter CAY-2094 SelectById query doesn't work from ROP client +CAY-2161 'Not for Client Use' option is ignored at Class Generation CAY-2240 Modeler: issue with cursor rendering for EJBQL query CAY-2243 ObjectContext.getGraphManager().unregisterObject() inconsistencies CAY-2250 Remove: Incorrect text in Confirm Remove message when cursor is set on attribute row
