convert postgresql type to json schema type for queryables

Author: bitner

tifeatures/dbmodel.py

@@ -13,6 +13,26 @@ class Column(BaseModel):
     type: str
     description: Optional[str]
 
+    @property
+    def json_type(self):
+        """Return JSON field type."""
+        type = self.type
+        if any(
+            [
+                type.startswith("int"),
+                type.startswith("num"),
+                type.startswith("float"),
+            ]
+        ):
+            return "number"
+        if type.startswith("bool"):
+            return "boolean"
+        if type.endswith("[]"):
+            return "array"
+        if any([type.startswith("json"), type.startswith("geo")]):
+            return "object"
+        return "string"
+
 
 class GeometryColumn(BaseModel):
     """Model for PostGIS geometry/geography column."""

tifeatures/layer.py

@@ -438,7 +438,7 @@ def queryables(self) -> Dict:
             for col in geometries
         }
         props = {
-            col.name: {"name": col.name, "type": col.type}
+            col.name: {"name": col.name, "type": col.json_type}
             for col in self.properties
             if col.name not in geoms
         }