Merge pull request #1860 from testwill/fmt

fulghum · web-flow · commit 5fcbc085edd3 · 2023-06-29T13:16:43.000-07:00
chore: unnecessary use of fmt.Sprintf
diff --git a/enginetest/enginetests.go b/enginetest/enginetests.go
@@ -5943,7 +5943,7 @@ func TestPersist(t *testing.T, harness Harness, newPersistableSess func(ctx *sql
 				_, res, _ := sql.SystemVariables.GetGlobal("max_connections")
 				require.Equal(t, tt.ExpectedGlobal, res)
 
-				showGlobalVarsQuery := fmt.Sprintf("SHOW GLOBAL VARIABLES LIKE 'max_connections'")
+				showGlobalVarsQuery := "SHOW GLOBAL VARIABLES LIKE 'max_connections'"
 				TestQueryWithContext(t, ctx, e, harness, showGlobalVarsQuery, []sql.Row{{"max_connections", tt.ExpectedGlobal}}, nil, nil)
 			}
 
diff --git a/enginetest/spatial_index_tests.go b/enginetest/spatial_index_tests.go
@@ -15,7 +15,6 @@
 package enginetest
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -399,12 +398,12 @@ func evalSpatialIndexPlanTest(t *testing.T, harness Harness, e *sqle.Engine, que
 			return true
 		})
 
-		require.True(t, hasFilter, fmt.Sprintf("filter node was missing from plan"))
+		require.True(t, hasFilter, "filter node was missing from plan")
 		if noIdx {
-			require.False(t, hasIndex, fmt.Sprintf("indextableaccess should not be in plan"))
+			require.False(t, hasIndex, "indextableaccess should not be in plan")
 		} else {
-			require.True(t, hasIndex, fmt.Sprintf("indextableaccess node was missing from plan"))
-			require.True(t, hasRightOrder, fmt.Sprintf("filter node was not above indextableaccess"))
+			require.True(t, hasIndex, "indextableaccess node was missing from plan")
+			require.True(t, hasRightOrder, "filter node was not above indextableaccess")
 		}
 	})
 }
@@ -523,12 +522,12 @@ func evalSpatialIndexPlanTestPrepared(t *testing.T, harness Harness, e *sqle.Eng
 			return true
 		})
 
-		require.True(t, hasFilter, fmt.Sprintf("filter node was missing from plan"))
+		require.True(t, hasFilter, "filter node was missing from plan")
 		if noIdx {
-			require.False(t, hasIndex, fmt.Sprintf("indextableaccess should not be in plan"))
+			require.False(t, hasIndex, "indextableaccess should not be in plan")
 		} else {
-			require.True(t, hasIndex, fmt.Sprintf("indextableaccess node was missing from plan"))
-			require.True(t, hasRightOrder, fmt.Sprintf("filter node was not above indextableaccess"))
+			require.True(t, hasIndex, "indextableaccess node was missing from plan")
+			require.True(t, hasRightOrder, "filter node was not above indextableaccess")
 		}
 	})
 }
