Merge pull request #65 from ni-ze/main

[ISSUE #66] make "where fieldName is null"
alibaba · Jan 24, 2023 · 164b7b3 · 164b7b3
2 parents e77da08 + 20df33d
commit 164b7b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...arser/src/main/java/com/alibaba/rsqldb/parser/model/expression/SingleValueExpression.java b/...arser/src/main/java/com/alibaba/rsqldb/parser/model/expression/SingleValueExpression.java
@@ -35,6 +35,7 @@
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class SingleValueExpression extends SingleExpression {
+    private static final String stringNull = "null";
     private Literal<?> value;
 
     @JsonCreator
@@ -56,7 +57,7 @@ public void setValue(Literal<?> value) {
     public boolean isTrue(JsonNode jsonNode) {
         String fieldName = this.getField().getFieldName();
         JsonNode node = jsonNode.get(fieldName);
-        if (node == null) {
+        if (node == null || StringUtils.isBlank(node.asText()) || stringNull.equalsIgnoreCase(node.asText())) {
             return this.value == null;
         }
 

diff --git a/rsqldb-parser/src/main/java/com/alibaba/rsqldb/parser/serialization/json/JsonDe.java b/rsqldb-parser/src/main/java/com/alibaba/rsqldb/parser/serialization/json/JsonDe.java
@@ -19,9 +19,11 @@
 import com.alibaba.rsqldb.parser.model.Field;
 import com.alibaba.rsqldb.parser.serialization.Deserializer;
 import com.alibaba.rsqldb.parser.serialization.FieldKeyDeserializer;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+
 import java.io.IOException;
 
 
@@ -32,6 +34,8 @@ public JsonDe() {
         SimpleModule simpleModule = new SimpleModule();
         simpleModule.addKeyDeserializer(Field.class, new FieldKeyDeserializer());
         objectMapper.registerModule(simpleModule);
+        objectMapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true);
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     }
 
     public JsonNode deserialize(byte[] source) throws DeserializeException {