This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 55acf42bc CAY-2844 Joint prefetch doesn't use ObjEntity qualifier add 299d7a68c CAY-2835 Custom aggregate functions new d745efa59 Merge pull request #609 from m-dzianishchyts/5.0-CAY-2835-custom-aggregate-functions The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cayenne/exp/FunctionExpressionFactory.java | 10 +- .../cayenne/exp/parser/ASTCustomAggregate.java | 79 +++ .../cayenne/exp/parser/ASTCustomFunction.java | 10 +- .../cayenne/exp/parser/ExpressionParser.java | 206 ++++-- .../exp/parser/ExpressionParserConstants.java | 39 +- .../exp/parser/ExpressionParserTokenManager.java | 778 +++++++++++---------- .../exp/parser/ExpressionParserTreeConstants.java | 58 +- .../apache/cayenne/exp/property/BaseProperty.java | 9 + .../org/apache/cayenne/query/ColumnSelect.java | 10 + .../org/apache/cayenne/query/ObjectSelect.java | 10 + .../apache/cayenne/exp/parser/ExpressionParser.jjt | 11 + .../cayenne/exp/parser/ASTAggregateTest.java | 45 +- .../cayenne/exp/parser/ASTCustomAggregateTest.java | 37 + .../cayenne/exp/parser/ASTCustomFunctionTest.java | 2 +- .../org/apache/cayenne/query/ColumnSelectIT.java | 30 +- 15 files changed, 830 insertions(+), 504 deletions(-) create mode 100644 cayenne/src/main/java/org/apache/cayenne/exp/parser/ASTCustomAggregate.java create mode 100644 cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTCustomAggregateTest.java