Skip to content

Fixing varbinary (varbinary(XX)) schema migration for mysql to map to correct spanner type with length BYTES(XX) #1164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
darshan-sj merged 3 commits into from
Jul 20, 2025
Merged

Fixing varbinary (varbinary(XX)) schema migration for mysql to map to correct spanner type with length BYTES(XX) #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc27aef
Fixing varbinary (varbinary(XX)) schema migration for mysql to map to…
darshan-sj Jul 18, 2025
c9cbbdd
Only changing varbinary type
darshan-sj Jul 20, 2025
c7d027f
Updating integration test
darshan-sj Jul 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sources/mysql/mysqldump_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func TestProcessMySQLDump_Scalar(t *testing.T) {
ty string
expected ddl.Type
}{
{"varbinary(100)", ddl.Type{Name: ddl.Bytes, Len: ddl.MaxLength}},
{"varbinary(100)", ddl.Type{Name: ddl.Bytes, Len: int64(100)}},
{"bigint", ddl.Type{Name: ddl.Int64}},
{"bool", ddl.Type{Name: ddl.Bool}},
{"boolean", ddl.Type{Name: ddl.Bool}},
Expand Down
12 changes: 11 additions & 1 deletion sources/mysql/toddl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,23 @@ func toSpannerTypeInternal(srcType schema.Type, spType string) (ddl.Type, []inte
default:
return ddl.Type{Name: ddl.JSON}, nil
}
case "binary", "varbinary":
case "binary":
switch spType {
case ddl.String:
return ddl.Type{Name: ddl.String, Len: ddl.MaxLength}, nil
default:
return ddl.Type{Name: ddl.Bytes, Len: ddl.MaxLength}, nil
}
case "varbinary":
switch spType {
case ddl.String:
return ddl.Type{Name: ddl.String, Len: ddl.MaxLength}, nil
default:
if len(srcType.Mods) > 0 {
return ddl.Type{Name: ddl.Bytes, Len: srcType.Mods[0]}, nil
}
return ddl.Type{Name: ddl.Bytes, Len: ddl.MaxLength}, nil
}
case "tinyblob", "mediumblob", "blob", "longblob":
switch spType {
case ddl.String:
Expand Down
7 changes: 7 additions & 0 deletions sources/mysql/toddl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ func TestToSpannerTypeInternal(t *testing.T) {
if errCheck != nil {
t.Errorf("Error in binary to default conversion")
}
spType, errCheck := toSpannerTypeInternal(schema.Type{"varbinary", []int64{10}, []int64{}}, "BYTES")
if errCheck != nil {
t.Errorf("Error in binary to default conversion")
}
assert.Equal(t, "BYTES", spType.Name)
assert.Equal(t, int64(10), spType.Len)
assert.Equal(t, false, spType.IsArray)
_, errCheck = toSpannerTypeInternal(schema.Type{"blob", []int64{1, 2, 3}, []int64{1, 2, 3}}, "STRING")
if errCheck != nil {
t.Errorf("Error in blob to string conversion")
Expand Down
Loading