Merge pull request #41 from adept/master

mmottl · web-flow · commit 827447ce7e17 · 2020-07-29T20:56:39.000-04:00
PQCancel returns 0 on error. Fixes #40.
diff --git a/src/postgresql_stubs.c b/src/postgresql_stubs.c
@@ -1128,8 +1128,8 @@ CAMLprim value PQCancel_stub(value v_conn)
     caml_enter_blocking_section();
       res = PQcancel(cancel, errbuf, 256);
     caml_leave_blocking_section();
-    if (res == 0) CAMLreturn(v_None);
-    else CAMLreturn(make_some(caml_copy_string(errbuf)));
+    if (res == 0) CAMLreturn(make_some(caml_copy_string(errbuf)));
+    else CAMLreturn(v_None);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1128,8 +1128,8 @@ CAMLprim value PQCancel_stub(value v_conn)`
`1128`	`1128`	`caml_enter_blocking_section();`
`1129`	`1129`	`res = PQcancel(cancel, errbuf, 256);`
`1130`	`1130`	`caml_leave_blocking_section();`
`1131`		`- if (res == 0) CAMLreturn(v_None);`
`1132`		`- else CAMLreturn(make_some(caml_copy_string(errbuf)));`
	`1131`	`+ if (res == 0) CAMLreturn(make_some(caml_copy_string(errbuf)));`
	`1132`	`+ else CAMLreturn(v_None);`
`1133`	`1133`	`}`
`1134`	`1134`	`}`
`1135`	`1135`