Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions lib/postgrex/protocol.ex
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,10 @@ defmodule Postgrex.Protocol do
{result, s} = done(s, columns, Enum.reverse(rows), [tag])
recv_simple(s, status, [result | results], [], [], buffer, timeout)

{:ok, msg_empty_query(), buffer} ->
{result, s} = done_empty(s)
recv_simple(s, status, [result | results], [], [], buffer, timeout)

{:ok, msg_error(fields: fields), buffer} ->
err = Postgrex.Error.exception(postgres: fields)
error_ready(s, status, err, buffer)
Expand Down Expand Up @@ -3189,6 +3193,19 @@ defmodule Postgrex.Protocol do
{result, %{s | messages: []}}
end

defp done_empty(%{connection_id: connection_id, messages: messages} = s) do
result = %Postgrex.Result{
command: nil,
num_rows: 0,
rows: nil,
columns: nil,
connection_id: connection_id,
messages: messages
}

{result, %{s | messages: []}}
end

defp halt(s, query, rows, tag) do
case done(s, query, rows, tag) do
{%Postgrex.Result{rows: rows} = result, s} when is_list(rows) ->
Expand Down
18 changes: 18 additions & 0 deletions test/simple_connection_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,24 @@ defmodule SimpleConnectionTest do
assert result2.num_rows == 1
end

test "relaying empty query results", context do
assert {:ok,
[
%Postgrex.Result{
command: nil,
columns: nil,
rows: nil,
num_rows: 0
}
]} = SC.call(context.conn, {:query, ""})

assert {:ok, [%Postgrex.Result{command: nil, rows: nil, num_rows: 0}]} =
SC.call(context.conn, {:query, "-- no statement"})

assert {:ok, [%Postgrex.Result{rows: [["1"]]}]} =
SC.call(context.conn, {:query, "SELECT 1"})
end

test "relaying query errors", context do
assert {:ok, %Postgrex.Error{}} = SC.call(context.conn, {:query, "SELCT"})
end
Expand Down
Loading