Fix backward compatibility for between condition

jakubknejzlik · Jan 30, 2024 · 413f32a · 413f32a
1 parent 6dd7533
commit 413f32a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/Condition-serialization.test.ts b/src/Condition-serialization.test.ts
@@ -38,10 +38,20 @@ describe("Condition Serialization and Deserialization", () => {
 
   // BETWEEN
   it("should serialize and deserialize between condition", () => {
-    const condition = Conditions.between("foo", [1, 2]);
+    const condition = Conditions.between("foo", ["abcd", 2]);
     const serialized = condition.toJSON();
     const deserialized = Condition.fromJSON(serialized);
     expect(deserialized.toSQL(flavor)).toEqual(condition.toSQL(flavor));
+
+    const json = {
+      type: "BetweenCondition",
+      key: "foo",
+      from: "abcd",
+      to: 2,
+    };
+    expect(Condition.fromJSON(json).toSQL(flavor)).toEqual(
+      condition.toSQL(flavor)
+    );
   });
 
   // IN

diff --git a/src/Condition.ts b/src/Condition.ts
@@ -140,8 +140,8 @@ class BetweenCondition implements Condition {
   static fromJSON(json: any): BetweenCondition {
     return new BetweenCondition(
       Expression.deserialize(json.key),
-      Expression.deserialize(json.from),
-      Expression.deserialize(json.to)
+      Expression.deserializeValue(json.from),
+      Expression.deserializeValue(json.to)
     );
   }
 }