The charset test may also raise Error(FATAL,_)

kennknowles · Feb 6, 2019 · feb26f7 · feb26f7
1 parent b101398
commit feb26f7
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/test/test_dblib.ml b/test/test_dblib.ml
@@ -24,8 +24,8 @@ let get_params () =
   | _ ->
     None
 
-let with_conn (user, password, server, database) f =
-  let conn = Dblib.connect ~user ~password server in
+let with_conn ?charset (user, password, server, database) f =
+  let conn = Dblib.connect ?charset ~user ~password server in
   Dblib.use conn database;
   try
     f conn;
@@ -136,14 +136,13 @@ let test_insert params _ =
     )
 
 let test_exception_in_callback params _ =
-    with_conn params (fun conn ->
+    with_conn params ~charset:"iso_1" (fun conn ->
         begin
             try
                 (* \x81 is invalid in UTF-8 and CP1252 *)
-                Dblib.sqlexec conn "\x81"
+                Dblib.sqlexec conn "SELECT ξ"
             with
-            | Dblib.Error(CONVERSION, _) -> ()
-            | e -> raise e
+              Dblib.Error(CONVERSION, _) | Dblib.Error(FATAL, _) -> ()
         end;
         Dblib.sqlexec conn "SELECT 1")