Merge PR #297 # Conflicts: # 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/ae957c22 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ae957c22 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ae957c22 Branch: refs/heads/master Commit: ae957c22db1692c3e855541316fa866115026055 Parents: df85a7a ee33e55 Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Jul 11 15:00:41 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Jul 11 15:00:41 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 3 +- .../cayenne/access/jdbc/SQLTemplateAction.java | 37 ++++++++++++-------- .../java/org/apache/cayenne/query/SQLExec.java | 22 ++++++++++++ .../org/apache/cayenne/query/SQLTemplate.java | 20 +++++++++++ .../org/apache/cayenne/query/SQLExecIT.java | 21 +++++++++-- .../org/apache/cayenne/query/SQLTemplateIT.java | 22 ++++++++++++ 6 files changed, 106 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/ae957c22/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc RELEASE-NOTES.txt index 8ae3d03,43f176e..423ae59 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -35,9 -35,8 +35,9 @@@ CAY-2414 Modeler: new icon desig CAY-2415 Transaction isolation and propagation support CAY-2416 Change TreeMap for HashMap to store data in Cayenne model classes CAY-2422 Modeler: Open driver setup window on driver load error +CAY-2438 Split DataChannel filter into two independent filters CAY-2440 cdbimport: allow cross-schema relationships - CAY-2439 Error deleting dbEntity when show only dbEntities filter is set + CAY-2443 Make SqlTemplate and SqlExec possible to return generated keys Bug Fixes: @@@ -64,7 -63,6 +64,8 @@@ CAY-2429 Generate classes: Invalid temp CAY-2430 Modeler: Redo throws NPE CAY-2435 cdbimport: procedure parameters are not imported CAY-2436 NPE in CayenneRuntimeException constructor ++CAY-2439 Error deleting dbEntity when show only dbEntities filter is set +CAY-2442 Broken EventBridge providers implementations ---------------------------------- Release: 4.1.M1
