Skip to content

Fix null handling in MethodCall parameter execution #3584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lvca merged 1 commit into from
Mar 5, 2026
Merged

Fix null handling in MethodCall parameter execution #3584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions engine/src/main/java/com/arcadedb/query/sql/parser/MethodCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
33 changes: 33 additions & 0 deletions engine/src/test/java/com/arcadedb/function/sql/sql/SQLFunctionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Comment on lines +626 to +633
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The SQL query in this test has a significant amount of duplicated code. The expression identity.replace('\n', ' ').replace('\t', ' ').replace(' ', ' ') is repeated four times. To improve readability and maintainability, you can use a LET clause within the subqueries to define this expression as a variable.

        "SELECT expand($c) LET "
            + "$a = (SELECT identity, @rid as id FROM NER "
            + "      LET $clean_identity = identity.replace('\\n', ' ').replace('\\t', ' ').replace('  ', ' ') "
            + "      WHERE $clean_identity ILIKE ('%' + :keyWordIdentifier_0 + '%') "
            + "      AND $clean_identity ILIKE ('%' + :keyWordIdentifier_1 + '%')), "
            + "$b = (SELECT identity, @rid as id FROM THEME "
            + "      LET $clean_identity = identity.replace('\\n', ' ').replace('\\t', ' ').replace('  ', ' ') "
            + "      WHERE $clean_identity ILIKE ('%' + :keyWordIdentifier_0 + '%') "
            + "      AND $clean_identity 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();
Expand Down
Loading