golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-24 09:31:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

dialect/sql/mysql: remove enum sorting (#1021)

Browse Source 
* dialect/sql/mysql: remove enum sorting 

Enums are not longer created as sorted values

* Update mysql_test.go
This commit is contained in:
Ariel Mashraki
2020-12-07 14:07:13 +02:00
committed by GitHub
parent 59ffc461a3
commit 86b9d850ee
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dialect/sql/schema/mysql.go
View File

@@ -9,7 +9,6 @@ import (
"database/sql/driver"
"fmt"
"math"
"sort"
"strconv"
"strings"
@@ -263,7 +262,6 @@ func (d *MySQL) cType(c *Column) (t string) {
for i, e := range c.Enums {
values[i] = fmt.Sprintf("'%s'", e)
}
sort.Strings(values)
t = fmt.Sprintf("enum(%s)", strings.Join(values, ", "))
case field.TypeUUID:
t = "char(36) binary"

4
dialect/sql/schema/mysql_test.go
View File

@@ -264,7 +264,6 @@ func TestMySQL_Create(t *testing.T) {
{Name: "name", Type: field.TypeString, Nullable: true},
{Name: "enums1", Type: field.TypeEnum, Enums: []string{"a", "b"}}, // add enum.
{Name: "enums2", Type: field.TypeEnum, Enums: []string{"a"}}, // remove enum.
{Name: "enums3", Type: field.TypeEnum, Enums: []string{"a", "b"}}, // order does not effect.
},
PrimaryKey: []*Column{
{Name: "id", Type: field.TypeInt, Increment: true},
@@ -280,8 +279,7 @@ func TestMySQL_Create(t *testing.T) {
AddRow("id", "bigint(20)", "NO", "PRI", "NULL", "auto_increment", "", "").
AddRow("name", "varchar(255)", "YES", "YES", "NULL", "", "", "").
AddRow("enums1", "enum('a')", "YES", "NO", "NULL", "", "", "").
AddRow("enums2", "enum('b', 'a')", "NO", "YES", "NULL", "", "", "").
AddRow("enums3", "enum('b', 'a')", "NO", "YES", "NULL", "", "", ""))
AddRow("enums2", "enum('b', 'a')", "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` = ? ORDER BY `index_name`, `seq_in_index`")).
WithArgs("users").
WillReturnRows(sqlmock.NewRows([]string{"index_name", "column_name", "non_unique", "seq_in_index"}).