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/03/05 07:47:34 UTC
[3/4] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/274' into asf-master
Merge remote-tracking branch 'remotes/parent/pr/274' into asf-master
# 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/f86af37f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f86af37f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f86af37f
Branch: refs/heads/master
Commit: f86af37f6293494baa2616f67b8447429639724d
Parents: fd0d06e 193c6aa
Author: stariy <st...@gmail.com>
Authored: Mon Mar 5 10:13:29 2018 +0300
Committer: stariy <st...@gmail.com>
Committed: Mon Mar 5 10:13:29 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../cayenne/map/QueryDescriptorLoader.java | 1 +
.../cayenne/map/SQLTemplateDescriptor.java | 51 +++
.../org/apache/cayenne/query/SQLTemplate.java | 1 +
.../modeler/editor/SQLTemplateMainTab.java | 116 ++++-
.../modeler/editor/SQLTemplatePrefetchTab.java | 423 +++++++++++++++++++
.../modeler/editor/SQLTemplateTabbedView.java | 7 +
.../AddPrefetchUndoableEditForSqlTemplate.java | 35 ++
8 files changed, 632 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f86af37f/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index af9c490,cfd075a..fd87dd5
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -23,7 -23,7 +23,8 @@@ CAY-2395 cdbimport: add option to creat
CAY-2396 Upgrade maven-assembly-plugin to 3.1.0
CAY-2403 Extract eventbridges to top level
CAY-2404 Move itests to maven-plugins
+CAY-2406 Add prefetch-related API to SQLSelect
+ CAY-2407 Modeler: add prefetch support for the SQLTemplate query
Bug Fixes:
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f86af37f/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
----------------------------------------------------------------------