From 8a6acecfab2879ba4e26487c99f204ede8b3d935 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Sat, 5 Aug 2023 16:22:48 +0000 Subject: database/sql: add Null[T] Generic version of NullString, NullInt64, etc. Fixes #60370 Change-Id: I166a05a6126e8b8571db5cbb026303bb6551d56b GitHub-Last-Rev: 3c8d2d5141c36f034d2124e19ee090620363ba24 GitHub-Pull-Request: golang/go#60677 Reviewed-on: https://go-review.googlesource.com/c/go/+/501700 Reviewed-by: Jonathan Amsterdam TryBot-Result: Gopher Robot Run-TryBot: Ian Lance Taylor Reviewed-by: Russ Cox --- src/database/sql/sql_test.go | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/database/sql/sql_test.go') diff --git a/src/database/sql/sql_test.go b/src/database/sql/sql_test.go index e6a5cd912a..f1c946d4e4 100644 --- a/src/database/sql/sql_test.go +++ b/src/database/sql/sql_test.go @@ -1803,6 +1803,18 @@ func TestNullStringParam(t *testing.T) { nullTestRun(t, spec) } +func TestGenericNullStringParam(t *testing.T) { + spec := nullTestSpec{"nullstring", "string", [6]nullTestRow{ + {Null[string]{"aqua", true}, "", Null[string]{"aqua", true}}, + {Null[string]{"brown", false}, "", Null[string]{"", false}}, + {"chartreuse", "", Null[string]{"chartreuse", true}}, + {Null[string]{"darkred", true}, "", Null[string]{"darkred", true}}, + {Null[string]{"eel", false}, "", Null[string]{"", false}}, + {"foo", Null[string]{"black", false}, nil}, + }} + nullTestRun(t, spec) +} + func TestNullInt64Param(t *testing.T) { spec := nullTestSpec{"nullint64", "int64", [6]nullTestRow{ {NullInt64{31, true}, 1, NullInt64{31, true}}, @@ -1916,8 +1928,9 @@ func nullTestRun(t *testing.T, spec nullTestSpec) { } // Can't put null val into non-null col - if _, err := stmt.Exec(6, "bob", spec.rows[5].nullParam, spec.rows[5].notNullParam); err == nil { - t.Errorf("expected error inserting nil val with prepared statement Exec") + row5 := spec.rows[5] + if _, err := stmt.Exec(6, "bob", row5.nullParam, row5.notNullParam); err == nil { + t.Errorf("expected error inserting nil val with prepared statement Exec: NULL=%#v, NOT-NULL=%#v", row5.nullParam, row5.notNullParam) } _, err = db.Exec("INSERT|t|id=?,name=?,nullf=?", 999, nil, nil) -- cgit v1.3