diff --git a/dialect/sql/schema/mysql.go b/dialect/sql/schema/mysql.go index ea11c5fe2..8dbae3fb9 100644 --- a/dialect/sql/schema/mysql.go +++ b/dialect/sql/schema/mysql.go @@ -281,6 +281,13 @@ func (d *MySQL) scanColumn(c *Column, rows *sql.Rows) error { case "longblob": c.Size = math.MaxUint32 c.Type = field.TypeBytes + case "varbinary": + c.Type = field.TypeBytes + size, err := strconv.ParseInt(parts[1], 10, 64) + if err != nil { + return fmt.Errorf("converting varbinary size to int: %v", err) + } + c.Size = size case "varchar": c.Type = field.TypeString size, err := strconv.ParseInt(parts[1], 10, 64) diff --git a/dialect/sql/schema/mysql_test.go b/dialect/sql/schema/mysql_test.go index 82e899fdb..dcff0bd8e 100644 --- a/dialect/sql/schema/mysql_test.go +++ b/dialect/sql/schema/mysql_test.go @@ -344,6 +344,43 @@ func TestMySQL_Create(t *testing.T) { mock.ExpectCommit() }, }, + { + name: "accept varbinary columns", + tables: []*Table{ + { + Name: "users", + Columns: []*Column{ + {Name: "id", Type: field.TypeInt, Increment: true}, + {Name: "tiny", Type: field.TypeBytes, Size: 100}, + {Name: "medium", Type: field.TypeBytes, Size: math.MaxUint32}, + }, + PrimaryKey: []*Column{ + {Name: "id", Type: field.TypeInt, Increment: true}, + }, + }, + }, + before: func(mock sqlmock.Sqlmock) { + mock.ExpectBegin() + mock.ExpectQuery(escape("SHOW VARIABLES LIKE 'version'")). + WillReturnRows(sqlmock.NewRows([]string{"Variable_name", "Value"}).AddRow("version", "5.7.23")) + mock.ExpectQuery(escape("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE `TABLE_SCHEMA` = (SELECT DATABASE()) AND `TABLE_NAME` = ?")). + WithArgs("users"). + WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(1)) + mock.ExpectQuery(escape("SELECT `column_name`, `column_type`, `is_nullable`, `column_key`, `column_default`, `extra`, `character_set_name`, `collation_name` FROM INFORMATION_SCHEMA.COLUMNS WHERE `TABLE_SCHEMA` = (SELECT DATABASE()) AND `TABLE_NAME` = ?")). + WithArgs("users"). + WillReturnRows(sqlmock.NewRows([]string{"column_name", "column_type", "is_nullable", "column_key", "column_default", "extra", "character_set_name", "collation_name"}). + AddRow("id", "bigint(20)", "NO", "PRI", "NULL", "auto_increment", "", ""). + AddRow("tiny", "varbinary(255)", "NO", "YES", "NULL", "", "", ""). + AddRow("medium", "varbinary(255)", "NO", "YES", "NULL", "", "", "")) + mock.ExpectQuery(escape("SELECT `index_name`, `column_name`, `non_unique`, `seq_in_index` FROM INFORMATION_SCHEMA.STATISTICS WHERE `TABLE_SCHEMA` = (SELECT DATABASE()) AND `TABLE_NAME` = ?")). + WithArgs("users"). + WillReturnRows(sqlmock.NewRows([]string{"index_name", "column_name", "non_unique", "seq_in_index"}). + AddRow("PRIMARY", "id", "0", "1")) + mock.ExpectExec(escape("ALTER TABLE `users` MODIFY COLUMN `medium` longblob NOT NULL")). + WillReturnResult(sqlmock.NewResult(0, 1)) + mock.ExpectCommit() + }, + }, { name: "add float column with default value to table", tables: []*Table{