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

Fix Cypher ID function Null handling

Browse Source 
Reviewers: buda

Reviewed By: buda

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D2815
This commit is contained in:
Matej Ferencevic 2020-09-03 11:09:39 +02:00
parent c12a87e9ca
commit d2ff465f8e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/query/interpret/awesome_memgraph_functions.cpp
View File

@ -886,12 +886,15 @@ TypedValue Counter(const TypedValue *args, int64_t nargs,
TypedValue Id(const TypedValue *args, int64_t nargs,
const FunctionContext &ctx) {
FType<Or<Vertex, Edge>>("id", args, nargs);
FType<Or<Null, Vertex, Edge>>("id", args, nargs);
const auto &arg = args[0];
if (arg.IsVertex())
if (arg.IsNull()) {
return TypedValue(ctx.memory);
} else if (arg.IsVertex()) {
return TypedValue(arg.ValueVertex().CypherId(), ctx.memory);
else
} else {
return TypedValue(arg.ValueEdge().CypherId(), ctx.memory);
}
}
TypedValue ToString(const TypedValue *args, int64_t nargs,

1
tests/unit/query_expression_evaluator.cpp
View File

@ -1746,6 +1746,7 @@ TEST_F(FunctionTest, Id) {
ASSERT_TRUE(ea.HasValue());
auto vb = dba.InsertVertex();
dba.AdvanceCommand();
EXPECT_TRUE(EvaluateFunction("ID", TypedValue()).IsNull());
EXPECT_EQ(EvaluateFunction("ID", va).ValueInt(), 0);
EXPECT_EQ(EvaluateFunction("ID", *ea).ValueInt(), 0);
EXPECT_EQ(EvaluateFunction("ID", vb).ValueInt(), 1);