Get rid of Pgx_aux

arenadotio · May 8, 2020 · 163017b · 163017b
1 parent 209bc7e
commit 163017b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 121 deletions.
diff --git a/pgx/src/error_response.ml b/pgx/src/error_response.ml
@@ -1,6 +1,5 @@
 open Printf
 open Sexplib0.Sexp_conv
-open Pgx_aux
 
 type t =
   { code : string

diff --git a/pgx/src/pgx.ml b/pgx/src/pgx.ml
@@ -18,8 +18,6 @@
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *)
-
-open Pgx_aux
 open Printf
 open Sexplib0.Sexp_conv
 include Types
@@ -810,7 +808,9 @@ module Make (Thread : Io) = struct
             | Message_in.CommandComplete _ -> loop ()
             | Message_in.EmptyQueryResponse -> loop ()
             | Message_in.DataRow fields ->
-              List.map (Option.bind Value.of_string) fields |> f >>= loop
+              ListLabels.map ~f:(fun f -> Option.bind f Value.of_string) fields
+              |> f
+              >>= loop
             | Message_in.NoData -> loop ()
             | Message_in.ParameterStatus _ ->
               (* 43.2.6: ParameterStatus messages will be generated whenever
@@ -969,7 +969,7 @@ module Make (Thread : Io) = struct
       | _, Message_in.CopyData row -> loop acc ([ row |> Value.of_string ] :: rows) state
       | _, Message_in.CopyDone -> loop acc rows state
       | `Rows, Message_in.DataRow row ->
-        let row = List.map (Option.bind Value.of_string) row in
+        let row = List.map (fun f -> Option.bind f Value.of_string) row in
         loop acc (row :: rows) `Rows
       | (`Row_desc | `Rows), Message_in.CommandComplete _ ->
         let rows = List.rev rows in

diff --git a/pgx/src/pgx_aux.ml b/pgx/src/pgx_aux.ml
diff --git a/pgx/src/pgx_aux.mli b/pgx/src/pgx_aux.mli
diff --git a/pgx/src/pgx_value.ml b/pgx/src/pgx_value.ml
@@ -1,10 +1,10 @@
 open Sexplib0.Sexp_conv
-open Pgx_aux
 
 let compare_float = Float.compare
 let compare_int = Int.compare
 let compare_option = Stdlib.Option.compare
 let compare_list = Base.compare_list
+let compare_string = String.compare
 
 type v = string [@@deriving compare, sexp_of]
 type t = v option [@@deriving compare, sexp_of]
@@ -26,7 +26,7 @@ let required f = function
   | None -> raise (Conversion_failure "Expected not-null but got null")
 ;;
 
-let opt = Option.bind
+let opt f v = Option.bind v f
 let null = None
 
 let of_binary b =
@@ -105,7 +105,7 @@ let of_hstore hstore =
     in
     key_str ^ "=>" ^ value_str
   in
-  Some (String.join ", " (List.map string_of_mapping hstore))
+  Some (String.concat ", " (List.map string_of_mapping hstore))
 ;;
 
 let to_hstore' str =
@@ -116,7 +116,7 @@ let to_hstore' str =
   let parse_quoted stream =
     let rec loop accum stream =
       match Stream.next stream with
-      | '"' -> String.implode (List.rev accum)
+      | '"' -> Base.String.of_char_list (List.rev accum)
       (* FIXME: Slashes don't seem to round-trip properly *)
       | '\\' -> loop (Stream.next stream :: accum) stream
       | x -> loop (x :: accum) stream
@@ -287,7 +287,7 @@ let to_list' str =
       Buffer.add_char buf x;
       accum, quoted, false
   in
-  let accum, _, _ = String.fold_left loop ([], false, false) str in
+  let accum, _, _ = Base.String.fold ~f:loop ~init:([], false, false) str in
   let accum = if Buffer.length buf = 0 then accum else add_field accum in
   List.rev accum
 ;;

diff --git a/pgx/test/test_pgx_value.ml b/pgx/test/test_pgx_value.ml
@@ -1,4 +1,3 @@
-open Pgx_aux
 open Printf
 open Sexplib0
 open Sexplib0.Sexp_conv