From 23cbe89dfdd28d2e46fdf618223e71f72d28f42a Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Wed, 2 Jan 2019 12:28:11 -0600
Subject: [PATCH] Handle empty query response

---
 pgconn/pgconn.go      |  4 ++++
 pgconn/pgconn_test.go | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/pgconn/pgconn.go b/pgconn/pgconn.go
index de7020b2..b3abe8e0 100644
--- a/pgconn/pgconn.go
+++ b/pgconn/pgconn.go
@@ -440,6 +440,10 @@ func (pgConn *PgConn) NextResult(ctx context.Context) bool {
 			cleanupContext()
 			pgConn.resultReader = PgResultReader{pgConn: pgConn, ctx: ctx, commandTag: CommandTag(msg.CommandTag), complete: true}
 			return true
+		case *pgproto3.EmptyQueryResponse:
+			cleanupContext()
+			pgConn.resultReader = PgResultReader{pgConn: pgConn, ctx: ctx, complete: true}
+			return true
 		case *pgproto3.ErrorResponse:
 			cleanupContext()
 			pgConn.resultReader = PgResultReader{pgConn: pgConn, ctx: ctx, err: errorResponseToPgError(msg), complete: true}
diff --git a/pgconn/pgconn_test.go b/pgconn/pgconn_test.go
index ee573d42..8d6b606a 100644
--- a/pgconn/pgconn_test.go
+++ b/pgconn/pgconn_test.go
@@ -245,6 +245,19 @@ func TestConnExec(t *testing.T) {
 	assert.Equal(t, pgConn.Config.Database, string(result.Rows[0][0]))
 }
 
+func TestConnExecEmpty(t *testing.T) {
+	t.Parallel()
+
+	pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE"))
+	require.Nil(t, err)
+	defer closeConn(t, pgConn)
+
+	result, err := pgConn.Exec(context.Background(), ";")
+	require.Nil(t, err)
+	assert.Nil(t, result.CommandTag)
+	assert.Equal(t, 0, len(result.Rows))
+}
+
 func TestConnExecMultipleQueries(t *testing.T) {
 	t.Parallel()