Merge pull request #56 from craff/main

getvalue and alike returns Postgresql.null for NULL values

Author: mmottl

lib/postgresql.mli

@@ -211,7 +211,13 @@ val invalid_oid : oid
 val null : string
 (** [null] can be used as an element of the optional argument [parameters]
     passed to the [exec] or [send_query] method to indicate a NULL value. It is
-    an empty string, but not physically equal to [""]. *)
+    an empty string, but not physically equal to [""].
+
+    [null] is also returned by [getvalue] and [get_escaped_value], [gettuple],
+    ... for NULL values.
+
+    Remark: is you use NULL within array or other structured data, you will have
+    to handle NULL values according to postgresql documentation. *)
 
 (** Class type of query results.
 

lib/postgresql_stubs.c

@@ -796,6 +796,8 @@ CAMLprim value PQgetvalue_stub(value v_res, intnat tup_num, intnat field_num) {
   CAMLparam1(v_res);
   value v_str;
   PGresult *res = get_res(v_res);
+  if (PQgetisnull(res, tup_num, field_num))
+    CAMLreturn(*v_null_param);
   char *str = PQgetvalue(res, tup_num, field_num);
   if (PQfformat(res, field_num) == 0)
     v_str = make_string(str);
@@ -892,6 +894,8 @@ CAMLprim value PQgetescval_stub(value v_res, intnat tup_num, intnat field_num) {
   CAMLparam1(v_res);
   value v_str;
   PGresult *res = get_res(v_res);
+  if (PQgetisnull(res, tup_num, field_num))
+    CAMLreturn(*v_null_param);
   char *str = PQgetvalue(res, tup_num, field_num);
   if (PQfformat(res, field_num) == 0) {
     if (str == NULL || strlen(str) < 2 || !is_bytea_hex_protocol(str))