Merge branch 'master' into METAMODEL-173 Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/358379e9 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/358379e9 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/358379e9
Branch: refs/heads/master Commit: 358379e930cab180798c9fc86aaa51448928f1d2 Parents: 662422e ddb2454 Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Authored: Tue Aug 18 22:04:21 2015 +0200 Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Committed: Tue Aug 18 22:04:21 2015 +0200 ---------------------------------------------------------------------- CHANGES.md | 1 + .../org/apache/metamodel/MetaModelHelper.java | 4 +- .../metamodel/QueryPostprocessDataContext.java | 4 +- .../metamodel/query/AggregateFunction.java | 54 ++++++++++ .../query/AverageAggregateFunction.java | 33 ++++++ .../metamodel/query/CountAggregateFunction.java | 39 +++++++ .../query/DefaultAggregateFunction.java | 67 ++++++++++++ .../apache/metamodel/query/FunctionType.java | 107 +++---------------- .../metamodel/query/FunctionTypeFactory.java | 43 ++++++++ .../metamodel/query/MaxAggregateBuilder.java | 2 +- .../metamodel/query/MaxAggregateFunction.java | 33 ++++++ .../metamodel/query/MinAggregateFunction.java | 33 ++++++ .../apache/metamodel/query/ScalarFunction.java | 31 ++++++ .../org/apache/metamodel/query/SelectItem.java | 11 +- .../metamodel/query/SumAggregateFunction.java | 33 ++++++ .../query/parser/SelectItemParser.java | 9 +- .../QueryPostprocessDataContextTest.java | 1 + 17 files changed, 398 insertions(+), 107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/358379e9/CHANGES.md ---------------------------------------------------------------------- diff --cc CHANGES.md index e1226e6,a6a82cc..5ce13c4 --- a/CHANGES.md +++ b/CHANGES.md @@@ -1,7 -1,7 +1,8 @@@ ### Apache MetaModel (latest) + * [METAMODEL-173] - Improved CSV writing to non-file destinations. Added .write() and .append() methods to Resource interface. * [METAMODEL-170] - Dropped support for Java 6. + * [METAMODEL-178] - Added AggregateFunction and ScalarFunction interfaces. Changed FunctionType enum to be super-interface of those. Compatibility is retained but a recompile of code using FunctionType is needed. ### Apache MetaModel 4.3.6