From 763deea17e1b18bb82ca4eafb6225fc3d99041ac Mon Sep 17 00:00:00 2001 From: ferhat elmas Date: Thu, 21 Dec 2017 23:45:26 +0100 Subject: [PATCH] Run gofmt with simplify flag --- batch_test.go | 2 +- conn_test.go | 6 +++--- pgpass_test.go | 10 +++++----- pgtype/aclitem_array_test.go | 24 ++++++++++++------------ pgtype/bool_array_test.go | 24 ++++++++++++------------ pgtype/bytea_array_test.go | 24 ++++++++++++------------ pgtype/cidr_array_test.go | 24 ++++++++++++------------ pgtype/date_array_test.go | 24 ++++++++++++------------ pgtype/enum_array_test.go | 12 ++++++------ pgtype/float4_array_test.go | 24 ++++++++++++------------ pgtype/float8_array_test.go | 24 ++++++++++++------------ pgtype/hstore_array_test.go | 18 +++++++++--------- pgtype/hstore_test.go | 4 ++-- pgtype/inet_array_test.go | 24 ++++++++++++------------ pgtype/int2_array_test.go | 24 ++++++++++++------------ pgtype/int4_array_test.go | 24 ++++++++++++------------ pgtype/int8_array_test.go | 24 ++++++++++++------------ pgtype/numeric_array_test.go | 24 ++++++++++++------------ pgtype/record_test.go | 8 ++++---- pgtype/text_array_test.go | 24 ++++++++++++------------ pgtype/timestamp_array_test.go | 24 ++++++++++++------------ pgtype/timestamptz_array_test.go | 24 ++++++++++++------------ pgtype/varchar_array_test.go | 24 ++++++++++++------------ stdlib/sql.go | 2 +- stdlib/sql_test.go | 2 +- 25 files changed, 224 insertions(+), 224 deletions(-) diff --git a/batch_test.go b/batch_test.go index 3b51971c..54785f79 100644 --- a/batch_test.go +++ b/batch_test.go @@ -700,4 +700,4 @@ func TestTxBeginBatchRollback(t *testing.T) { } ensureConnValid(t, conn) -} \ No newline at end of file +} diff --git a/conn_test.go b/conn_test.go index e117a953..d8781158 100644 --- a/conn_test.go +++ b/conn_test.go @@ -1988,9 +1988,9 @@ func TestConnInitConnInfo(t *testing.T) { // spot check that the standard postgres type names aren't qualified nameOIDs := map[string]pgtype.OID{ "_int8": pgtype.Int8ArrayOID, - "int8": pgtype.Int8OID, - "json": pgtype.JSONOID, - "text": pgtype.TextOID, + "int8": pgtype.Int8OID, + "json": pgtype.JSONOID, + "text": pgtype.TextOID, } for name, oid := range nameOIDs { dtByName, ok := conn.ConnInfo.DataTypeForName(name) diff --git a/pgpass_test.go b/pgpass_test.go index f6094c82..d36e811a 100644 --- a/pgpass_test.go +++ b/pgpass_test.go @@ -15,11 +15,11 @@ func unescape(s string) string { } var passfile = [][]string{ - []string{"test1", "5432", "larrydb", "larry", "whatstheidea"}, - []string{"test1", "5432", "moedb", "moe", "imbecile"}, - []string{"test1", "5432", "curlydb", "curly", "nyuknyuknyuk"}, - []string{"test2", "5432", "*", "shemp", "heymoe"}, - []string{"test2", "5432", "*", "*", `test\\ing\:`}, + {"test1", "5432", "larrydb", "larry", "whatstheidea"}, + {"test1", "5432", "moedb", "moe", "imbecile"}, + {"test1", "5432", "curlydb", "curly", "nyuknyuknyuk"}, + {"test2", "5432", "*", "shemp", "heymoe"}, + {"test2", "5432", "*", "*", `test\\ing\:`}, } func TestPGPass(t *testing.T) { diff --git a/pgtype/aclitem_array_test.go b/pgtype/aclitem_array_test.go index c01eaa13..4e60afca 100644 --- a/pgtype/aclitem_array_test.go +++ b/pgtype/aclitem_array_test.go @@ -17,8 +17,8 @@ func TestACLItemArrayTranscode(t *testing.T) { }, &pgtype.ACLItemArray{ Elements: []pgtype.ACLItem{ - pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present}, - pgtype.ACLItem{Status: pgtype.Null}, + {String: "=r/postgres", Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -26,22 +26,22 @@ func TestACLItemArrayTranscode(t *testing.T) { &pgtype.ACLItemArray{Status: pgtype.Null}, &pgtype.ACLItemArray{ Elements: []pgtype.ACLItem{ - pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present}, - pgtype.ACLItem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present}, - pgtype.ACLItem{String: `postgres=arwdDxt/" tricky, ' } "" \ test user "`, Status: pgtype.Present}, - pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present}, - pgtype.ACLItem{Status: pgtype.Null}, - pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present}, + {String: "=r/postgres", Status: pgtype.Present}, + {String: "postgres=arwdDxt/postgres", Status: pgtype.Present}, + {String: `postgres=arwdDxt/" tricky, ' } "" \ test user "`, Status: pgtype.Present}, + {String: "=r/postgres", Status: pgtype.Present}, + {Status: pgtype.Null}, + {String: "=r/postgres", Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.ACLItemArray{ Elements: []pgtype.ACLItem{ - pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present}, - pgtype.ACLItem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present}, - pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present}, - pgtype.ACLItem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present}, + {String: "=r/postgres", Status: pgtype.Present}, + {String: "postgres=arwdDxt/postgres", Status: pgtype.Present}, + {String: "=r/postgres", Status: pgtype.Present}, + {String: "postgres=arwdDxt/postgres", Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/bool_array_test.go b/pgtype/bool_array_test.go index 87886da6..b529555e 100644 --- a/pgtype/bool_array_test.go +++ b/pgtype/bool_array_test.go @@ -17,8 +17,8 @@ func TestBoolArrayTranscode(t *testing.T) { }, &pgtype.BoolArray{ Elements: []pgtype.Bool{ - pgtype.Bool{Bool: true, Status: pgtype.Present}, - pgtype.Bool{Status: pgtype.Null}, + {Bool: true, Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -26,22 +26,22 @@ func TestBoolArrayTranscode(t *testing.T) { &pgtype.BoolArray{Status: pgtype.Null}, &pgtype.BoolArray{ Elements: []pgtype.Bool{ - pgtype.Bool{Bool: true, Status: pgtype.Present}, - pgtype.Bool{Bool: true, Status: pgtype.Present}, - pgtype.Bool{Bool: false, Status: pgtype.Present}, - pgtype.Bool{Bool: true, Status: pgtype.Present}, - pgtype.Bool{Status: pgtype.Null}, - pgtype.Bool{Bool: false, Status: pgtype.Present}, + {Bool: true, Status: pgtype.Present}, + {Bool: true, Status: pgtype.Present}, + {Bool: false, Status: pgtype.Present}, + {Bool: true, Status: pgtype.Present}, + {Status: pgtype.Null}, + {Bool: false, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.BoolArray{ Elements: []pgtype.Bool{ - pgtype.Bool{Bool: true, Status: pgtype.Present}, - pgtype.Bool{Bool: false, Status: pgtype.Present}, - pgtype.Bool{Bool: true, Status: pgtype.Present}, - pgtype.Bool{Bool: false, Status: pgtype.Present}, + {Bool: true, Status: pgtype.Present}, + {Bool: false, Status: pgtype.Present}, + {Bool: true, Status: pgtype.Present}, + {Bool: false, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/bytea_array_test.go b/pgtype/bytea_array_test.go index 451c2461..8450b71b 100644 --- a/pgtype/bytea_array_test.go +++ b/pgtype/bytea_array_test.go @@ -17,8 +17,8 @@ func TestByteaArrayTranscode(t *testing.T) { }, &pgtype.ByteaArray{ Elements: []pgtype.Bytea{ - pgtype.Bytea{Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, - pgtype.Bytea{Status: pgtype.Null}, + {Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -26,22 +26,22 @@ func TestByteaArrayTranscode(t *testing.T) { &pgtype.ByteaArray{Status: pgtype.Null}, &pgtype.ByteaArray{ Elements: []pgtype.Bytea{ - pgtype.Bytea{Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, - pgtype.Bytea{Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, - pgtype.Bytea{Bytes: []byte{}, Status: pgtype.Present}, - pgtype.Bytea{Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, - pgtype.Bytea{Status: pgtype.Null}, - pgtype.Bytea{Bytes: []byte{1}, Status: pgtype.Present}, + {Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, + {Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, + {Bytes: []byte{}, Status: pgtype.Present}, + {Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, + {Status: pgtype.Null}, + {Bytes: []byte{1}, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.ByteaArray{ Elements: []pgtype.Bytea{ - pgtype.Bytea{Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, - pgtype.Bytea{Bytes: []byte{}, Status: pgtype.Present}, - pgtype.Bytea{Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, - pgtype.Bytea{Bytes: []byte{1}, Status: pgtype.Present}, + {Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, + {Bytes: []byte{}, Status: pgtype.Present}, + {Bytes: []byte{1, 2, 3}, Status: pgtype.Present}, + {Bytes: []byte{1}, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/cidr_array_test.go b/pgtype/cidr_array_test.go index 70d3f65b..206a590f 100644 --- a/pgtype/cidr_array_test.go +++ b/pgtype/cidr_array_test.go @@ -18,8 +18,8 @@ func TestCIDRArrayTranscode(t *testing.T) { }, &pgtype.CIDRArray{ Elements: []pgtype.CIDR{ - pgtype.CIDR{IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, - pgtype.CIDR{Status: pgtype.Null}, + {IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -27,22 +27,22 @@ func TestCIDRArrayTranscode(t *testing.T) { &pgtype.CIDRArray{Status: pgtype.Null}, &pgtype.CIDRArray{ Elements: []pgtype.CIDR{ - pgtype.CIDR{IPNet: mustParseCIDR(t, "127.0.0.1/32"), Status: pgtype.Present}, - pgtype.CIDR{IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, - pgtype.CIDR{IPNet: mustParseCIDR(t, "192.168.0.1/32"), Status: pgtype.Present}, - pgtype.CIDR{IPNet: mustParseCIDR(t, "2607:f8b0:4009:80b::200e/128"), Status: pgtype.Present}, - pgtype.CIDR{Status: pgtype.Null}, - pgtype.CIDR{IPNet: mustParseCIDR(t, "255.0.0.0/8"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "127.0.0.1/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "192.168.0.1/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "2607:f8b0:4009:80b::200e/128"), Status: pgtype.Present}, + {Status: pgtype.Null}, + {IPNet: mustParseCIDR(t, "255.0.0.0/8"), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.CIDRArray{ Elements: []pgtype.CIDR{ - pgtype.CIDR{IPNet: mustParseCIDR(t, "127.0.0.1/32"), Status: pgtype.Present}, - pgtype.CIDR{IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, - pgtype.CIDR{IPNet: mustParseCIDR(t, "192.168.0.1/32"), Status: pgtype.Present}, - pgtype.CIDR{IPNet: mustParseCIDR(t, "2607:f8b0:4009:80b::200e/128"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "127.0.0.1/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "192.168.0.1/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "2607:f8b0:4009:80b::200e/128"), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/date_array_test.go b/pgtype/date_array_test.go index 74ebfbbe..2ba19d1a 100644 --- a/pgtype/date_array_test.go +++ b/pgtype/date_array_test.go @@ -18,8 +18,8 @@ func TestDateArrayTranscode(t *testing.T) { }, &pgtype.DateArray{ Elements: []pgtype.Date{ - pgtype.Date{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Date{Status: pgtype.Null}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -27,22 +27,22 @@ func TestDateArrayTranscode(t *testing.T) { &pgtype.DateArray{Status: pgtype.Null}, &pgtype.DateArray{ Elements: []pgtype.Date{ - pgtype.Date{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Date{Time: time.Date(2016, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Date{Time: time.Date(2017, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Date{Time: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Date{Status: pgtype.Null}, - pgtype.Date{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2016, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2017, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Status: pgtype.Null}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.DateArray{ Elements: []pgtype.Date{ - pgtype.Date{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Date{Time: time.Date(2015, 2, 2, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Date{Time: time.Date(2015, 2, 3, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Date{Time: time.Date(2015, 2, 4, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 2, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 3, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 4, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/enum_array_test.go b/pgtype/enum_array_test.go index 94774e1e..9cc950af 100644 --- a/pgtype/enum_array_test.go +++ b/pgtype/enum_array_test.go @@ -27,8 +27,8 @@ func TestEnumArrayTranscode(t *testing.T) { }, &pgtype.EnumArray{ Elements: []pgtype.GenericText{ - pgtype.GenericText{String: "red", Status: pgtype.Present}, - pgtype.GenericText{Status: pgtype.Null}, + {String: "red", Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -36,10 +36,10 @@ func TestEnumArrayTranscode(t *testing.T) { &pgtype.EnumArray{Status: pgtype.Null}, &pgtype.EnumArray{ Elements: []pgtype.GenericText{ - pgtype.GenericText{String: "red", Status: pgtype.Present}, - pgtype.GenericText{String: "green", Status: pgtype.Present}, - pgtype.GenericText{String: "blue", Status: pgtype.Present}, - pgtype.GenericText{String: "red", Status: pgtype.Present}, + {String: "red", Status: pgtype.Present}, + {String: "green", Status: pgtype.Present}, + {String: "blue", Status: pgtype.Present}, + {String: "red", Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/float4_array_test.go b/pgtype/float4_array_test.go index 6d6a4f30..4d6511b4 100644 --- a/pgtype/float4_array_test.go +++ b/pgtype/float4_array_test.go @@ -17,8 +17,8 @@ func TestFloat4ArrayTranscode(t *testing.T) { }, &pgtype.Float4Array{ Elements: []pgtype.Float4{ - pgtype.Float4{Float: 1, Status: pgtype.Present}, - pgtype.Float4{Status: pgtype.Null}, + {Float: 1, Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -26,22 +26,22 @@ func TestFloat4ArrayTranscode(t *testing.T) { &pgtype.Float4Array{Status: pgtype.Null}, &pgtype.Float4Array{ Elements: []pgtype.Float4{ - pgtype.Float4{Float: 1, Status: pgtype.Present}, - pgtype.Float4{Float: 2, Status: pgtype.Present}, - pgtype.Float4{Float: 3, Status: pgtype.Present}, - pgtype.Float4{Float: 4, Status: pgtype.Present}, - pgtype.Float4{Status: pgtype.Null}, - pgtype.Float4{Float: 6, Status: pgtype.Present}, + {Float: 1, Status: pgtype.Present}, + {Float: 2, Status: pgtype.Present}, + {Float: 3, Status: pgtype.Present}, + {Float: 4, Status: pgtype.Present}, + {Status: pgtype.Null}, + {Float: 6, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.Float4Array{ Elements: []pgtype.Float4{ - pgtype.Float4{Float: 1, Status: pgtype.Present}, - pgtype.Float4{Float: 2, Status: pgtype.Present}, - pgtype.Float4{Float: 3, Status: pgtype.Present}, - pgtype.Float4{Float: 4, Status: pgtype.Present}, + {Float: 1, Status: pgtype.Present}, + {Float: 2, Status: pgtype.Present}, + {Float: 3, Status: pgtype.Present}, + {Float: 4, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/float8_array_test.go b/pgtype/float8_array_test.go index 56801e80..ff8e3b26 100644 --- a/pgtype/float8_array_test.go +++ b/pgtype/float8_array_test.go @@ -17,8 +17,8 @@ func TestFloat8ArrayTranscode(t *testing.T) { }, &pgtype.Float8Array{ Elements: []pgtype.Float8{ - pgtype.Float8{Float: 1, Status: pgtype.Present}, - pgtype.Float8{Status: pgtype.Null}, + {Float: 1, Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -26,22 +26,22 @@ func TestFloat8ArrayTranscode(t *testing.T) { &pgtype.Float8Array{Status: pgtype.Null}, &pgtype.Float8Array{ Elements: []pgtype.Float8{ - pgtype.Float8{Float: 1, Status: pgtype.Present}, - pgtype.Float8{Float: 2, Status: pgtype.Present}, - pgtype.Float8{Float: 3, Status: pgtype.Present}, - pgtype.Float8{Float: 4, Status: pgtype.Present}, - pgtype.Float8{Status: pgtype.Null}, - pgtype.Float8{Float: 6, Status: pgtype.Present}, + {Float: 1, Status: pgtype.Present}, + {Float: 2, Status: pgtype.Present}, + {Float: 3, Status: pgtype.Present}, + {Float: 4, Status: pgtype.Present}, + {Status: pgtype.Null}, + {Float: 6, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.Float8Array{ Elements: []pgtype.Float8{ - pgtype.Float8{Float: 1, Status: pgtype.Present}, - pgtype.Float8{Float: 2, Status: pgtype.Present}, - pgtype.Float8{Float: 3, Status: pgtype.Present}, - pgtype.Float8{Float: 4, Status: pgtype.Present}, + {Float: 1, Status: pgtype.Present}, + {Float: 2, Status: pgtype.Present}, + {Float: 3, Status: pgtype.Present}, + {Float: 4, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/hstore_array_test.go b/pgtype/hstore_array_test.go index fcf08c49..d629a04b 100644 --- a/pgtype/hstore_array_test.go +++ b/pgtype/hstore_array_test.go @@ -18,12 +18,12 @@ func TestHstoreArrayTranscode(t *testing.T) { } values := []pgtype.Hstore{ - pgtype.Hstore{Map: map[string]pgtype.Text{}, Status: pgtype.Present}, - pgtype.Hstore{Map: map[string]pgtype.Text{"foo": text("bar")}, Status: pgtype.Present}, - pgtype.Hstore{Map: map[string]pgtype.Text{"foo": text("bar"), "baz": text("quz")}, Status: pgtype.Present}, - pgtype.Hstore{Map: map[string]pgtype.Text{"NULL": text("bar")}, Status: pgtype.Present}, - pgtype.Hstore{Map: map[string]pgtype.Text{"foo": text("NULL")}, Status: pgtype.Present}, - pgtype.Hstore{Status: pgtype.Null}, + {Map: map[string]pgtype.Text{}, Status: pgtype.Present}, + {Map: map[string]pgtype.Text{"foo": text("bar")}, Status: pgtype.Present}, + {Map: map[string]pgtype.Text{"foo": text("bar"), "baz": text("quz")}, Status: pgtype.Present}, + {Map: map[string]pgtype.Text{"NULL": text("bar")}, Status: pgtype.Present}, + {Map: map[string]pgtype.Text{"foo": text("NULL")}, Status: pgtype.Present}, + {Status: pgtype.Null}, } specialStrings := []string{ @@ -120,11 +120,11 @@ func TestHstoreArraySet(t *testing.T) { result pgtype.HstoreArray }{ { - src: []map[string]string{map[string]string{"foo": "bar"}}, + src: []map[string]string{{"foo": "bar"}}, result: pgtype.HstoreArray{ Elements: []pgtype.Hstore{ { - Map: map[string]pgtype.Text{"foo": pgtype.Text{String: "bar", Status: pgtype.Present}}, + Map: map[string]pgtype.Text{"foo": {String: "bar", Status: pgtype.Present}}, Status: pgtype.Present, }, }, @@ -159,7 +159,7 @@ func TestHstoreArrayAssignTo(t *testing.T) { src: pgtype.HstoreArray{ Elements: []pgtype.Hstore{ { - Map: map[string]pgtype.Text{"foo": pgtype.Text{String: "bar", Status: pgtype.Present}}, + Map: map[string]pgtype.Text{"foo": {String: "bar", Status: pgtype.Present}}, Status: pgtype.Present, }, }, diff --git a/pgtype/hstore_test.go b/pgtype/hstore_test.go index dc2439fc..d76c9942 100644 --- a/pgtype/hstore_test.go +++ b/pgtype/hstore_test.go @@ -68,7 +68,7 @@ func TestHstoreSet(t *testing.T) { src map[string]string result pgtype.Hstore }{ - {src: map[string]string{"foo": "bar"}, result: pgtype.Hstore{Map: map[string]pgtype.Text{"foo": pgtype.Text{String: "bar", Status: pgtype.Present}}, Status: pgtype.Present}}, + {src: map[string]string{"foo": "bar"}, result: pgtype.Hstore{Map: map[string]pgtype.Text{"foo": {String: "bar", Status: pgtype.Present}}, Status: pgtype.Present}}, } for i, tt := range successfulTests { @@ -92,7 +92,7 @@ func TestHstoreAssignTo(t *testing.T) { dst *map[string]string expected map[string]string }{ - {src: pgtype.Hstore{Map: map[string]pgtype.Text{"foo": pgtype.Text{String: "bar", Status: pgtype.Present}}, Status: pgtype.Present}, dst: &m, expected: map[string]string{"foo": "bar"}}, + {src: pgtype.Hstore{Map: map[string]pgtype.Text{"foo": {String: "bar", Status: pgtype.Present}}, Status: pgtype.Present}, dst: &m, expected: map[string]string{"foo": "bar"}}, {src: pgtype.Hstore{Status: pgtype.Null}, dst: &m, expected: ((map[string]string)(nil))}, } diff --git a/pgtype/inet_array_test.go b/pgtype/inet_array_test.go index 3e2b6a3c..ca528ed3 100644 --- a/pgtype/inet_array_test.go +++ b/pgtype/inet_array_test.go @@ -18,8 +18,8 @@ func TestInetArrayTranscode(t *testing.T) { }, &pgtype.InetArray{ Elements: []pgtype.Inet{ - pgtype.Inet{IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, - pgtype.Inet{Status: pgtype.Null}, + {IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -27,22 +27,22 @@ func TestInetArrayTranscode(t *testing.T) { &pgtype.InetArray{Status: pgtype.Null}, &pgtype.InetArray{ Elements: []pgtype.Inet{ - pgtype.Inet{IPNet: mustParseCIDR(t, "127.0.0.1/32"), Status: pgtype.Present}, - pgtype.Inet{IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, - pgtype.Inet{IPNet: mustParseCIDR(t, "192.168.0.1/32"), Status: pgtype.Present}, - pgtype.Inet{IPNet: mustParseCIDR(t, "2607:f8b0:4009:80b::200e/128"), Status: pgtype.Present}, - pgtype.Inet{Status: pgtype.Null}, - pgtype.Inet{IPNet: mustParseCIDR(t, "255.0.0.0/8"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "127.0.0.1/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "192.168.0.1/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "2607:f8b0:4009:80b::200e/128"), Status: pgtype.Present}, + {Status: pgtype.Null}, + {IPNet: mustParseCIDR(t, "255.0.0.0/8"), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.InetArray{ Elements: []pgtype.Inet{ - pgtype.Inet{IPNet: mustParseCIDR(t, "127.0.0.1/32"), Status: pgtype.Present}, - pgtype.Inet{IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, - pgtype.Inet{IPNet: mustParseCIDR(t, "192.168.0.1/32"), Status: pgtype.Present}, - pgtype.Inet{IPNet: mustParseCIDR(t, "2607:f8b0:4009:80b::200e/128"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "127.0.0.1/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "12.34.56.0/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "192.168.0.1/32"), Status: pgtype.Present}, + {IPNet: mustParseCIDR(t, "2607:f8b0:4009:80b::200e/128"), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/int2_array_test.go b/pgtype/int2_array_test.go index 0adc1aef..0fe763c1 100644 --- a/pgtype/int2_array_test.go +++ b/pgtype/int2_array_test.go @@ -17,8 +17,8 @@ func TestInt2ArrayTranscode(t *testing.T) { }, &pgtype.Int2Array{ Elements: []pgtype.Int2{ - pgtype.Int2{Int: 1, Status: pgtype.Present}, - pgtype.Int2{Status: pgtype.Null}, + {Int: 1, Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -26,22 +26,22 @@ func TestInt2ArrayTranscode(t *testing.T) { &pgtype.Int2Array{Status: pgtype.Null}, &pgtype.Int2Array{ Elements: []pgtype.Int2{ - pgtype.Int2{Int: 1, Status: pgtype.Present}, - pgtype.Int2{Int: 2, Status: pgtype.Present}, - pgtype.Int2{Int: 3, Status: pgtype.Present}, - pgtype.Int2{Int: 4, Status: pgtype.Present}, - pgtype.Int2{Status: pgtype.Null}, - pgtype.Int2{Int: 6, Status: pgtype.Present}, + {Int: 1, Status: pgtype.Present}, + {Int: 2, Status: pgtype.Present}, + {Int: 3, Status: pgtype.Present}, + {Int: 4, Status: pgtype.Present}, + {Status: pgtype.Null}, + {Int: 6, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.Int2Array{ Elements: []pgtype.Int2{ - pgtype.Int2{Int: 1, Status: pgtype.Present}, - pgtype.Int2{Int: 2, Status: pgtype.Present}, - pgtype.Int2{Int: 3, Status: pgtype.Present}, - pgtype.Int2{Int: 4, Status: pgtype.Present}, + {Int: 1, Status: pgtype.Present}, + {Int: 2, Status: pgtype.Present}, + {Int: 3, Status: pgtype.Present}, + {Int: 4, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/int4_array_test.go b/pgtype/int4_array_test.go index 6fad18bb..602a3657 100644 --- a/pgtype/int4_array_test.go +++ b/pgtype/int4_array_test.go @@ -17,8 +17,8 @@ func TestInt4ArrayTranscode(t *testing.T) { }, &pgtype.Int4Array{ Elements: []pgtype.Int4{ - pgtype.Int4{Int: 1, Status: pgtype.Present}, - pgtype.Int4{Status: pgtype.Null}, + {Int: 1, Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -26,22 +26,22 @@ func TestInt4ArrayTranscode(t *testing.T) { &pgtype.Int4Array{Status: pgtype.Null}, &pgtype.Int4Array{ Elements: []pgtype.Int4{ - pgtype.Int4{Int: 1, Status: pgtype.Present}, - pgtype.Int4{Int: 2, Status: pgtype.Present}, - pgtype.Int4{Int: 3, Status: pgtype.Present}, - pgtype.Int4{Int: 4, Status: pgtype.Present}, - pgtype.Int4{Status: pgtype.Null}, - pgtype.Int4{Int: 6, Status: pgtype.Present}, + {Int: 1, Status: pgtype.Present}, + {Int: 2, Status: pgtype.Present}, + {Int: 3, Status: pgtype.Present}, + {Int: 4, Status: pgtype.Present}, + {Status: pgtype.Null}, + {Int: 6, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.Int4Array{ Elements: []pgtype.Int4{ - pgtype.Int4{Int: 1, Status: pgtype.Present}, - pgtype.Int4{Int: 2, Status: pgtype.Present}, - pgtype.Int4{Int: 3, Status: pgtype.Present}, - pgtype.Int4{Int: 4, Status: pgtype.Present}, + {Int: 1, Status: pgtype.Present}, + {Int: 2, Status: pgtype.Present}, + {Int: 3, Status: pgtype.Present}, + {Int: 4, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/int8_array_test.go b/pgtype/int8_array_test.go index 4f5c4f9a..2ca65173 100644 --- a/pgtype/int8_array_test.go +++ b/pgtype/int8_array_test.go @@ -17,8 +17,8 @@ func TestInt8ArrayTranscode(t *testing.T) { }, &pgtype.Int8Array{ Elements: []pgtype.Int8{ - pgtype.Int8{Int: 1, Status: pgtype.Present}, - pgtype.Int8{Status: pgtype.Null}, + {Int: 1, Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -26,22 +26,22 @@ func TestInt8ArrayTranscode(t *testing.T) { &pgtype.Int8Array{Status: pgtype.Null}, &pgtype.Int8Array{ Elements: []pgtype.Int8{ - pgtype.Int8{Int: 1, Status: pgtype.Present}, - pgtype.Int8{Int: 2, Status: pgtype.Present}, - pgtype.Int8{Int: 3, Status: pgtype.Present}, - pgtype.Int8{Int: 4, Status: pgtype.Present}, - pgtype.Int8{Status: pgtype.Null}, - pgtype.Int8{Int: 6, Status: pgtype.Present}, + {Int: 1, Status: pgtype.Present}, + {Int: 2, Status: pgtype.Present}, + {Int: 3, Status: pgtype.Present}, + {Int: 4, Status: pgtype.Present}, + {Status: pgtype.Null}, + {Int: 6, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.Int8Array{ Elements: []pgtype.Int8{ - pgtype.Int8{Int: 1, Status: pgtype.Present}, - pgtype.Int8{Int: 2, Status: pgtype.Present}, - pgtype.Int8{Int: 3, Status: pgtype.Present}, - pgtype.Int8{Int: 4, Status: pgtype.Present}, + {Int: 1, Status: pgtype.Present}, + {Int: 2, Status: pgtype.Present}, + {Int: 3, Status: pgtype.Present}, + {Int: 4, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/numeric_array_test.go b/pgtype/numeric_array_test.go index 25531840..22ee1bc4 100644 --- a/pgtype/numeric_array_test.go +++ b/pgtype/numeric_array_test.go @@ -18,8 +18,8 @@ func TestNumericArrayTranscode(t *testing.T) { }, &pgtype.NumericArray{ Elements: []pgtype.Numeric{ - pgtype.Numeric{Int: big.NewInt(1), Status: pgtype.Present}, - pgtype.Numeric{Status: pgtype.Null}, + {Int: big.NewInt(1), Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -27,22 +27,22 @@ func TestNumericArrayTranscode(t *testing.T) { &pgtype.NumericArray{Status: pgtype.Null}, &pgtype.NumericArray{ Elements: []pgtype.Numeric{ - pgtype.Numeric{Int: big.NewInt(1), Status: pgtype.Present}, - pgtype.Numeric{Int: big.NewInt(2), Status: pgtype.Present}, - pgtype.Numeric{Int: big.NewInt(3), Status: pgtype.Present}, - pgtype.Numeric{Int: big.NewInt(4), Status: pgtype.Present}, - pgtype.Numeric{Status: pgtype.Null}, - pgtype.Numeric{Int: big.NewInt(6), Status: pgtype.Present}, + {Int: big.NewInt(1), Status: pgtype.Present}, + {Int: big.NewInt(2), Status: pgtype.Present}, + {Int: big.NewInt(3), Status: pgtype.Present}, + {Int: big.NewInt(4), Status: pgtype.Present}, + {Status: pgtype.Null}, + {Int: big.NewInt(6), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.NumericArray{ Elements: []pgtype.Numeric{ - pgtype.Numeric{Int: big.NewInt(1), Status: pgtype.Present}, - pgtype.Numeric{Int: big.NewInt(2), Status: pgtype.Present}, - pgtype.Numeric{Int: big.NewInt(3), Status: pgtype.Present}, - pgtype.Numeric{Int: big.NewInt(4), Status: pgtype.Present}, + {Int: big.NewInt(1), Status: pgtype.Present}, + {Int: big.NewInt(2), Status: pgtype.Present}, + {Int: big.NewInt(3), Status: pgtype.Present}, + {Int: big.NewInt(4), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/record_test.go b/pgtype/record_test.go index dc01cbbf..a3730a3e 100644 --- a/pgtype/record_test.go +++ b/pgtype/record_test.go @@ -52,10 +52,10 @@ func TestRecordTranscode(t *testing.T) { &pgtype.Text{String: "foo", Status: pgtype.Present}, &pgtype.Int4Array{ Elements: []pgtype.Int4{ - pgtype.Int4{Int: 1, Status: pgtype.Present}, - pgtype.Int4{Int: 2, Status: pgtype.Present}, - pgtype.Int4{Status: pgtype.Null}, - pgtype.Int4{Int: 4, Status: pgtype.Present}, + {Int: 1, Status: pgtype.Present}, + {Int: 2, Status: pgtype.Present}, + {Status: pgtype.Null}, + {Int: 4, Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 4, LowerBound: 1}}, Status: pgtype.Present, diff --git a/pgtype/text_array_test.go b/pgtype/text_array_test.go index 35ebef96..105d9353 100644 --- a/pgtype/text_array_test.go +++ b/pgtype/text_array_test.go @@ -17,8 +17,8 @@ func TestTextArrayTranscode(t *testing.T) { }, &pgtype.TextArray{ Elements: []pgtype.Text{ - pgtype.Text{String: "foo", Status: pgtype.Present}, - pgtype.Text{Status: pgtype.Null}, + {String: "foo", Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -26,22 +26,22 @@ func TestTextArrayTranscode(t *testing.T) { &pgtype.TextArray{Status: pgtype.Null}, &pgtype.TextArray{ Elements: []pgtype.Text{ - pgtype.Text{String: "bar ", Status: pgtype.Present}, - pgtype.Text{String: "NuLL", Status: pgtype.Present}, - pgtype.Text{String: `wow"quz\`, Status: pgtype.Present}, - pgtype.Text{String: "", Status: pgtype.Present}, - pgtype.Text{Status: pgtype.Null}, - pgtype.Text{String: "null", Status: pgtype.Present}, + {String: "bar ", Status: pgtype.Present}, + {String: "NuLL", Status: pgtype.Present}, + {String: `wow"quz\`, Status: pgtype.Present}, + {String: "", Status: pgtype.Present}, + {Status: pgtype.Null}, + {String: "null", Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.TextArray{ Elements: []pgtype.Text{ - pgtype.Text{String: "bar", Status: pgtype.Present}, - pgtype.Text{String: "baz", Status: pgtype.Present}, - pgtype.Text{String: "quz", Status: pgtype.Present}, - pgtype.Text{String: "foo", Status: pgtype.Present}, + {String: "bar", Status: pgtype.Present}, + {String: "baz", Status: pgtype.Present}, + {String: "quz", Status: pgtype.Present}, + {String: "foo", Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/timestamp_array_test.go b/pgtype/timestamp_array_test.go index c75d101f..5821f43a 100644 --- a/pgtype/timestamp_array_test.go +++ b/pgtype/timestamp_array_test.go @@ -18,8 +18,8 @@ func TestTimestampArrayTranscode(t *testing.T) { }, &pgtype.TimestampArray{ Elements: []pgtype.Timestamp{ - pgtype.Timestamp{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamp{Status: pgtype.Null}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -27,22 +27,22 @@ func TestTimestampArrayTranscode(t *testing.T) { &pgtype.TimestampArray{Status: pgtype.Null}, &pgtype.TimestampArray{ Elements: []pgtype.Timestamp{ - pgtype.Timestamp{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamp{Time: time.Date(2016, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamp{Time: time.Date(2017, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamp{Time: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamp{Status: pgtype.Null}, - pgtype.Timestamp{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2016, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2017, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Status: pgtype.Null}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.TimestampArray{ Elements: []pgtype.Timestamp{ - pgtype.Timestamp{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamp{Time: time.Date(2015, 2, 2, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamp{Time: time.Date(2015, 2, 3, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamp{Time: time.Date(2015, 2, 4, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 2, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 3, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 4, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/timestamptz_array_test.go b/pgtype/timestamptz_array_test.go index 50ee65d0..8d7ea4c9 100644 --- a/pgtype/timestamptz_array_test.go +++ b/pgtype/timestamptz_array_test.go @@ -18,8 +18,8 @@ func TestTimestamptzArrayTranscode(t *testing.T) { }, &pgtype.TimestamptzArray{ Elements: []pgtype.Timestamptz{ - pgtype.Timestamptz{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamptz{Status: pgtype.Null}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -27,22 +27,22 @@ func TestTimestamptzArrayTranscode(t *testing.T) { &pgtype.TimestamptzArray{Status: pgtype.Null}, &pgtype.TimestamptzArray{ Elements: []pgtype.Timestamptz{ - pgtype.Timestamptz{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamptz{Time: time.Date(2016, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamptz{Time: time.Date(2017, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamptz{Time: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamptz{Status: pgtype.Null}, - pgtype.Timestamptz{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2016, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2017, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Status: pgtype.Null}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.TimestamptzArray{ Elements: []pgtype.Timestamptz{ - pgtype.Timestamptz{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamptz{Time: time.Date(2015, 2, 2, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamptz{Time: time.Date(2015, 2, 3, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, - pgtype.Timestamptz{Time: time.Date(2015, 2, 4, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 2, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 3, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, + {Time: time.Date(2015, 2, 4, 0, 0, 0, 0, time.UTC), Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/pgtype/varchar_array_test.go b/pgtype/varchar_array_test.go index 7d6fb39b..9fb0960f 100644 --- a/pgtype/varchar_array_test.go +++ b/pgtype/varchar_array_test.go @@ -17,8 +17,8 @@ func TestVarcharArrayTranscode(t *testing.T) { }, &pgtype.VarcharArray{ Elements: []pgtype.Varchar{ - pgtype.Varchar{String: "foo", Status: pgtype.Present}, - pgtype.Varchar{Status: pgtype.Null}, + {String: "foo", Status: pgtype.Present}, + {Status: pgtype.Null}, }, Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}}, Status: pgtype.Present, @@ -26,22 +26,22 @@ func TestVarcharArrayTranscode(t *testing.T) { &pgtype.VarcharArray{Status: pgtype.Null}, &pgtype.VarcharArray{ Elements: []pgtype.Varchar{ - pgtype.Varchar{String: "bar ", Status: pgtype.Present}, - pgtype.Varchar{String: "NuLL", Status: pgtype.Present}, - pgtype.Varchar{String: `wow"quz\`, Status: pgtype.Present}, - pgtype.Varchar{String: "", Status: pgtype.Present}, - pgtype.Varchar{Status: pgtype.Null}, - pgtype.Varchar{String: "null", Status: pgtype.Present}, + {String: "bar ", Status: pgtype.Present}, + {String: "NuLL", Status: pgtype.Present}, + {String: `wow"quz\`, Status: pgtype.Present}, + {String: "", Status: pgtype.Present}, + {Status: pgtype.Null}, + {String: "null", Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}}, Status: pgtype.Present, }, &pgtype.VarcharArray{ Elements: []pgtype.Varchar{ - pgtype.Varchar{String: "bar", Status: pgtype.Present}, - pgtype.Varchar{String: "baz", Status: pgtype.Present}, - pgtype.Varchar{String: "quz", Status: pgtype.Present}, - pgtype.Varchar{String: "foo", Status: pgtype.Present}, + {String: "bar", Status: pgtype.Present}, + {String: "baz", Status: pgtype.Present}, + {String: "quz", Status: pgtype.Present}, + {String: "foo", Status: pgtype.Present}, }, Dimensions: []pgtype.ArrayDimension{ {Length: 2, LowerBound: 4}, diff --git a/stdlib/sql.go b/stdlib/sql.go index 04369095..5dec8830 100644 --- a/stdlib/sql.go +++ b/stdlib/sql.go @@ -370,7 +370,7 @@ func (c *Conn) Ping(ctx context.Context) error { // text format so that pgx.Rows.Values doesn't decode it into a native type // (e.g. []int32) func restrictBinaryToDatabaseSqlTypes(ps *pgx.PreparedStatement) { - for i, _ := range ps.FieldDescriptions { + for i := range ps.FieldDescriptions { intrinsic, _ := databaseSqlOIDs[ps.FieldDescriptions[i].DataType] if !intrinsic { ps.FieldDescriptions[i].FormatCode = pgx.TextFormatCode diff --git a/stdlib/sql_test.go b/stdlib/sql_test.go index 1880429d..f2310728 100644 --- a/stdlib/sql_test.go +++ b/stdlib/sql_test.go @@ -1208,7 +1208,7 @@ func TestStmtQueryContextCancel(t *testing.T) { }), pgmock.SendMessage(&pgproto3.ReadyForQuery{TxStatus: 'I'}), - pgmock.ExpectMessage(&pgproto3.Bind{PreparedStatement: "pgx_0", ParameterFormatCodes: []int16{1}, Parameters: [][]uint8{[]uint8{0x0, 0x0, 0x0, 0x2a}}, ResultFormatCodes: []int16{1}}), + pgmock.ExpectMessage(&pgproto3.Bind{PreparedStatement: "pgx_0", ParameterFormatCodes: []int16{1}, Parameters: [][]uint8{{0x0, 0x0, 0x0, 0x2a}}, ResultFormatCodes: []int16{1}}), pgmock.ExpectMessage(&pgproto3.Execute{}), pgmock.ExpectMessage(&pgproto3.Sync{}),