Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

caosdb-server
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

b5e10adf

Commit b5e10adf authored 4 years ago by Florian Spreckelsen

Downloads
- Plain Diff

Merge branch 'f-query-keyword-in-value' into 'dev'

f-query-keyword-in-value -> dev

Closes #116 and #31

See merge request caosdb/caosdb-server!78

parents b501152d 3f958668

No related branches found

No related tags found

1 merge request!21Release v0.4.0

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 3 additions, 0 deletions

CHANGELOG.md
src/main/java/org/caosdb/server/query/CQLLexer.g4 86 additions, 73 deletions

src/main/java/org/caosdb/server/query/CQLLexer.g4
src/main/java/org/caosdb/server/query/CQLParser.g4 48 additions, 36 deletions

src/main/java/org/caosdb/server/query/CQLParser.g4
src/main/java/org/caosdb/server/query/Query.java 113 additions, 10 deletions

src/main/java/org/caosdb/server/query/Query.java
src/test/java/org/caosdb/server/query/QueryTest.java 13 additions, 0 deletions

src/test/java/org/caosdb/server/query/QueryTest.java
src/test/java/org/caosdb/server/query/TestCQL.java 1271 additions, 1056 deletions

src/test/java/org/caosdb/server/query/TestCQL.java

with 1534 additions and 1175 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment