Cleaned up async improvements

Author: mmottl

lib/postgresql.ml

@@ -777,20 +777,24 @@ object (self)
   method status = wrap_conn Stub.connection_status
   method error_message = wrap_conn Stub.error_message
   method backend_pid = wrap_conn Stub.backend_pid
-  method server_version = wrap_conn (fun conn ->
-    let v = Stub.server_version conn in
-    if v = 0 then begin
-      let message = if Stub.connection_status conn = Bad
-        then "server_version failed because the connection was bad"
-        else "server_version failed for an unknown reason"
-      in
-      raise (Error (Connection_failure message))
-    end;
-    let revision = v mod 100 in
-    let minor    = (v / 100) mod 100 in
-    let major    = v / (100 * 100) in
+
+  method server_version =
+    let version =
+      wrap_conn (fun conn ->
+        let version = Stub.server_version conn in
+        if version <> 0 then version
+        else
+          let msg =
+            if Stub.connection_status conn = Bad
+            then "server_version failed because the connection was bad"
+            else "server_version failed for an unknown reason"
+          in
+          raise (Error (Connection_failure msg)))
+    in
+    let major = version / (100 * 100) in
+    let minor = (version / 100) mod 100 in
+    let revision = version mod 100 in
     major, minor, revision
-  )
 
 
   (* Commands and Queries *)
@@ -896,30 +900,28 @@ object (self)
       | -1 -> if Stub.endcopy conn <> 0 then signal_error conn else EndOfData
       | 0 -> NoData
       | n when n > 0 ->
-         if Bytes.get buf (pos + n - 1) = '\n' then DataRead n else PartDataRead n
+         if Bytes.get buf (pos + n - 1) = '\n' then DataRead n
+         else PartDataRead n
       | _ -> assert false)
 
   method putline buf =
     wrap_conn (fun conn ->
-      if (Stub.putline conn buf <> 0) && not (Stub.is_nonblocking conn) then
-        signal_error conn
-    )
+      if Stub.putline conn buf <> 0 && not (Stub.is_nonblocking conn) then
+        signal_error conn)
 
   method putnbytes ?(pos = 0) ?len buf =
     let buf_len = String.length buf in
     let len = match len with Some len -> len | None -> buf_len - pos in
     if len < 0 || pos < 0 || pos + len > buf_len then
       invalid_arg "Postgresql.connection#putnbytes";
     wrap_conn (fun conn ->
-      if (Stub.putnbytes conn buf pos len <> 0) && not (Stub.is_nonblocking conn) then
-        signal_error conn
-    )
+      if Stub.putnbytes conn buf pos len <> 0 && not (Stub.is_nonblocking conn)
+      then signal_error conn)
 
   method endcopy =
     wrap_conn (fun conn ->
-      if (Stub.endcopy conn <> 0) && not (Stub.is_nonblocking conn) then
-        signal_error conn
-    )
+      if Stub.endcopy conn <> 0 && not (Stub.is_nonblocking conn) then
+        signal_error conn)
 
 
   (* High level *)
@@ -978,8 +980,7 @@ object (self)
       match Stub.flush conn with
       | 0 -> Successful
       | 1 -> Data_left_to_send
-      | _ -> signal_error conn
-    )
+      | _ -> signal_error conn)
 
   method socket =
     wrap_conn (fun conn ->

lib/postgresql.mli

@@ -531,7 +531,12 @@ object
       @raise Error if there is a connection error.
   *)
 
-  method server_version : int * int * int (* major, minor, revision *)
+  method server_version : int * int * int
+  (* [#server_version] @return (major, minor, revision).
+
+      @raise Error if there is a connection error.
+  *)
+
 
   (** Commands and Queries *)