From a9bf3b2e19920f6f516bc2e0211ae2e2f7ce395c Mon Sep 17 00:00:00 2001 From: Daniel Theophanes Date: Thu, 23 Mar 2017 13:17:59 -0700 Subject: database/sql: allow drivers to support custom arg types Previously all arguments were passed through driver.IsValid. This checked arguments against a few fundamental go types and prevented others from being passed in as arguments. The new interface driver.NamedValueChecker may be implemented by both driver.Stmt and driver.Conn. This allows this new interface to completely supersede the driver.ColumnConverter interface as it can be used for checking arguments known to a prepared statement and arbitrary query arguments. The NamedValueChecker may be skipped with driver.ErrSkip after all special cases are exhausted to use the default argument converter. In addition if driver.ErrRemoveArgument is returned the argument will not be passed to the query at all, useful for passing in driver specific per-query options. Add a canonical Out argument wrapper to be passed to OUTPUT parameters. This will unify checks that need to be written in the NameValueChecker. The statement number check is also moved to the argument converter so the NamedValueChecker may remove arguments passed to the query. Fixes #13567 Fixes #18079 Updates #18417 Updates #17834 Updates #16235 Updates #13067 Updates #19797 Change-Id: I89088bd9cca4596a48bba37bfd20d987453ef237 Reviewed-on: https://go-review.googlesource.com/38533 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- src/database/sql/convert_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/database/sql/convert_test.go') diff --git a/src/database/sql/convert_test.go b/src/database/sql/convert_test.go index 853a12ce95..cfe52d7f54 100644 --- a/src/database/sql/convert_test.go +++ b/src/database/sql/convert_test.go @@ -10,6 +10,7 @@ import ( "reflect" "runtime" "strings" + "sync" "testing" "time" ) @@ -468,8 +469,8 @@ func TestDriverArgs(t *testing.T) { }, } for i, tt := range tests { - ds := new(driverStmt) - got, err := driverArgs(ds, tt.args) + ds := &driverStmt{Locker: &sync.Mutex{}, si: stubDriverStmt{nil}} + got, err := driverArgs(nil, ds, tt.args) if err != nil { t.Errorf("test[%d]: %v", i, err) continue -- cgit v1.3