Skip to content

Fix null condition handling #238

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
merged 3 commits into from
Sep 10, 2025
+55 −5
Merged

Fix null condition handling #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48239d4
Fix to avoid using test-fixtures plugin
jnmt Aug 25, 2025
4d1bda6
Fix IS_NULL and IS_NOT_NULL conditions handling
jnmt Aug 25, 2025
69efdff
Merge branch 'master' into fix-null-condition-handling
jnmt Sep 10, 2025
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
14 changes: 9 additions & 5 deletions generic-contracts/src/main/java/com/scalar/dl/genericcontracts/table/v1_0_0/Scan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,29 +179,33 @@ private boolean hasIndexKeyCondition(
}

private boolean isPrimaryKeyCondition(JsonNode condition, String keyType) {
String operator = condition.get(Constants.CONDITION_OPERATOR).textValue().toUpperCase();
if (!operator.equals(Constants.OPERATOR_EQ)) {
return false;
}

String givenType = condition.get(Constants.CONDITION_VALUE).getNodeType().name();
if (!givenType.equalsIgnoreCase(keyType)) {
throw new ContractContextException(Constants.INVALID_KEY_TYPE + givenType);
}

return condition
.get(Constants.CONDITION_OPERATOR)
.textValue()
.equalsIgnoreCase(Constants.OPERATOR_EQ);
return true;
}

private boolean isIndexKeyCondition(JsonNode condition, String keyType) {
String operator = condition.get(Constants.CONDITION_OPERATOR).textValue().toUpperCase();
if (operator.equals(Constants.OPERATOR_IS_NULL)) {
return true;
} else if (!operator.equals(Constants.OPERATOR_EQ)) {
return false;
}

String givenType = condition.get(Constants.CONDITION_VALUE).getNodeType().name();
if (!givenType.equalsIgnoreCase(keyType)) {
throw new ContractContextException(Constants.INVALID_INDEX_KEY_TYPE + givenType);
}

return operator.equals(Constants.OPERATOR_EQ);
return true;
}

private JsonNode getKeyColumnCondition(
Expand Down
46 changes: 46 additions & 0 deletions generic-contracts/src/test/java/com/scalar/dl/genericcontracts/table/v1_0_0/ScanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,52 @@ public void invoke_ArgumentsWithInvalidIndexKeyConditionGiven_ShouldThrowExcepti
verify(ledger).get(SOME_TABLE_ASSET_ID);
}

@Test
public void invoke_ArgumentsWithOnlyIsNullConditionForPrimaryKeyGiven_ShouldThrowException() {
// Arrange
ArrayNode conditions =
mapper
.createArrayNode()
.add(createCondition(SOME_PRIMARY_KEY_COLUMN, Constants.OPERATOR_IS_NULL));
JsonNode argument =
mapper
.createObjectNode()
.put(Constants.QUERY_TABLE, SOME_TABLE_NAME)
.set(Constants.QUERY_CONDITIONS, conditions);
Asset<JsonNode> table = createAsset(SOME_TABLE);
when(ledger.get(SOME_TABLE_ASSET_ID)).thenReturn(Optional.of(table));
prepareTableAssetId(SOME_TABLE_NAME);

// Act Assert
assertThatThrownBy(() -> scan.invoke(ledger, argument, null))
.isExactlyInstanceOf(ContractContextException.class)
.hasMessageContaining(Constants.INVALID_KEY_SPECIFICATION);
verify(ledger).get(SOME_TABLE_ASSET_ID);
}

@Test
public void invoke_ArgumentsWithOnlyIsNotNullConditionForIndexKeyGiven_ShouldThrowException() {
// Arrange
ArrayNode conditions =
mapper
.createArrayNode()
.add(createCondition(SOME_INDEX_KEY_COLUMN_1, Constants.OPERATOR_IS_NOT_NULL));
JsonNode argument =
mapper
.createObjectNode()
.put(Constants.QUERY_TABLE, SOME_TABLE_NAME)
.set(Constants.QUERY_CONDITIONS, conditions);
Asset<JsonNode> table = createAsset(SOME_TABLE);
when(ledger.get(SOME_TABLE_ASSET_ID)).thenReturn(Optional.of(table));
prepareTableAssetId(SOME_TABLE_NAME);

// Act Assert
assertThatThrownBy(() -> scan.invoke(ledger, argument, null))
.isExactlyInstanceOf(ContractContextException.class)
.hasMessageContaining(Constants.INVALID_KEY_SPECIFICATION);
verify(ledger).get(SOME_TABLE_ASSET_ID);
}

@Test
public void invoke_InvalidConditionsGiven_ShouldThrowException() {
// Arrange
Expand Down