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 2024/03/18 14:22:26 UTC

(cayenne) 01/01: Merge pull request #609 from m-dzianishchyts/5.0-CAY-2835-custom-aggregate-functions

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit d745efa595389c037f444e6da1010763b1473c33
Merge: 55acf42bc 299d7a68c
Author: Nikita Timofeev <st...@users.noreply.github.com>
AuthorDate: Mon Mar 18 18:22:19 2024 +0400

    Merge pull request #609 from m-dzianishchyts/5.0-CAY-2835-custom-aggregate-functions
    
    CAY-2835 Custom aggregate functions

 .../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(-)