Add support for 64-bit integers.

Author: mfp

README.md

@@ -202,6 +202,7 @@ function.
 ```ocaml
 type value =
   [ `Int of int
+  | `Int64 of Int64.t
   | `Float of float
   | `String of string
   | `Bytes of bytes
@@ -218,6 +219,7 @@ provided to extract the OCaml types directly from a field:
 
 ```ocaml
 val int : Field.t -> int
+val int64 : Field.t -> Int64.t
 val float : Field.t -> float
 val string : Field.t -> string
 val bytes : Field.t -> bytes
@@ -231,6 +233,7 @@ 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 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,7 @@ 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
       | `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,7 @@ 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
       | `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,7 @@ 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
       | `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/nonblocking/nonblocking_stress_test.ml

@@ -69,6 +69,7 @@ module Make (W : Mariadb.Nonblocking.Wait) = struct
   let string_of_value = function
     | `Null -> "NULL"
     | `Int i -> sprintf "(%d : int)" i
+    | `Int64 i -> sprintf "(%Ld : int64)" i
     | `Float x -> sprintf "(%.8g : float)" x
     | `String s -> sprintf "(%S : string)" s
     | `Bytes s -> sprintf "(%S : bytes)" (Bytes.to_string s)
@@ -89,7 +90,10 @@ module Make (W : Mariadb.Nonblocking.Wait) = struct
     | `Null, _ | _, `Null -> false
     | `Int i, `Int i' -> i = i'
     | `Int i, `Float x | `Float x, `Int i -> float_of_int i = x
+    | `Int64 i, `Int x | `Int x, `Int64 i -> Int64.(equal i (of_int x))
+    | `Int64 i, `Float x | `Float x, `Int64 i -> Int64.to_float i = x
     | `Int _, _ | _, `Int _ -> false
+    | `Int64 _, _ | _, `Int64 _ -> false
     | `Float x, `Float x' -> equal_float x x'
     | `Float _, _ | _, `Float _ -> false
     | `String s, `String s' -> s = s'

examples/select/nonblocking_select_example.ml

@@ -55,6 +55,7 @@ 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
       | `Float x -> printf "%f\n%!" x
       | `String s -> printf "%s\n%!" s
       | `Bytes b -> printf "%s\n%!" (Bytes.to_string b)

lib/bind.ml

@@ -124,6 +124,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

@@ -339,6 +339,7 @@ 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
             | `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,7 @@ module T = Ffi_bindings.Types(Ffi_generated_types)
 type value =
   [ `Null
   | `Int of int
+  | `Int64 of Int64.t
   | `Float of float
   | `String of string
   | `Bytes of bytes
@@ -81,8 +82,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 -> `Int64 (UInt64.to_int64 (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))
@@ -104,6 +105,11 @@ let int field =
   | `Int i -> i
   | _ -> err field ~info:"an integer"
 
+let int64 field =
+  match value field with
+  | `Int64 i -> i
+  | _ -> err field ~info:"an 64-bit integer"
+
 let float field =
   match value field with
   | `Float x -> x
@@ -130,6 +136,12 @@ let int_opt field =
   | `Null -> None
   | _ -> err field ~info:"a nullable integer"
 
+let int64_opt field =
+  match value field with
+  | `Int64 i -> Some i
+  | `Null -> None
+  | _ -> err field ~info:"a nullable 64-bit integer"
+
 let float_opt field =
   match value field with
   | `Float x -> Some x

lib/mariadb.ml

@@ -29,6 +29,7 @@ module type S = sig
     type value =
       [ `Null
       | `Int of int
+      | `Int64 of int64
       | `Float of float
       | `String of string
       | `Bytes of bytes
@@ -41,12 +42,14 @@ module type S = sig
     val can_be_null : t -> bool
 
     val int : t -> int
+    val int64 : t -> Int64.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 float_opt : t -> float option
     val string_opt : t -> string option
     val bytes_opt : t -> bytes option