Wrap Deserialization_error and Expected_non_null_column under Column_…

…errors
issuu · Sep 19, 2018 · 4d567be · 4d567be
1 parent 0a09f6e
commit 4d567be
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 30 deletions.
diff --git a/ppx/ppx_mysql.ml b/ppx/ppx_mysql.ml
@@ -89,9 +89,9 @@ let build_out_param_processor ~loc out_params =
       then
         try Ppx_mysql_runtime.Stdlib.Result.Ok [%e ret_expr] with
         | Deserialization_error (col, f, v) ->
-            Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error (`Column_errors [(col, `Deserialization_error (f, v))])
         | Expected_non_null_column col ->
-            Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error (`Column_errors [(col, `Expected_non_null_value)])
       else
         Ppx_mysql_runtime.Stdlib.Result.Error
           (`Unexpected_number_of_columns (len_row, [%e len_expected]))) [@warning "-38"]) 

diff --git a/tests/test_ppx/test_ppx.expected.ml b/tests/test_ppx/test_ppx.expected.ml
@@ -11,9 +11,11 @@ let test_no_params dbh =
     then
       try Ppx_mysql_runtime.Stdlib.Result.Ok () with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 0))) 
     [@warning "-38"]) [@warning "-38"]
@@ -71,9 +73,11 @@ let test_single_output_params dbh =
             with Invalid_argument _ -> raise (Expected_non_null_column "name") )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 1))) 
     [@warning "-38"]) [@warning "-38"]
@@ -143,9 +147,11 @@ let test_pair_output_params dbh =
             with Invalid_argument _ -> raise (Expected_non_null_column "name") )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 2))) 
     [@warning "-38"]) [@warning "-38"]
@@ -203,9 +209,11 @@ let test_one_input_params dbh ~(id : int) =
             with Invalid_argument _ -> raise (Expected_non_null_column "name") )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 1))) 
     [@warning "-38"]) [@warning "-38"]
@@ -278,9 +286,11 @@ let test_two_input_pair_output_params dbh ~(id : int) ~(name : string) =
             with Invalid_argument _ -> raise (Expected_non_null_column "name") )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 2))) 
     [@warning "-38"]) [@warning "-38"]
@@ -350,9 +360,11 @@ let test_select_all dbh =
             with Invalid_argument _ -> raise (Expected_non_null_column "name") )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 2))) 
     [@warning "-38"]) [@warning "-38"]
@@ -421,9 +433,11 @@ let test_repeated_input_params dbh ~(id : int) =
             with Invalid_argument _ -> raise (Expected_non_null_column "name") )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 2))) 
     [@warning "-38"]) [@warning "-38"]
@@ -489,9 +503,11 @@ let test_select_opt dbh ~(id : int) =
             with Invalid_argument _ -> raise (Expected_non_null_column "name") )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 2))) 
     [@warning "-38"]) [@warning "-38"]
@@ -538,9 +554,11 @@ let test_execute dbh ~(id : int) =
     then
       try Ppx_mysql_runtime.Stdlib.Result.Ok () with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 0))) 
     [@warning "-38"]) [@warning "-38"]
@@ -597,9 +615,11 @@ let test_int dbh ~(a : int) ~(b : int option) =
               (Ppx_mysql_runtime.Stdlib.Array.get row 1) )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 2))) 
     [@warning "-38"]) [@warning "-38"]
@@ -668,9 +688,11 @@ let test_int32 dbh ~(a : int32) ~(b : int32 option) =
               (Ppx_mysql_runtime.Stdlib.Array.get row 1) )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 2))) 
     [@warning "-38"]) [@warning "-38"]
@@ -739,9 +761,11 @@ let test_int64 dbh ~(a : int64) ~(b : int64 option) =
               (Ppx_mysql_runtime.Stdlib.Array.get row 1) )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 2))) 
     [@warning "-38"]) [@warning "-38"]
@@ -810,9 +834,11 @@ let test_bool dbh ~(a : bool) ~(b : bool option) =
               (Ppx_mysql_runtime.Stdlib.Array.get row 1) )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 2))) 
     [@warning "-38"]) [@warning "-38"]
@@ -879,9 +905,11 @@ let test_string dbh ~(a : string) ~(b : string option) =
               (Ppx_mysql_runtime.Stdlib.Array.get row 1) )
       with
       | Deserialization_error (col, f, v) ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Deserialization_error (col, f, v))
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Deserialization_error (f, v)])
       | Expected_non_null_column col ->
-          Ppx_mysql_runtime.Stdlib.Result.Error (`Expected_non_null_column col)
+          Ppx_mysql_runtime.Stdlib.Result.Error
+            (`Column_errors [col, `Expected_non_null_value])
     else
       Ppx_mysql_runtime.Stdlib.Result.Error (`Unexpected_number_of_columns (len_row, 2))) 
     [@warning "-38"]) [@warning "-38"]