Added support for Double/Float64 in DataSync. Fixes #1298

digitallyinduced · Jan 13, 2022 · 3969ab9 · 3969ab9
1 parent 663324a
commit 3969ab9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/IHP/DataSync/DynamicQuery.hs b/IHP/DataSync/DynamicQuery.hs
@@ -21,6 +21,7 @@ data Field = Field { fieldName :: Text, fieldValue :: DynamicValue }
 
 data DynamicValue
     = IntValue !Int
+    | DoubleValue !Double
     | TextValue !Text
     | BoolValue !Bool
     | UUIDValue !UUID
@@ -78,6 +79,7 @@ instance {-# OVERLAPS #-} ToJSON [Field] where
     toJSON fields = object (map (\Field { fieldName, fieldValue } -> (cs fieldName) .= (fieldValueToJSON fieldValue)) fields)
         where
             fieldValueToJSON (IntValue value) = toJSON value
+            fieldValueToJSON (DoubleValue value) = toJSON value
             fieldValueToJSON (TextValue value) = toJSON value
             fieldValueToJSON (BoolValue value) = toJSON value
             fieldValueToJSON (UUIDValue value) = toJSON value
@@ -97,6 +99,7 @@ instance PG.FromField Field where
                 <|> (TextValue <$> PG.fromField field fieldValue')
                 <|> (BoolValue <$> PG.fromField field fieldValue')
                 <|> (UUIDValue <$> PG.fromField field fieldValue')
+                <|> (DoubleValue <$> PG.fromField field fieldValue')
                 <|> (DateTimeValue <$> PG.fromField field fieldValue')
                 <|> (PG.fromField @PG.Null field fieldValue' >> pure IHP.DataSync.DynamicQuery.Null)
                 <|> fromFieldCustomEnum field fieldValue'

diff --git a/IHP/DataSync/DynamicQueryCompiler.hs b/IHP/DataSync/DynamicQueryCompiler.hs
@@ -67,6 +67,7 @@ compileCondition (InfixOperatorExpression a operator b) = ("(" <> queryA <> ") "
 compileCondition (LiteralExpression literal) = ("?", [toValue literal])
     where
         toValue (IntValue int) = PG.toField int
+        toValue (DoubleValue double) = PG.toField double
         toValue (TextValue text) = PG.toField text
         toValue (BoolValue bool) = PG.toField bool
         toValue (UUIDValue uuid) = PG.toField uuid

diff --git a/lib/IHP/DataSync/ihp-querybuilder.js b/lib/IHP/DataSync/ihp-querybuilder.js
@@ -86,7 +86,7 @@ function jsValueToDynamicValue(value) {
     if (typeof value === "string") {
         return { tag: 'TextValue', contents: value };
     } else if (typeof value === "number") {
-        return { tag: 'IntValue', contents: value };
+        return { tag: Number.isInteger(value) ? 'IntValue' : 'DoubleValue', contents: value };
     } else if (typeof value === "boolean") {
         return { tag: 'BoolValue', contents: value };
     } else if (value === null || value === undefined) {