Support JSON/JSONB

Author: m2ym

lib/postgresql.ml

@@ -56,6 +56,7 @@ type ftype =
   | XID
   | CID
   | OIDVECTOR
+  | JSON
   | POINT
   | LSEG
   | PATH
@@ -101,6 +102,7 @@ type ftype =
   | INTERNAL
   | OPAQUE
   | ANYELEMENT
+  | JSONB
 
 external ftype_of_oid : oid -> ftype = "ftype_of_oid_stub"
 external oid_of_ftype : ftype -> oid = "oid_of_ftype_stub"
@@ -121,6 +123,7 @@ let string_of_ftype = function
   | XID -> "XID"
   | CID -> "CID"
   | OIDVECTOR -> "OIDVECTOR"
+  | JSON -> "JSON"
   | POINT -> "POINT"
   | LSEG -> "LSEG"
   | PATH -> "PATH"
@@ -166,6 +169,7 @@ let string_of_ftype = function
   | INTERNAL -> "INTERNAL"
   | OPAQUE -> "OPAQUE"
   | ANYELEMENT -> "ANYELEMENT"
+  | JSONB -> "JSONB"
 
 let ftype_of_string = function
   | "BOOL" -> BOOL
@@ -183,6 +187,7 @@ let ftype_of_string = function
   | "XID" -> XID
   | "CID" -> CID
   | "OIDVECTOR" -> OIDVECTOR
+  | "JSON" -> JSON
   | "POINT" -> POINT
   | "LSEG" -> LSEG
   | "PATH" -> PATH
@@ -228,6 +233,7 @@ let ftype_of_string = function
   | "INTERNAL" -> INTERNAL
   | "OPAQUE" -> OPAQUE
   | "ANYELEMENT" -> ANYELEMENT
+  | "JSONB" -> JSON
   | str -> failwith ("ftype_of_string: unknown ftype: " ^ str)
 
 external init : unit -> unit = "PQocaml_init"

lib/postgresql.mli

@@ -60,6 +60,7 @@ type ftype =
   | XID
   | CID
   | OIDVECTOR
+  | JSON
   | POINT
   | LSEG
   | PATH
@@ -105,6 +106,7 @@ type ftype =
   | INTERNAL
   | OPAQUE
   | ANYELEMENT
+  | JSONB
 
 
 (** Status of command/query results *)

lib/postgresql_stubs.c

@@ -70,6 +70,7 @@
 #define XIDOID                    28
 #define CIDOID                    29
 #define OIDVECTOROID              30
+#define JSONOID                  114
 #define POINTOID                 600
 #define LSEGOID                  601
 #define PATHOID                  602
@@ -115,6 +116,7 @@
 #define INTERNALOID             2281
 #define OPAQUEOID               2282
 #define ANYELEMENTOID           2283
+#define JSONBOID                3802
 
 static value v_None = Val_int(0);
 
@@ -149,14 +151,14 @@ static inline value unescape_bytea(const char *s);
 static int oid_tbl[] = {
   BOOLOID, BYTEAOID, CHAROID, NAMEOID, INT8OID, INT2OID, INT2VECTOROID,
   INT4OID, REGPROCOID, TEXTOID, OIDOID, TIDOID, XIDOID, CIDOID,
-  OIDVECTOROID, POINTOID, LSEGOID, PATHOID, BOXOID, POLYGONOID, LINEOID,
-  FLOAT4OID, FLOAT8OID, ABSTIMEOID, RELTIMEOID, TINTERVALOID, UNKNOWNOID,
-  CIRCLEOID, CASHOID, MACADDROID, INETOID, CIDROID, ACLITEMOID,
+  OIDVECTOROID, JSONOID, POINTOID, LSEGOID, PATHOID, BOXOID, POLYGONOID,
+  LINEOID, FLOAT4OID, FLOAT8OID, ABSTIMEOID, RELTIMEOID, TINTERVALOID,
+  UNKNOWNOID, CIRCLEOID, CASHOID, MACADDROID, INETOID, CIDROID, ACLITEMOID,
   BPCHAROID, VARCHAROID, DATEOID, TIMEOID, TIMESTAMPOID, TIMESTAMPTZOID,
   INTERVALOID, TIMETZOID, BITOID, VARBITOID, NUMERICOID, REFCURSOROID,
   REGPROCEDUREOID, REGOPEROID, REGOPERATOROID, REGCLASSOID, REGTYPEOID,
   RECORDOID, CSTRINGOID, ANYOID, ANYARRAYOID, VOIDOID, TRIGGEROID,
-  LANGUAGE_HANDLEROID, INTERNALOID, OPAQUEOID, ANYELEMENTOID
+  LANGUAGE_HANDLEROID, INTERNALOID, OPAQUEOID, ANYELEMENTOID, JSONBOID
 };
 
 CAMLprim value ftype_of_oid_stub(value v_oid)