don't unwrap single element list for execute_batch

wg · Mar 5, 2013 · 9d57001 · 9d57001
1 parent 3d08031
commit 9d57001
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/pgsql_sock.erl b/src/pgsql_sock.erl
@@ -597,14 +597,15 @@ on_message({$I, _Bin}, State) ->
 %% ReadyForQuery
 on_message({$Z, <<Status:8>>}, State) ->
     State2 = case command_tag(State) of
-                 %% TODO don't unwrap single element list for execute_batch
-                 C when C == squery; C == execute_batch ->
+                 squery ->
                      case State#state.results of
                          [Result] ->
                              finish(State, done, Result);
                          Results ->
                              finish(State, done, lists:reverse(Results))
                      end;
+                 execute_batch ->
+                     finish(State, done, lists:reverse(State#state.results));
                  equery ->
                      case State#state.results of
                          [Result] ->

diff --git a/test_src/pgsql_incremental.erl b/test_src/pgsql_incremental.erl
@@ -95,10 +95,7 @@ execute(C, S, PortalName, N) ->
 
 execute_batch(C, Batch) ->
     Ref = ipgsql:execute_batch(C, Batch),
-    case receive_extended_results(C, Ref, []) of
-        [Result] -> Result;
-        Results  -> Results
-    end.
+    receive_extended_results(C, Ref, []).
 
 %% statement/portal functions
 

diff --git a/test_src/pgsql_tests.erl b/test_src/pgsql_tests.erl
@@ -173,6 +173,14 @@ batch_error_test(Module) ->
                     ])
       end).
 
+single_batch_test(Module) ->
+    with_connection(
+      Module,
+      fun(C) ->
+              {ok, S1} = Module:parse(C, "one", "select $1", [int4]),
+              [{ok, [{1}]}] = Module:execute_batch(C, [{S1, [1]}])
+      end).
+
 extended_select_test(Module) ->
     with_connection(
       Module,