Merge branch 'maint'

4 files changed, 88 insertions, 2 deletions

diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c
index a6b3de6e48..5730e20774 100644
--- a/lib/odbc/c_src/odbcserver.c
+++ b/lib/odbc/c_src/odbcserver.c
@@ -1222,7 +1222,7 @@ static db_result_msg encode_out_params(db_state *state,
 					   (column.type.strlen_or_indptr_array[j]));
 			break;
                 case SQL_C_SLONG:
-                    ei_x_encode_long(&dynamic_buffer(state), ((long*)values)[j]);
+                    ei_x_encode_long(&dynamic_buffer(state), ((SQLINTEGER*)values)[j]);
                     break;
                 case SQL_C_DOUBLE:
                     ei_x_encode_double(&dynamic_buffer(state),
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index 062373afa0..56550bfaa6 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -43,7 +43,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     case odbc_test_lib:odbc_check() of
 	ok ->
-	    [sql_query, next, {group, scrollable_cursors}, select_count,
+	    [stored_proc, sql_query, next, {group, scrollable_cursors}, select_count,
 	     select_next, select_relative, select_absolute,
 	     create_table_twice, delete_table_twice, duplicate_key,
 	     not_connection_owner, no_result_set, query_error,
@@ -172,6 +172,26 @@ end_per_testcase(_Case, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
+stored_proc(doc)->
+    ["Test stored proc with OUT param"];
+stored_proc(suite) -> [];
+stored_proc(Config) when is_list(Config) ->
+    case ?RDBMS of
+        X when X == oracle; X == postgres->
+            Ref = ?config(connection_ref, Config),
+            {updated, _} =
+                odbc:sql_query(Ref,
+                               ?RDBMS:stored_proc_integer_out()),
+            Result = ?RDBMS:query_result(),
+            Result =
+                ?RDBMS:param_query(Ref),
+            {updated, _} =
+                odbc:sql_query(Ref, ?RDBMS:drop_proc()),
+            ok;
+        _ ->
+	    {skip, "stored proc not yet supported"}
+    end.
+
 sql_query(doc)->
     ["Test the common cases"];
 sql_query(suite) -> [];
diff --git a/lib/odbc/test/oracle.erl b/lib/odbc/test/oracle.erl
index d74863d8c1..95cf7155dc 100644
--- a/lib/odbc/test/oracle.erl
+++ b/lib/odbc/test/oracle.erl
@@ -240,3 +240,30 @@ describe_floating() ->
     {ok,[{"F",sql_double},{"R",sql_double},{"D",sql_double}]}.
 describe_dec_num() ->
     {ok,[{"MYDEC",{sql_decimal,9,3}},{"MYNUM",{sql_decimal,9,2}}]}.
+
+%-------------------------------------------------------------------------
+drop_proc() ->
+    "drop procedure test_proc1;".
+
+stored_proc_integer_out() ->
+    "create or replace PROCEDURE  test_proc1(" ++
+        "int_a OUT NUMBER, " ++
+        "int_b OUT NUMBER) " ++
+        "is " ++
+        "begin " ++
+        " int_a := 123; " ++
+        " int_b := 456; " ++
+        "exception " ++
+        "WHEN NO_DATA_FOUND THEN " ++
+        " int_a := 0; " ++
+        " int_b := 0; " ++
+        "end;".
+
+param_query(Ref) ->
+    odbc:param_query(Ref, "call test_proc1(?,?)",
+                     [{sql_integer, out, [0]},
+                      {sql_integer, out, [0]}]).
+
+
+query_result() ->
+    {executed, 2, [{123, 456}]}.
diff --git a/lib/odbc/test/postgres.erl b/lib/odbc/test/postgres.erl
index d564dbd5ff..0c1761b835 100644
--- a/lib/odbc/test/postgres.erl
+++ b/lib/odbc/test/postgres.erl
@@ -293,3 +293,42 @@ describe_dec_num() ->
 
 describe_timestamp() ->
     {ok, [{"field", sql_timestamp}]}.
+
+%-------------------------------------------------------------------------
+drop_proc() ->
+    "drop function test_proc1(OUT integer, OUT integer);".
+
+stored_proc_integer_out() ->
+    "create or replace FUNCTION test_proc1(" ++
+        "OUT int_a INTEGER, " ++
+        "OUT int_b INTEGER) " ++
+        "AS $$ " ++
+        "BEGIN " ++
+        " int_a := 123; " ++
+        " int_b := 456; " ++
+        "END " ++
+        "$$ LANGUAGE plpgsql ".
+
+%% This does not test what you might think it is supposed to test.
+%% Since the stored procedure has got 2 out parameters and no
+%% in parameters it is of arity 0 as called below.
+%%
+%% The port program odbcserver.c will marshal these out parameters
+%% and hand them to ODBC. The ODBC driver for postgres will
+%% apparently not give a hoot about these out parameters and instead
+%% return the result in a regular result select set. The port program
+%% will assume it has the result in the out parameters and marshal
+%% these as they are i.e as it itself had packed them, so they
+%% come back unchanged.
+%%
+%% The real function result goes into the void but the code in odbcserver.c
+%% that marshals out parameters returned from ODBC will be run
+%% so that is what this test tests...
+%%
+param_query(Ref) ->
+    odbc:param_query(Ref, "select * from test_proc1()",
+                     [{sql_integer, out, [111]},
+                      {sql_integer, out, [444]}]).
+
+query_result() ->
+    {executed, 2, [{111, 444}]}.