Add new implementation for runtime checking of merge

src/query/context.hpp

@@ -35,6 +35,10 @@ enum class TransactionStatus {
   STARTED_ROLLBACK,
 };
 
+struct Scope {
+  bool in_merge{false};
+};
+
 struct EvaluationContext {
   /// Memory for allocations during evaluation of a *single* Pull call.
   ///
@@ -51,6 +55,7 @@ struct EvaluationContext {
   /// All counters generated by `counter` function, mutable because the function
   /// modifies the values
   mutable std::unordered_map<std::string, int64_t> counters{};
+  Scope scope{};
 };
 
 inline std::vector<storage::PropertyId> NamesToProperties(const std::vector<std::string> &property_names,

src/query/frontend/semantic/symbol_generator.cpp

@@ -745,14 +745,6 @@ bool SymbolGenerator::PreVisit(PatternComprehension &pc) {
   return true;
 }
 
-bool SymbolGenerator::Visit(PrimitiveLiteral &primitive_literal) {
-  auto &scope = scopes_.back();
-  if (scope.in_merge && primitive_literal.value_.IsNull()) {
-    throw SemanticException("Cannot merge node or relationship entity because of null property value!");
-  }
-  return true;
-}
-
 bool SymbolGenerator::PostVisit(PatternComprehension & /*pc*/) { return true; }
 
 void SymbolGenerator::VisitWithIdentifiers(Expression *expr, const std::vector<Identifier *> &identifiers) {

src/query/frontend/semantic/symbol_generator.hpp

@@ -71,7 +71,7 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
 
   // Expressions
   ReturnType Visit(Identifier &) override;
-  ReturnType Visit(PrimitiveLiteral &) override;
+  ReturnType Visit(PrimitiveLiteral &) override { return true; }
   bool PreVisit(MapLiteral &) override;
   bool PostVisit(MapLiteral &) override { return true; };
   ReturnType Visit(ParameterLookup &) override { return true; }

src/query/interpret/eval.hpp

@@ -784,6 +784,9 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
   TypedValue Visit(PrimitiveLiteral &literal) override {
     // TODO: no need to evaluate constants, we can write it to frame in one
     // of the previous phases.
+    if (ctx_->scope.in_merge && literal.value_.IsNull()) {
+      throw QueryRuntimeException("Can't have null literal properties inside merge!");
+    }
     return TypedValue(literal.value_, ctx_->memory);
   }
 

src/query/plan/operator.cpp

@@ -4297,6 +4297,9 @@ bool Merge::MergeCursor::Pull(Frame &frame, ExecutionContext &context) {
   OOMExceptionEnabler oom_exception;
   SCOPED_PROFILE_OP("Merge");
 
+  context.evaluation_context.scope.in_merge = true;
+  memgraph::utils::OnScopeExit merge_exit([&] { context.evaluation_context.scope.in_merge = false; });
+
   while (true) {
     if (pull_input_) {
       if (input_cursor_->Pull(frame, context)) {

tests/gql_behave/tests/memgraph_V1/features/merge.feature

@@ -433,3 +433,21 @@ Feature: Merge feature
             MERGE ()-[:TYPE {id:null}]->()
             """
         Then an error should be raised
+
+    Scenario: Merge node with unwind with null property error
+        Given an empty graph
+        When executing query:
+            """
+            UNWIND [1, 2, null, 3] as x
+            MERGE ({id: x})
+            """
+        Then an error should be raised
+
+    Scenario: Merge edge with unwind with null property error
+        Given an empty graph
+        When executing query:
+            """
+            UNWIND [1, 2, null, 3] as x
+            MERGE ()-[:TYPE {id:x}]->()
+            """
+        Then an error should be raised

tests/gql_behave/tests/memgraph_V1_on_disk/features/merge.feature

@@ -433,3 +433,21 @@ Feature: Merge feature
             MERGE ()-[:TYPE {id:null}]->()
             """
         Then an error should be raised
+
+    Scenario: Merge node with unwind with null property error
+        Given an empty graph
+        When executing query:
+            """
+            UNWIND [1, 2, null, 3] as x
+            MERGE ({id: x})
+            """
+        Then an error should be raised
+
+    Scenario: Merge edge with unwind with null property error
+        Given an empty graph
+        When executing query:
+            """
+            UNWIND [1, 2, null, 3] as x
+            MERGE ()-[:TYPE {id:x}]->()
+            """
+        Then an error should be raised