improve message for authentication errors (#105)

* improve message for authentication errors * use newer opam images for build * add upper bound on conduit
arenadotio · Feb 25, 2021 · 8d5ca02 · 8d5ca02
1 parent e408363
commit 8d5ca02
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: ocaml/opam2:4.09
+      - image: ocaml/opam:alpine-ocaml-4.11
         environment:
           PGUSER: pgx
           PGDATABASE: pgx-test
@@ -67,7 +67,7 @@ jobs:
 
   build_mirage:
     docker:
-      - image: ocaml/opam2:4.09
+      - image: ocaml/opam:alpine-ocaml-4.11
         environment:
           TERM: xterm
     steps:

diff --git a/dune-project b/dune-project
@@ -152,7 +152,10 @@
    (>= 4.08))
   logs
   mirage-channel
-  (conduit-mirage (>= 2.2.0))
+  (conduit-mirage
+   (and
+    (>= 2.2.0)
+    (< 2.3.0)))
   dns-client
   mirage-random
   mirage-time

diff --git a/pgx/src/pgx.ml b/pgx/src/pgx.ml
@@ -641,7 +641,8 @@ module Make (Thread : Io) = struct
         loop (Some (Message_out.Password password))
       | Message_in.AuthenticationSCMCredential ->
         fail_msg "Pgx: SCM Credential authentication not supported"
-      | Message_in.ErrorResponse err -> pg_error ~conn err
+      | Message_in.ErrorResponse err ->
+        raise (PostgreSQL_Error ("Failed to authenticate with postgres server", err))
       | Message_in.NoticeResponse _ ->
         (* XXX Do or print something here? *)
         loop None

diff --git a/pgx_lwt_mirage.opam b/pgx_lwt_mirage.opam
@@ -14,7 +14,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "logs"
   "mirage-channel"
-  "conduit-mirage" {>= "2.2.0"}
+  "conduit-mirage" {>= "2.2.0" & < "2.3.0"}
   "dns-client"
   "mirage-random"
   "mirage-time"