From 292b69598a64af6c1e58c22509577988396d82d2 Mon Sep 17 00:00:00 2001 From: Jacques-Pascal Deplaix Date: Sat, 7 Jun 2014 18:03:35 +0200 Subject: [PATCH 1/2] Update against the latest pgocaml --- src/sql.mli | 4 ++-- src/sql_internals.ml | 2 +- src/sql_types.ml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sql.mli b/src/sql.mli index b1fe06f..f9bc69a 100644 --- a/src/sql.mli +++ b/src/sql.mli @@ -49,7 +49,7 @@ class type date_t = object inherit [date] type_info end class type timestamp_t = object inherit [timestamp] type_info end class type timestamptz_t = object inherit [timestamptz] type_info end class type interval_t = object inherit [interval] type_info end -class type int32_array_t = object inherit [int32 array] type_info end +class type int32_array_t = object inherit [int32 option list] type_info end class type ['row] row_t = object inherit ['row] type_info end @@ -255,7 +255,7 @@ module Value : sig val timestamp : timestamp -> < t : timestamp_t; nul : _ > t val timestamptz : timestamptz -> < t : timestamptz_t; nul : _ > t val interval : interval -> < t : interval_t; nul : _ > t - val int32_array : int32 array -> < t : int32_array_t; nul : _ > t + val int32_array : int32 option list -> < t : int32_array_t; nul : _ > t end diff --git a/src/sql_internals.ml b/src/sql_internals.ml index 3b447c6..94967ce 100644 --- a/src/sql_internals.ml +++ b/src/sql_internals.ml @@ -74,7 +74,7 @@ and atom = | Timestamp of timestamp | Timestamptz of timestamptz | Interval of interval - | Int32_array of int32 array + | Int32_array of int32 option list | Record of untyped (* runtime object instance *) and table_name = string option * string and row_name = string diff --git a/src/sql_types.ml b/src/sql_types.ml index aa95d1d..559eaca 100644 --- a/src/sql_types.ml +++ b/src/sql_types.ml @@ -43,7 +43,7 @@ class type date_t = object inherit [date] type_info end class type timestamp_t = object inherit [timestamp] type_info end class type timestamptz_t = object inherit [timestamptz] type_info end class type interval_t = object inherit [interval] type_info end -class type int32_array_t = object inherit [int32 array] type_info end +class type int32_array_t = object inherit [int32 option list] type_info end class type ['row] row_t = object inherit ['row] type_info end From 050364c14133ec79538d339d331a99bb72d55f0f Mon Sep 17 00:00:00 2001 From: Jacques-Pascal Deplaix Date: Fri, 13 Jun 2014 16:43:08 +0200 Subject: [PATCH 2/2] Update opam --- opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opam b/opam index 0a35e28..d5a855a 100644 --- a/opam +++ b/opam @@ -11,7 +11,7 @@ remove: [ ] depends: [ "ocamlfind" - "pgocaml" {< "2.0"} + "pgocaml" {>= "2.0"} "oasis" {>= "0.4.4"} "camlp4" ]