Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/metamodel.git
Conflicts:
CHANGES.md
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/44f6c608
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/44f6c608
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/44f6c608
Branch: refs/heads/master
Commit: 44f6c608b959d831d2b5a49082ae8606b9a19c4e
Parents: ef234d0 edb10a1
Author: Kasper Sørensen <[email protected]>
Authored: Thu Mar 12 09:16:29 2015 +0100
Committer: Kasper Sørensen <[email protected]>
Committed: Thu Mar 12 09:16:29 2015 +0100
----------------------------------------------------------------------
CHANGES.md | 3 +-
.../java/org/apache/metamodel/query/Query.java | 4 +-
.../metamodel/query/parser/QueryParser.java | 2 +-
.../query/parser/SelectItemParser.java | 2 +-
.../metamodel/query/parser/QueryParserTest.java | 40 ++++++++++++++++++++
5 files changed, 47 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/44f6c608/CHANGES.md
----------------------------------------------------------------------
diff --cc CHANGES.md
index 4c4ea77,28171a2..8858c1f
--- a/CHANGES.md
+++ b/CHANGES.md
@@@ -2,7 -2,7 +2,8 @@@
* [METAMODEL-78] - Fixed a bug that caused SELECT DISTINCT to sometimes
return duplicates records on certain DataContext implementations.
* [METAMODEL-106] - Improved handling of invalid or non-existing index names
passed to ElasticSearchDataContext
+ * [METAMODEL-79] - Added update execution support on ElasticSearch module.
Increased capability of pushing down WHERE items to ElasticSearch searches.
+ * [METAMODEL-115] - Improved query parsing to allow lower-case function
names, operators etc.
### Apache MetaModel 4.3.1
@@@ -66,4 -66,4 +67,4 @@@
* [METAMODEL-10] - Exclude Jackcess dependency (Access module) from MetaModel
* Renaming the package hierarchy from org.eobjects.metamodel to
org.apache.metamodel
* [METAMODEL-29] - Fixed issue in CreateTable builder class, causing it to
only support a single column definition
-- * [METAMODEL-30] - Fixed issue with count(*) queries on CSV resources that
does not provide a byte stream length
++ * [METAMODEL-30] - Fixed issue with count(*) queries on CSV resources that
does not provide a byte stream length