diff --git a/sql/events.go b/sql/events.go
@@ -61,7 +61,7 @@ type EventDetails struct {
 
 // CreateEventStatement returns a CREATE EVENT statement for this event.
 func (e *EventDetails) CreateEventStatement() string {
-	stmt := fmt.Sprintf("CREATE")
+	stmt := "CREATE"
 	if e.Definer != "" {
 		stmt = fmt.Sprintf("%s DEFINER = %s", stmt, e.Definer)
 	}
diff --git a/sql/expression/div.go b/sql/expression/div.go
@@ -236,7 +236,7 @@ func (d *Div) div(ctx *sql.Context, lval, rval interface{}) (interface{}, error)
 		switch r := rval.(type) {
 		case float32:
 			if r == 0 {
-				arithmeticWarning(ctx, ERDivisionByZero, fmt.Sprintf("Division by 0"))
+				arithmeticWarning(ctx, ERDivisionByZero, "Division by 0")
 				return nil, nil
 			}
 			return l / r, nil
@@ -245,7 +245,7 @@ func (d *Div) div(ctx *sql.Context, lval, rval interface{}) (interface{}, error)
 		switch r := rval.(type) {
 		case float64:
 			if r == 0 {
-				arithmeticWarning(ctx, ERDivisionByZero, fmt.Sprintf("Division by 0"))
+				arithmeticWarning(ctx, ERDivisionByZero, "Division by 0")
 				return nil, nil
 			}
 			return l / r, nil
@@ -254,7 +254,7 @@ func (d *Div) div(ctx *sql.Context, lval, rval interface{}) (interface{}, error)
 		switch r := rval.(type) {
 		case decimal.Decimal:
 			if r.Equal(decimal.NewFromInt(0)) {
-				arithmeticWarning(ctx, ERDivisionByZero, fmt.Sprintf("Division by 0"))
+				arithmeticWarning(ctx, ERDivisionByZero, "Division by 0")
 				return nil, nil
 			}
 
@@ -743,7 +743,7 @@ func intDiv(ctx *sql.Context, lval, rval interface{}) (interface{}, error) {
 		switch r := rval.(type) {
 		case uint64:
 			if r == 0 {
-				arithmeticWarning(ctx, ERDivisionByZero, fmt.Sprintf("Division by 0"))
+				arithmeticWarning(ctx, ERDivisionByZero, "Division by 0")
 				return nil, nil
 			}
 			return l / r, nil
@@ -752,7 +752,7 @@ func intDiv(ctx *sql.Context, lval, rval interface{}) (interface{}, error) {
 		switch r := rval.(type) {
 		case int64:
 			if r == 0 {
-				arithmeticWarning(ctx, ERDivisionByZero, fmt.Sprintf("Division by 0"))
+				arithmeticWarning(ctx, ERDivisionByZero, "Division by 0")
 				return nil, nil
 			}
 			return l / r, nil
@@ -761,7 +761,7 @@ func intDiv(ctx *sql.Context, lval, rval interface{}) (interface{}, error) {
 		switch r := rval.(type) {
 		case float64:
 			if r == 0 {
-				arithmeticWarning(ctx, ERDivisionByZero, fmt.Sprintf("Division by 0"))
+				arithmeticWarning(ctx, ERDivisionByZero, "Division by 0")
 				return nil, nil
 			}
 			res := l / r
@@ -771,7 +771,7 @@ func intDiv(ctx *sql.Context, lval, rval interface{}) (interface{}, error) {
 		switch r := rval.(type) {
 		case decimal.Decimal:
 			if r.Equal(decimal.NewFromInt(0)) {
-				arithmeticWarning(ctx, ERDivisionByZero, fmt.Sprintf("Division by 0"))
+				arithmeticWarning(ctx, ERDivisionByZero, "Division by 0")
 				return nil, nil
 			}
 
diff --git a/sql/expression/function/time.go b/sql/expression/function/time.go
@@ -1458,7 +1458,7 @@ func NewCurrTimestamp(args ...sql.Expression) (sql.Expression, error) {
 
 func (c *CurrTimestamp) String() string {
 	if len(c.Args) == 0 {
-		return fmt.Sprintf("CURRENT_TIMESTAMP()")
+		return "CURRENT_TIMESTAMP()"
 	}
 	return fmt.Sprintf("CURRENT_TIMESTAMP(%s)", c.Args[0].String())
 }
diff --git a/sql/expression/mod.go b/sql/expression/mod.go
@@ -165,7 +165,7 @@ func mod(ctx *sql.Context, lval, rval interface{}) (interface{}, error) {
 		switch r := rval.(type) {
 		case float32:
 			if r == 0 {
-				arithmeticWarning(ctx, ERDivisionByZero, fmt.Sprintf("Division by 0"))
+				arithmeticWarning(ctx, ERDivisionByZero, "Division by 0")
 				return nil, nil
 			}
 			return math.Mod(float64(l), float64(r)), nil
@@ -175,7 +175,7 @@ func mod(ctx *sql.Context, lval, rval interface{}) (interface{}, error) {
 		switch r := rval.(type) {
 		case float64:
 			if r == 0 {
-				arithmeticWarning(ctx, ERDivisionByZero, fmt.Sprintf("Division by 0"))
+				arithmeticWarning(ctx, ERDivisionByZero, "Division by 0")
 				return nil, nil
 			}
 			return math.Mod(l, r), nil
@@ -184,7 +184,7 @@ func mod(ctx *sql.Context, lval, rval interface{}) (interface{}, error) {
 		switch r := rval.(type) {
 		case decimal.Decimal:
 			if r.Equal(decimal.NewFromInt(0)) {
-				arithmeticWarning(ctx, ERDivisionByZero, fmt.Sprintf("Division by 0"))
+				arithmeticWarning(ctx, ERDivisionByZero, "Division by 0")
 				return nil, nil
 			}
 
diff --git a/sql/information_schema/columns_table.go b/sql/information_schema/columns_table.go
@@ -217,7 +217,7 @@ func getRowFromColumn(ctx *sql.Context, curOrdPos int, col *sql.Column, dbName,
 	extra := col.Extra
 	// If extra is not defined, fill it here.
 	if extra == "" && !col.Default.IsLiteral() {
-		extra = fmt.Sprintf("DEFAULT_GENERATED")
+		extra = "DEFAULT_GENERATED"
 	}
 
 	var curColPrivStr []string
diff --git a/sql/parse/parse.go b/sql/parse/parse.go
@@ -914,7 +914,7 @@ func convertShow(ctx *sql.Context, s *sqlparser.Show, query string) (sql.Node, e
 		return node, nil
 	case sqlparser.KeywordString(sqlparser.WARNINGS):
 		if s.CountStar {
-			unsupportedShow := fmt.Sprintf("SHOW COUNT(*) WARNINGS")
+			unsupportedShow := "SHOW COUNT(*) WARNINGS"
 			return nil, sql.ErrUnsupportedFeature.New(unsupportedShow)
 		}
 		var node sql.Node
@@ -1420,7 +1420,7 @@ func convertDBDDL(ctx *sql.Context, c *sqlparser.DBDDL) (sql.Node, error) {
 				ctx.Session.Warn(&sql.Warning{
 					Level:   "Warning",
 					Code:    mysql.ERNotSupportedYet,
-					Message: fmt.Sprintf("Setting CHARACTER SET, COLLATION and ENCRYPTION are not supported yet"),
+					Message: "Setting CHARACTER SET, COLLATION and ENCRYPTION are not supported yet",
 				})
 			}
 		}
diff --git a/sql/plan/alter_event.go b/sql/plan/alter_event.go
@@ -106,7 +106,7 @@ func NewAlterEvent(
 
 // String implements the sql.Node interface.
 func (a *AlterEvent) String() string {
-	stmt := fmt.Sprintf("ALTER")
+	stmt := "ALTER"
 
 	if a.Definer != "" {
 		stmt = fmt.Sprintf("%s DEFINER = %s", stmt, a.Definer)
@@ -416,7 +416,7 @@ func (c *alterEventIter) Next(ctx *sql.Context) (sql.Row, error) {
 				ctx.Session.Warn(&sql.Warning{
 					Level:   "Note",
 					Code:    1544,
-					Message: fmt.Sprintf("Event execution time is in the past. Event has been disabled"),
+					Message: "Event execution time is in the past. Event has been disabled",
 				})
 			} else {
 				return nil, fmt.Errorf("Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.")
diff --git a/sql/plan/ddl_event.go b/sql/plan/ddl_event.go
@@ -148,7 +148,7 @@ func (c *CreateEvent) String() string {
 
 	onCompletion := ""
 	if !c.OnCompPreserve {
-		onCompletion = fmt.Sprintf(" ON COMPLETION NOT PRESERVE")
+		onCompletion = " ON COMPLETION NOT PRESERVE"
 	}
 
 	comment := ""
@@ -355,7 +355,7 @@ func (c *createEventIter) Next(ctx *sql.Context) (sql.Row, error) {
 				ctx.Session.Warn(&sql.Warning{
 					Level:   "Note",
 					Code:    1544,
-					Message: fmt.Sprintf("Event execution time is in the past. Event has been disabled"),
+					Message: "Event execution time is in the past. Event has been disabled",
 				})
 			} else {
 				// If ON COMPLETION NOT PRESERVE is defined, the event is dropped immediately after creation.
@@ -366,7 +366,7 @@ func (c *createEventIter) Next(ctx *sql.Context) (sql.Row, error) {
 				ctx.Session.Warn(&sql.Warning{
 					Level:   "Note",
 					Code:    1588,
-					Message: fmt.Sprintf("Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation."),
+					Message: "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.",
 				})
 			}
 			return sql.Row{types.NewOkResult(0)}, nil
diff --git a/sql/plan/update.go b/sql/plan/update.go
@@ -190,7 +190,7 @@ func (u *Update) String() string {
 
 func (u *Update) DebugString() string {
 	pr := sql.NewTreePrinter()
-	_ = pr.WriteNode(fmt.Sprintf("Update"))
+	_ = pr.WriteNode("Update")
 	_ = pr.WriteChildren(sql.DebugString(u.Child))
 	return pr.String()
 }
diff --git a/sql/planbuilder/show.go b/sql/planbuilder/show.go
@@ -538,7 +538,7 @@ func (b *PlanBuilder) buildShowAllColumns(inScope *scope, s *ast.Show) (outScope
 func (b *PlanBuilder) buildShowWarnings(inScope *scope, s *ast.Show) (outScope *scope) {
 	outScope = inScope.push()
 	if s.CountStar {
-		unsupportedShow := fmt.Sprintf("SHOW COUNT(*) WARNINGS")
+		unsupportedShow := "SHOW COUNT(*) WARNINGS"
 		b.handleErr(sql.ErrUnsupportedFeature.New(unsupportedShow))
 	}
 	var node sql.Node
diff --git a/sql/rowexec/ddl_iters.go b/sql/rowexec/ddl_iters.go
@@ -1846,7 +1846,7 @@ func (b *BaseBuilder) executeAlterIndex(ctx *sql.Context, n *plan.AlterIndex) er
 		ctx.Session.Warn(&sql.Warning{
 			Level:   "Warning",
 			Code:    mysql.ERNotSupportedYet,
-			Message: fmt.Sprintf("'disable/enable keys' feature is not supported yet"),
+			Message: "'disable/enable keys' feature is not supported yet",
 		})
 		return nil
 	default:
diff --git a/sql/rowexec/show.go b/sql/rowexec/show.go
@@ -481,7 +481,7 @@ func (b *BaseBuilder) buildShowColumns(ctx *sql.Context, n *plan.ShowColumns, ro
 		extra := col.Extra
 		// If extra is not defined, fill it here.
 		if extra == "" && !col.Default.IsLiteral() {
-			extra = fmt.Sprintf("DEFAULT_GENERATED")
+			extra = "DEFAULT_GENERATED"
 		}
 
 		if n.Full {

Original file line number	Diff line number	Diff line change
`@@ -5943,7 +5943,7 @@ func TestPersist(t testing.T, harness Harness, newPersistableSess func(ctx sql`
`5943`	`5943`	`_, res, _ := sql.SystemVariables.GetGlobal("max_connections")`
`5944`	`5944`	`require.Equal(t, tt.ExpectedGlobal, res)`
`5945`	`5945`
`5946`		`- showGlobalVarsQuery := fmt.Sprintf("SHOW GLOBAL VARIABLES LIKE 'max_connections'")`
	`5946`	`+ showGlobalVarsQuery := "SHOW GLOBAL VARIABLES LIKE 'max_connections'"`
`5947`	`5947`	`TestQueryWithContext(t, ctx, e, harness, showGlobalVarsQuery, []sql.Row{{"max_connections", tt.ExpectedGlobal}}, nil, nil)`
`5948`	`5948`	`}`
`5949`	`5949`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ type EventDetails struct {`
`61`	`61`
`62`	`62`	`// CreateEventStatement returns a CREATE EVENT statement for this event.`
`63`	`63`	`func (e *EventDetails) CreateEventStatement() string {`
`64`		`- stmt := fmt.Sprintf("CREATE")`
	`64`	`+ stmt := "CREATE"`
`65`	`65`	`if e.Definer != "" {`
`66`	`66`	`stmt = fmt.Sprintf("%s DEFINER = %s", stmt, e.Definer)`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1458,7 +1458,7 @@ func NewCurrTimestamp(args ...sql.Expression) (sql.Expression, error) {`
`1458`	`1458`
`1459`	`1459`	`func (c *CurrTimestamp) String() string {`
`1460`	`1460`	`if len(c.Args) == 0 {`
`1461`		`- return fmt.Sprintf("CURRENT_TIMESTAMP()")`
	`1461`	`+ return "CURRENT_TIMESTAMP()"`
`1462`	`1462`	`}`
`1463`	`1463`	`return fmt.Sprintf("CURRENT_TIMESTAMP(%s)", c.Args[0].String())`
`1464`	`1464`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ func getRowFromColumn(ctx sql.Context, curOrdPos int, col sql.Column, dbName,`
`217`	`217`	`extra := col.Extra`
`218`	`218`	`// If extra is not defined, fill it here.`
`219`	`219`	`if extra == "" && !col.Default.IsLiteral() {`
`220`		`- extra = fmt.Sprintf("DEFAULT_GENERATED")`
	`220`	`+ extra = "DEFAULT_GENERATED"`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`var curColPrivStr []string`
Original file line number	Diff line number	Diff line change
`@@ -914,7 +914,7 @@ func convertShow(ctx sql.Context, s sqlparser.Show, query string) (sql.Node, e`
`914`	`914`	`return node, nil`
`915`	`915`	`case sqlparser.KeywordString(sqlparser.WARNINGS):`
`916`	`916`	`if s.CountStar {`
`917`		`- unsupportedShow := fmt.Sprintf("SHOW COUNT(*) WARNINGS")`
	`917`	`+ unsupportedShow := "SHOW COUNT(*) WARNINGS"`
`918`	`918`	`return nil, sql.ErrUnsupportedFeature.New(unsupportedShow)`
`919`	`919`	`}`
`920`	`920`	`var node sql.Node`
`@@ -1420,7 +1420,7 @@ func convertDBDDL(ctx sql.Context, c sqlparser.DBDDL) (sql.Node, error) {`
`1420`	`1420`	`ctx.Session.Warn(&sql.Warning{`
`1421`	`1421`	`Level: "Warning",`
`1422`	`1422`	`Code: mysql.ERNotSupportedYet,`
`1423`		`- Message: fmt.Sprintf("Setting CHARACTER SET, COLLATION and ENCRYPTION are not supported yet"),`
	`1423`	`+ Message: "Setting CHARACTER SET, COLLATION and ENCRYPTION are not supported yet",`
`1424`	`1424`	`})`
`1425`	`1425`	`}`
`1426`	`1426`	`}`