HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add set type

This commit is contained in:
Lunny Xiao 2014-08-07 22:18:15 +08:00
parent f3b3ef2934
commit 4c38b4de47
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine.go
View File

@ -273,7 +273,6 @@ func (engine *Engine) DBMetas() ([]*core.Table, error) {
} }
//table.Columns = cols //table.Columns = cols
//table.ColumnsSeq = colSeq //table.ColumnsSeq = colSeq
indexes, err := engine.dialect.GetIndexes(table.Name) indexes, err := engine.dialect.GetIndexes(table.Name)
if err != nil { if err != nil {
return nil, err return nil, err
@ -732,6 +731,14 @@ func (engine *Engine) mapType(v reflect.Value) *core.Table {
v = strings.Trim(v, "'") v = strings.Trim(v, "'")
col.EnumOptions[v] = k col.EnumOptions[v] = k
} }
} else if fs[0] == core.Set && fs[1][0] == '\'' { //set
options := strings.Split(fs[1][0:len(fs[1])-1], ",")
col.SetOptions = make(map[string]int)
for k, v := range options {
v = strings.TrimSpace(v)
v = strings.Trim(v, "'")
col.SetOptions[v] = k
}
} else { } else {
fs2 := strings.Split(fs[1][0:len(fs[1])-1], ",") fs2 := strings.Split(fs[1][0:len(fs[1])-1], ",")
if len(fs2) == 2 { if len(fs2) == 2 {

23
mysql_dialect.go
View File

@ -64,6 +64,17 @@ func (db *mysql) SqlType(c *core.Column) string {
} }
} }
res += ")" res += ")"
case core.Set: //mysql set
res = core.Set
res += "("
for v, k := range c.SetOptions {
if k > 0 {
res += fmt.Sprintf(",'%v'", v)
} else {
res += fmt.Sprintf("'%v'", v)
}
}
res += ")"
default: default:
res = t res = t
} }
@ -145,6 +156,7 @@ func (db *mysql) GetColumns(tableName string) ([]string, map[string]*core.Column
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
//fmt.Println(columnName, isNullable, colType, colKey, extra, colDefault)
col.Name = strings.Trim(columnName, "` ") col.Name = strings.Trim(columnName, "` ")
if "YES" == isNullable { if "YES" == isNullable {
col.Nullable = true col.Nullable = true
@ -171,6 +183,14 @@ func (db *mysql) GetColumns(tableName string) ([]string, map[string]*core.Column
v = strings.Trim(v, "'") v = strings.Trim(v, "'")
col.EnumOptions[v] = k col.EnumOptions[v] = k
} }
} else if colType == core.Set && cts[1][0] == '\'' {
options := strings.Split(cts[1][0:idx], ",")
col.SetOptions = make(map[string]int)
for k, v := range options {
v = strings.TrimSpace(v)
v = strings.Trim(v, "'")
col.SetOptions[v] = k
}
} else { } else {
lens := strings.Split(cts[1][0:idx], ",") lens := strings.Split(cts[1][0:idx], ",")
len1, err = strconv.Atoi(strings.TrimSpace(lens[0])) len1, err = strconv.Atoi(strings.TrimSpace(lens[0]))
@ -185,6 +205,9 @@ func (db *mysql) GetColumns(tableName string) ([]string, map[string]*core.Column
} }
} }
} }
if colType == "FLOAT UNSIGNED" {
colType = "FLOAT"
}
col.Length = len1 col.Length = len1
col.Length2 = len2 col.Length2 = len2
if _, ok := core.SqlTypes[colType]; ok { if _, ok := core.SqlTypes[colType]; ok {