Fix null $current error in MethodCall when using string methods in LET clauses

claude · claude · commit 185c73daae1d · 2026-03-05T14:45:34.000Z
When executing SQL queries with LET variables containing UNIONALL and string method calls (e.g., .replace()), $current can be null while targetObjects is a non-Identifiable/non-Result value. Added an else-if branch to handle null val by passing null Identifiable to Expression.execute(), preventing the CommandExecutionException. https://claude.ai/code/session_019HJhUeYmAHEL2wx5monhz9
diff --git a/engine/src/main/java/com/arcadedb/query/sql/parser/MethodCall.java b/engine/src/main/java/com/arcadedb/query/sql/parser/MethodCall.java
@@ -97,6 +97,8 @@ private Object execute(final Object targetObjects, final CommandContext context,
         paramValues.add(expr.execute(identifiable, context));
       } else if (targetObjects instanceof Result result) {
         paramValues.add(expr.execute(result, context));
+      } else if (val == null) {
+        paramValues.add(expr.execute((Identifiable) null, context));
       } else {
         throw new CommandExecutionException("Invalid value for $current: " + val);
       }
diff --git a/engine/src/test/java/com/arcadedb/function/sql/sql/SQLFunctionsTest.java b/engine/src/test/java/com/arcadedb/function/sql/sql/SQLFunctionsTest.java
@@ -608,6 +608,39 @@ void querySplit() {
     }
   }
 
+  @Test
+  void queryUnionAllWithLetAndStringMethods() {
+    database.getSchema().createDocumentType("NER");
+    database.getSchema().createDocumentType("THEME");
+    database.transaction(() -> {
+      database.newDocument("NER").set("identity", "Hello World").save();
+      database.newDocument("NER").set("identity", "Hello\nWorld").save();
+      database.newDocument("THEME").set("identity", "Hello World Theme").save();
+    });
+
+    final Map<String, Object> params = new HashMap<>();
+    params.put("keyWordIdentifier_0", "Hello");
+    params.put("keyWordIdentifier_1", "World");
+
+    final ResultSet result = database.query("sql",
+        "SELECT expand($c) LET "
+            + "$a = (SELECT identity, @rid as id FROM NER "
+            + "WHERE identity.replace('\\n', ' ').replace('\\t', ' ').replace('  ', ' ') ILIKE ('%' + :keyWordIdentifier_0 + '%') "
+            + "AND identity.replace('\\n', ' ').replace('\\t', ' ').replace('  ', ' ') ILIKE ('%' + :keyWordIdentifier_1 + '%')), "
+            + "$b = (SELECT identity, @rid as id FROM THEME "
+            + "WHERE identity.replace('\\n', ' ').replace('\\t', ' ').replace('  ', ' ') ILIKE ('%' + :keyWordIdentifier_0 + '%') "
+            + "AND identity.replace('\\n', ' ').replace('\\t', ' ').replace('  ', ' ') ILIKE ('%' + :keyWordIdentifier_1 + '%')), "
+            + "$c = UNIONALL($a, $b)",
+        params);
+
+    final List<Result> results = result.stream().collect(Collectors.toList());
+    assertThat(results).hasSize(3);
+    for (final Result r : results) {
+      assertThat(r.hasProperty("identity")).isTrue();
+      assertThat(r.hasProperty("id")).isTrue();
+    }
+  }
+
   @Test
   void CheckAllFunctions() {
     final DefaultSQLFunctionFactory fFactory = ((SQLQueryEngine) database.getQueryEngine("sql")).getFunctionFactory();

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,8 @@ private Object execute(final Object targetObjects, final CommandContext context,`
`97`	`97`	`paramValues.add(expr.execute(identifiable, context));`
`98`	`98`	`} else if (targetObjects instanceof Result result) {`
`99`	`99`	`paramValues.add(expr.execute(result, context));`
	`100`	`+ } else if (val == null) {`
	`101`	`+ paramValues.add(expr.execute((Identifiable) null, context));`
`100`	`102`	`} else {`
`101`	`103`	`throw new CommandExecutionException("Invalid value for $current: " + val);`
`102`	`104`	`}`