From 8ae5dda56136d14a4a11daa2c9d7f242f19fe63b Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 19 Jun 2020 16:35:00 +0200
Subject: [PATCH] removed datetime rule from parser
---
src/main/java/caosdb/server/query/CQLParser.g4 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/caosdb/server/query/CQLParser.g4 b/src/main/java/caosdb/server/query/CQLParser.g4
index af981d6a..1c9ed586 100644
--- a/src/main/java/caosdb/server/query/CQLParser.g4
+++ b/src/main/java/caosdb/server/query/CQLParser.g4
@@ -190,7 +190,7 @@ transaction_time returns [String tqp]
:
(
(ON | IN)
- (datetime {$tqp = $datetime.text;}
+ (value {$tqp = $value.text;}
| entity {$tqp = $entity.ep.toString();})
) | TODAY {$tqp = TransactionFilter.TODAY;}
;
@@ -244,8 +244,8 @@ pov returns [POV filter] locals [Query.Pattern p, String o, String v, String a]
)
| IS_NULL {$o = "0";}
| IS_NOT_NULL {$o = "!0";}
- | IN datetime {$o = "("; $v=$datetime.text;}
- | NEGATION IN datetime {$o = "!("; $v=$datetime.text;}
+ | IN value {$o = "("; $v=$value.str;}
+ | NEGATION IN value {$o = "!("; $v=$value.str;}
)?
)
|
@@ -443,7 +443,7 @@ minmax returns [String agg]
value returns [String str]
:
number {$str = $text;}
- | datetime {$str = $text;}
+ | datetime {$str = $datetime.text; }
| atom {$str = $atom.ep.toString();}
;
--
GitLab