From 7d7bc873964b2dedd64a24a5769e92e2381d6847 Mon Sep 17 00:00:00 2001
From: Manni Wood <manni.lee.wood@gmail.com>
Date: Sat, 12 Nov 2016 12:01:03 -0500
Subject: [PATCH] Moves sql outside of struct

---
 values.go      | 1 -
 values_test.go | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/values.go b/values.go
index 251671bc..e0d56351 100644
--- a/values.go
+++ b/values.go
@@ -3018,7 +3018,6 @@ func decodeAclItemArray(vr *ValueReader) []AclItem {
 	// remove the '{' at the front and the '}' at the end
 	str = str[1 : len(str)-1]
 	return []AclItem{AclItem(str)}
-	// return []AclItem{"=r/postgres"}
 }
 
 func encodeStringSlice(w *WriteBuf, oid Oid, slice []string) error {
diff --git a/values_test.go b/values_test.go
index 326335e0..4c62007c 100644
--- a/values_test.go
+++ b/values_test.go
@@ -649,14 +649,14 @@ func TestAclArrayDecoding(t *testing.T) {
 
 	conn := mustConnect(t, *defaultConnConfig)
 	defer closeConn(t, conn)
+
+	sql := "select $1::aclitem[]"
 	tests := []struct {
-		sql    string
 		query  interface{}
 		scan   interface{}
 		assert func(*testing.T, interface{}, interface{})
 	}{
 		{
-			"select $1::aclitem[]",
 			[]pgx.AclItem{"=r/postgres"},
 			&[]pgx.AclItem{},
 			func(t *testing.T, query, scan interface{}) {
@@ -667,7 +667,7 @@ func TestAclArrayDecoding(t *testing.T) {
 		},
 	}
 	for i, tt := range tests {
-		err := conn.QueryRow(tt.sql, tt.query).Scan(tt.scan)
+		err := conn.QueryRow(sql, tt.query).Scan(tt.scan)
 		if err != nil {
 			t.Errorf(`%d. error reading array: %v`, i, err)
 			if pgerr, ok := err.(pgx.PgError); ok {