Merge remote-tracking branch 'remotes/parent/pr/269' 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/9d4f6a44 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9d4f6a44 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9d4f6a44 Branch: refs/heads/master Commit: 9d4f6a44dd9ccd811ad100716ecf88a487fd2092 Parents: 7a2fb98 9183314 Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Feb 14 15:56:47 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Feb 14 15:56:47 2018 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/query/SQLSelect.java | 42 ++++++++++++++++- .../org/apache/cayenne/query/SQLTemplate.java | 22 ++++++--- .../apache/cayenne/access/JointPrefetchIT.java | 48 ++++++++++++++++++++ 3 files changed, 104 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
