Tidying up

Author: fulghum

sql/types/strings.go

@@ -227,7 +227,6 @@ func (t StringType) MaxTextResponseByteLength(ctx *sql.Context) uint32 {
 	// since the max bytes field in a column definition response over the wire is a uint32 and multiplying
 	// longTextBlobMax by anything over 1 would cause it to overflow.
 	if t.baseType == sqltypes.Text && t.maxByteLength != LongTextBlobMax {
-		// TODO: What happens if character_set_results is set to NULL?
 		characterSetResults := ctx.GetCharacterSetResults()
 		charsetMaxLength := uint32(characterSetResults.MaxLength())
 		return uint32(t.maxByteLength) * charsetMaxLength

sql/types/strings_test.go

@@ -216,28 +216,19 @@ func TestStringCreateString(t *testing.T) {
 			10, false},
 
 		// Out of bounds error cases
-		{sqltypes.Binary, charBinaryMax + 1, sql.Collation_binary, StringType{},
-			0, true},
-		{sqltypes.Blob, LongTextBlobMax + 1, sql.Collation_binary, StringType{},
-			0, true},
-		{sqltypes.Char, charBinaryMax + 1, sql.Collation_Default, StringType{},
-			0, true},
-		{sqltypes.Text, LongTextBlobMax + 1, sql.Collation_Default, StringType{},
-			0, true},
+		{sqltypes.Binary, charBinaryMax + 1, sql.Collation_binary, StringType{}, 0, true},
+		{sqltypes.Blob, LongTextBlobMax + 1, sql.Collation_binary, StringType{}, 0, true},
+		{sqltypes.Char, charBinaryMax + 1, sql.Collation_Default, StringType{}, 0, true},
+		{sqltypes.Text, LongTextBlobMax + 1, sql.Collation_Default, StringType{}, 0, true},
 
 		// JSON strings can also come in over the wire as VARBINARY types, and JSON allows a much larger length limit (1GB).
-		{sqltypes.VarBinary, MaxJsonFieldByteLength + 1, sql.Collation_binary, StringType{},
-			0, true},
-		{sqltypes.VarChar, varcharVarbinaryMax + 1, sql.Collation_Default, StringType{},
-			0, true},
+		{sqltypes.VarBinary, MaxJsonFieldByteLength + 1, sql.Collation_binary, StringType{}, 0, true},
+		{sqltypes.VarChar, varcharVarbinaryMax + 1, sql.Collation_Default, StringType{}, 0, true},
 
 		// Default collation is not valid for these types
-		{sqltypes.Binary, 10, sql.Collation_Default, StringType{},
-			0, true},
-		{sqltypes.Blob, 10, sql.Collation_Default, StringType{},
-			0, true},
-		{sqltypes.VarBinary, 10, sql.Collation_Default, StringType{},
-			0, true},
+		{sqltypes.Binary, 10, sql.Collation_Default, StringType{}, 0, true},
+		{sqltypes.Blob, 10, sql.Collation_Default, StringType{}, 0, true},
+		{sqltypes.VarBinary, 10, sql.Collation_Default, StringType{}, 0, true},
 	}
 
 	ctx := sql.NewContext(