MM-24312: Fix Dependency updates (#14391)

Automatic Merge

vendor/github.com/Masterminds/squirrel/squirrel.go

@@ -5,7 +5,6 @@ package squirrel
 
 import (
 	"bytes"
-	"context"
 	"database/sql"
 	"fmt"
 	"strings"
@@ -61,31 +60,34 @@ type Runner interface {
 	QueryRower
 }
 
-type stdsql interface {
+// WrapStdSql wraps a type implementing the standard SQL interface with methods that
+// squirrel expects.
+func WrapStdSql(stdSql StdSql) Runner {
+	return &stdsqlRunner{stdSql}
+}
+
+// StdSql encompasses the standard methods of the *sql.DB type, and other types that
+// wrap these methods.
+type StdSql interface {
 	Query(string, ...interface{}) (*sql.Rows, error)
-	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
 	QueryRow(string, ...interface{}) *sql.Row
-	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
 	Exec(string, ...interface{}) (sql.Result, error)
-	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
 }
 
 type stdsqlRunner struct {
-	stdsql
+	StdSql
 }
 
 func (r *stdsqlRunner) QueryRow(query string, args ...interface{}) RowScanner {
-	return r.stdsql.QueryRow(query, args...)
+	return r.StdSql.QueryRow(query, args...)
 }
 
-func setRunWith(b interface{}, baseRunner BaseRunner) interface{} {
-	var runner Runner
-	switch r := baseRunner.(type) {
-	case Runner:
-		runner = r
-	case stdsql:
-		runner = &stdsqlRunner{r}
-
+func setRunWith(b interface{}, runner BaseRunner) interface{} {
+	switch r := runner.(type) {
+	case StdSqlCtx:
+		runner = WrapStdSqlCtx(r)
+	case StdSql:
+		runner = WrapStdSql(r)
 	}
 	return builder.Set(b, "RunWith", runner)
 }
@@ -135,11 +137,18 @@ func DebugSqlizer(s Sqlizer) string {
 		return fmt.Sprintf("[ToSql error: %s]", err)
 	}
 
+	var placeholder string
+	downCast, ok := s.(placeholderDebugger)
+	if !ok {
+		placeholder = "?"
+	} else {
+		placeholder = downCast.debugPlaceholder()
+	}
 	// TODO: dedupe this with placeholder.go
 	buf := &bytes.Buffer{}
 	i := 0
 	for {
-		p := strings.Index(sql, "?")
+		p := strings.Index(sql, placeholder)
 		if p == -1 {
 			break
 		}
@@ -158,6 +167,7 @@ func DebugSqlizer(s Sqlizer) string {
 			}
 			buf.WriteString(sql[:p])
 			fmt.Fprintf(buf, "'%v'", args[i])
+			// advance our sql string "cursor" beyond the arg we placed
 			sql = sql[p+1:]
 			i++
 		}
@@ -167,6 +177,7 @@ func DebugSqlizer(s Sqlizer) string {
 			"[DebugSqlizer error: not enough placeholders in %#v for %d args]",
 			sql, len(args))
 	}
+	// "append" any remaning sql that won't need interpolating
 	buf.WriteString(sql)
 	return buf.String()
 }