Merge pull request #66 from paurkedal/64bit-integers-rebased

Support for 64bit integers (rebased)

Author: paurkedal

README.md

@@ -205,6 +205,8 @@ function.
 ```ocaml
 type value =
   [ `Int of int
+  | `Int64 of Int64.t
+  | `UInt64 of Unsigned.UInt64.t
   | `Float of float
   | `String of string
   | `Bytes of bytes
@@ -221,6 +223,8 @@ provided to extract the OCaml types directly from a field:
 
 ```ocaml
 val int : Field.t -> int
+val int64 : Field.t -> Int64.t
+val uint64 : Field.t -> Unsigned.Int64.t
 val float : Field.t -> float
 val string : Field.t -> string
 val bytes : Field.t -> bytes
@@ -234,6 +238,8 @@ For nullable fields, the following analogous functions are also provided:
 
 ```ocaml
 val int_opt : Field.t -> int option
+val int64_opt : Field.t -> Int64.t option
+val uint64_opt : Field.t -> Unsigned.UInt64.t option
 val float_opt : Field.t -> float option
 val string_opt : Field.t -> string option
 val bytes_opt : Field.t -> bytes option

examples/async/nonblocking_async_example.ml

@@ -66,6 +66,8 @@ let print_row row =
       printf "%20s " name;
       match M.Field.value field with
       | `Int i -> printf "%d\n%!" i
+      | `Int64 i -> printf "%Ld\n%!" i
+      | `UInt64 i -> printf "%s\n%!" (Unsigned.UInt64.to_string i)
       | `Float x -> printf "%f\n%!" x
       | `String s -> printf "%s\n%!" s
       | `Bytes b -> printf "%s\n%!" (Caml_bytes.to_string b)

examples/blocking/blocking_example.ml

@@ -17,6 +17,8 @@ let print_row row =
       printf "%20s " name;
       match M.Field.value field with
       | `Int i -> printf "%d\n%!" i
+      | `Int64 i -> printf "%Ld\n%!" i
+      | `UInt64 i -> printf "%s\n%!" (Unsigned.UInt64.to_string i)
       | `Float x -> printf "%f\n%!" x
       | `String s -> printf "%s\n%!" s
       | `Bytes b -> printf "%s\n%!" (Bytes.to_string b)

examples/lwt/nonblocking_lwt_example.ml

@@ -52,6 +52,8 @@ let print_row row =
       Lwt_io.printf "%20s " name >>= fun () ->
       match M.Field.value field with
       | `Int i -> Lwt_io.printf "%d\n%!" i
+      | `Int64 i -> Lwt_io.printf "%Ld\n%!" i
+      | `UInt64 i -> Lwt_io.printf "%s\n%!" (Unsigned.UInt64.to_string i)
       | `Float x -> Lwt_io.printf "%f\n%!" x
       | `String s -> Lwt_io.printf "%s\n%!" s
       | `Bytes b -> Lwt_io.printf "%s\n%!" (Bytes.to_string b)

examples/select/nonblocking_select_example.ml

@@ -55,6 +55,8 @@ let print_row row =
       printf "%20s " name;
       match M.Field.value field with
       | `Int i -> printf "%d\n%!" i
+      | `Int64 i -> printf "%Ld\n%!" i
+      | `UInt64 i -> printf "%s\n%!" (Unsigned.UInt64.to_string i)
       | `Float x -> printf "%f\n%!" x
       | `String s -> printf "%s\n%!" s
       | `Bytes b -> printf "%s\n%!" (Bytes.to_string b)

lib/bind.ml

@@ -126,6 +126,15 @@ let int ?(unsigned = false) b param ~at =
     ~unsigned:(if unsigned then yes else no)
     ~at
 
+let int64 ?(unsigned = false) b param ~at =
+  let p = allocate int64_t param in
+  bind b
+    ~buffer:(coerce (ptr int64_t) (ptr void) p)
+    ~size:(sizeof int64_t)
+    ~mysql_type:T.Type.long_long
+    ~unsigned:(if unsigned then yes else no)
+    ~at
+
 let float b param ~at =
   let p = allocate float param in
   bind b

lib/common.ml

@@ -335,6 +335,8 @@ module Stmt = struct
             match arg with
             | `Null -> Bind.null b ~at
             | `Int i -> Bind.int b i ~at
+            | `Int64 i -> Bind.int64 b i ~at
+            | `UInt64 i -> Bind.int64 ~unsigned:true b (Unsigned.UInt64.to_int64 i) ~at
             | `Float x -> Bind.float b x ~at
             | `String s -> Bind.string b s ~at
             | `Bytes s -> Bind.blob b s ~at

lib/field.ml

