Skip to content

Commit 0cf50e8

Browse files
committed
[ga-format-pr] Run ./format_repo.sh to fix formatting
1 parent 06c869e commit 0cf50e8

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

enginetest/queries/script_queries.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7243,8 +7243,8 @@ where
72437243
Expected: []sql.Row{{types.OkResult{RowsAffected: 0}}},
72447244
},
72457245
{
7246-
Query: "insert into csv_import_test values (1, UNHEX('56616C6964205554463820C2AE'));",
7247-
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
7246+
Query: "insert into csv_import_test values (1, UNHEX('56616C6964205554463820C2AE'));",
7247+
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
72487248
},
72497249
{
72507250
Query: "insert into csv_import_test values (2, UNHEX('496E76616C6964205554463820AE'));",

sql/types/enum.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ func (t EnumType) Convert(ctx context.Context, v interface{}) (interface{}, sql.
221221
return nil, sql.InRange, ErrConvertingToEnum.New(v)
222222
}
223223

224-
225224
// Equals implements the Type interface.
226225
func (t EnumType) Equals(otherType sql.Type) bool {
227226
if ot, ok := otherType.(EnumType); ok && t.collation.Equals(ot.collation) && len(t.idxToVal) == len(ot.idxToVal) {

sql/types/strings.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ const (
5959

6060
var (
6161
// ErrLengthTooLarge is thrown when a string's length is too large given the other parameters.
62-
ErrLengthTooLarge = errors.NewKind("length is %v but max allowed is %v")
63-
ErrLengthBeyondLimit = errors.NewKind("string '%v' is too large for column '%v'")
64-
ErrBinaryCollation = errors.NewKind("binary types must have the binary collation: %v")
65-
ErrBadCharsetString = errors.NewKind("Incorrect string value: '%v' for column '%s' at row %d")
62+
ErrLengthTooLarge = errors.NewKind("length is %v but max allowed is %v")
63+
ErrLengthBeyondLimit = errors.NewKind("string '%v' is too large for column '%v'")
64+
ErrBinaryCollation = errors.NewKind("binary types must have the binary collation: %v")
65+
ErrBadCharsetString = errors.NewKind("Incorrect string value: '%v' for column '%s' at row %d")
6666
ErrInvalidCharsetString = errors.NewKind("invalid string for charset %s: '%v'")
6767

6868
TinyText = MustCreateStringWithDefaults(sqltypes.Text, TinyTextBlobMax)
@@ -532,11 +532,9 @@ func getColumnContext(ctx context.Context) (string, int64) {
532532
rowNum = num
533533
}
534534

535-
536535
return colName, rowNum
537536
}
538537

539-
540538
// truncateInvalidUTF8 truncates byte slice at first invalid UTF8 sequence (MySQL non-strict behavior)
541539
func truncateInvalidUTF8(data []byte) []byte {
542540
for i := 0; i < len(data); {

0 commit comments

Comments
 (0)