tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix e function in openCypher

Browse Source 
Summary:
For reasons unknown to man, antlr didn't want to parse calls
to functions whose name is a single hex letter properly. Now it should work.

Reviewers: teon.banek, buda

Reviewed By: teon.banek

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D1464
This commit is contained in:
Marin Tomic 2018-07-02 15:55:58 +02:00
parent 0e8d22eced
commit 2b04d8213d
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/query/frontend/opencypher/grammar/Cypher.g4
View File

@ -239,6 +239,7 @@ functionInvocation : functionName SP? '(' SP? ( DISTINCT SP? )? ( expression SP?
functionName : UnescapedSymbolicName
| EscapedSymbolicName
| HexLetter
| COUNT ;
listComprehension : '[' SP? filterExpression ( SP? '|' SP? expression )? SP? ']' ;

15
tests/unit/cypher_main_visitor.cpp
View File

@ -768,6 +768,21 @@ TYPED_TEST(CypherMainVisitorTest, UndefinedFunction) {
SemanticException);
}
TYPED_TEST(CypherMainVisitorTest, FunctionSpecialCase) {
// For some reason parsing of function calls with single letter name in a-f
// range would fail, so here's a test for that (also see D1464).
TypeParam ast_generator("RETURN e()");
auto *query = ast_generator.query_;
ASSERT_TRUE(query->single_query_);
auto *single_query = query->single_query_;
auto *return_clause = dynamic_cast<Return *>(single_query->clauses_[0]);
ASSERT_EQ(return_clause->body_.named_expressions.size(), 1);
auto *function = dynamic_cast<Function *>(
return_clause->body_.named_expressions[0]->expression_);
ASSERT_TRUE(function);
ASSERT_TRUE(function->function());
}
TYPED_TEST(CypherMainVisitorTest, Function) {
TypeParam ast_generator("RETURN abs(n, 2)");
auto *query = ast_generator.query_;