@@ -5,6 +5,8 @@ module T = Ffi_generated.Types
 type value =
   [ `Null
   | `Int of int
+  | `Int64 of Int64.t
+  | `UInt64 of Unsigned.UInt64.t
   | `Float of float
   | `String of string
   | `Bytes of bytes
@@ -84,8 +86,8 @@ let convert field typ unsigned =
   | `Short,           false -> `Int (UInt.to_int (cast_to uint field))
   | (`Int24 | `Long),  true -> `Int (UInt32.to_int (cast_to uint32_t field))
   | (`Int24 | `Long), false -> `Int (Int32.to_int (cast_to int32_t field))
-  | `Long_long,        true -> `Int (UInt64.to_int (cast_to uint64_t field))
-  | `Long_long,       false -> `Int (Int64.to_int (cast_to int64_t field))
+  | `Long_long,        true -> `UInt64 (cast_to uint64_t field)
+  | `Long_long,       false -> `Int64 (cast_to int64_t field)
   | `Float,               _ -> `Float (cast_to float field)
   | `Double,              _ -> `Float (cast_to double field)
   | #to_string,           _ -> `String (Bytes.to_string (to_bytes field))
@@ -105,8 +107,21 @@ let err field ~info =
 let int field =
   match value field with
   | `Int i -> i
+  | `Int64 i -> Int64.to_int i
+  | `UInt64 i -> Unsigned.UInt64.to_int i
   | _ -> err field ~info:"an integer"
 
+let int64 field =
+  match value field with
+  | `Int i -> Int64.of_int i
+  | `Int64 i -> i
+  | _ -> err field ~info:"a 64-bit integer"
+
+let uint64 field =
+  match value field with
+  | `UInt64 i -> i
+  | _ -> err field ~info:"a 64-bit unsigned integer"
+
 let float field =
   match value field with
   | `Float x -> x
@@ -130,9 +145,24 @@ let time field =
 let int_opt field =
   match value field with
   | `Int i -> Some i
+  | `Int64 i -> Some (Int64.to_int i)
+  | `UInt64 i -> Some (Unsigned.UInt64.to_int i)
   | `Null -> None
   | _ -> err field ~info:"a nullable integer"
 
+let int64_opt field =
+  match value field with
+  | `Int i -> Some (Int64.of_int i)
+  | `Int64 i -> Some i
+  | `Null -> None
+  | _ -> err field ~info:"a nullable 64-bit integer"
+
+let uint64_opt field =
+  match value field with
+  | `UInt64 i -> Some i
+  | `Null -> None
+  | _ -> err field ~info:"a nullable 64-bit unsigned integer"
+
 let float_opt field =
   match value field with
   | `Float x -> Some x

lib/mariadb.ml

@@ -29,6 +29,8 @@ module type S = sig
     type value =
       [ `Null
       | `Int of int
+      | `Int64 of Int64.t
+      | `UInt64 of Unsigned.UInt64.t
       | `Float of float
       | `String of string
       | `Bytes of bytes
@@ -41,12 +43,16 @@ module type S = sig
     val can_be_null : t -> bool
 
     val int : t -> int
+    val int64 : t -> Int64.t
+    val uint64 : t -> Unsigned.UInt64.t
     val float : t -> float
     val string : t -> string
     val bytes : t -> bytes
     val time : t -> Time.t
 
     val int_opt : t -> int option
+    val int64_opt : t -> Int64.t option
+    val uint64_opt : t -> Unsigned.UInt64.t option
     val float_opt : t -> float option
     val string_opt : t -> string option
     val bytes_opt : t -> bytes option

lib/mariadb.mli

@@ -51,6 +51,8 @@ module type S = sig
     type value =
       [ `Null
       | `Int of int
+      | `Int64 of Int64.t
+      | `UInt64 of Unsigned.UInt64.t
       | `Float of float
       | `String of string
       | `Bytes of bytes
@@ -81,12 +83,16 @@ module type S = sig
     *)
 
     val int : t -> int
+    val int64 : t -> Int64.t
+    val uint64 : t -> Unsigned.UInt64.t
     val float : t -> float
     val string : t -> string
     val bytes : t -> bytes
     val time : t -> Time.t
 
     val int_opt : t -> int option
+    val int64_opt : t -> Int64.t option
+    val uint64_opt : t -> Unsigned.UInt64.t option
     val float_opt : t -> float option
     val string_opt : t -> string option
     val bytes_opt : t -> bytes option
@@ -397,6 +403,8 @@ module Nonblocking : sig
       type value =
         [ `Null
         | `Int of int
+        | `Int64 of Int64.t
+        | `UInt64 of Unsigned.UInt64.t
         | `Float of float
         | `String of string
         | `Bytes of bytes
@@ -409,12 +417,16 @@ module Nonblocking : sig
       val can_be_null : t -> bool
 
       val int : t -> int
+      val int64 : t -> Int64.t
+      val uint64 : t -> Unsigned.UInt64.t
       val float : t -> float
       val string : t -> string
       val bytes : t -> bytes
       val time : t -> Time.t
 
       val int_opt : t -> int option
+      val int64_opt : t -> Int64.t option
+      val uint64_opt : t -> Unsigned.UInt64.t option
       val float_opt : t -> float option
       val string_opt : t -> string option
       val bytes_opt : t -> bytes option