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 08:14:21 UTC
[2/4] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/275' into asf-master
Merge remote-tracking branch 'remotes/parent/pr/275' into asf-master
# Conflicts:
# modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryMainTab.java
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/927b068b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/927b068b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/927b068b
Branch: refs/heads/master
Commit: 927b068b46923b00c355f99f1c76f26b45fa8674
Parents: 7758dbf b3e513c
Author: stariy <st...@gmail.com>
Authored: Mon Mar 5 10:52:08 2018 +0300
Committer: stariy <st...@gmail.com>
Committed: Mon Mar 5 10:52:08 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../validation/SelectQueryValidator.java | 4 +-
.../xml/QueryDescriptorHandler.java | 29 +++-
.../cayenne/map/QueryDescriptorLoader.java | 15 +-
.../cayenne/map/SQLTemplateDescriptor.java | 38 ++---
.../cayenne/map/SelectQueryDescriptor.java | 62 ++++++--
.../org/apache/cayenne/schema/10/modelMap.xsd | 12 +-
.../PrefetchTypeForSelectQueryHandlerTest.java | 33 +++++
.../PrefetchTypeForSqlTemplateHandlerTest.java | 51 +++++++
.../PrefetchTypeForSelectQueryHandlerTest.xml | 25 ++++
.../PrefetchTypeForSqlTemplateHandlerTest.xml | 26 ++++
.../modeler/editor/SQLTemplatePrefetchTab.java | 147 +++++++++++++------
.../modeler/editor/SelectQueryOrderingTab.java | 67 ++++-----
.../modeler/editor/SelectQueryPrefetchTab.java | 139 +++++++++++++-----
14 files changed, 485 insertions(+), 164 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/927b068b/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index fd87dd5,1153f26..09b4d9c
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -23,8 -23,8 +23,9 @@@ 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
+ CAY-2410 Add prefetch type support for SQLTemplate query and SelectQuery
Bug Fixes: