Merge branch 'master' into CAY-1946
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/28f5793f Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/28f5793f Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/28f5793f Branch: refs/heads/CAY-1946 Commit: 28f5793fbfd3890b55e638ca67ace936eb66ebc1 Parents: 29899e4 a0f941a Author: aadamchik <aadamc...@apache.org> Authored: Sun Nov 16 15:02:16 2014 +0300 Committer: aadamchik <aadamc...@apache.org> Committed: Sun Nov 16 15:02:16 2014 +0300 ---------------------------------------------------------------------- .../java/org/apache/cayenne/exp/Property.java | 19 +- .../apache/cayenne/query/BaseQueryMetadata.java | 6 +- .../org/apache/cayenne/query/ObjectSelect.java | 668 ++++++++++++++++++ .../java/org/apache/cayenne/query/Ordering.java | 696 ++++++++++--------- .../apache/cayenne/query/PrefetchTreeNode.java | 15 + .../org/apache/cayenne/query/SQLSelect.java | 31 +- .../org/apache/cayenne/query/SelectQuery.java | 13 +- .../cayenne/query/SelectQueryMetadata.java | 261 +++---- .../cayenne/remote/IncrementalSelectQuery.java | 5 +- .../apache/cayenne/query/ObjectSelectTest.java | 482 +++++++++++++ .../cayenne/query/ObjectSelect_CompileIT.java | 168 +++++ .../cayenne/query/ObjectSelect_RunIT.java | 94 +++ .../org/apache/cayenne/query/SQLSelectTest.java | 91 +++ .../org/apache/cayenne/query/SelectByIdIT.java | 39 +- docs/doc/src/main/resources/RELEASE-NOTES.txt | 2 + 15 files changed, 2076 insertions(+), 514 deletions(-) ----------------------------------------------------------------------
