Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update against the latest pgocaml #24

Merged
merged 2 commits into from
Oct 1, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opam
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ remove: [
]
depends: [
"ocamlfind"
"pgocaml" {< "2.0"}
"pgocaml" {>= "2.0"}
"oasis" {>= "0.4.4"}
"camlp4"
]
4 changes: 2 additions & 2 deletions src/sql.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion src/sql_internals.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/sql_types.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down