Merge branch 'master' of github.com:go-xorm/xorm

This commit is contained in:
Nash Tsai 2014-08-20 09:39:12 +08:00
commit 9d560de452
1 changed files with 8 additions and 12 deletions

View File

@ -56,24 +56,20 @@ func (db *mysql) SqlType(c *core.Column) string {
case core.Enum: //mysql enum
res = core.Enum
res += "("
for v, k := range c.EnumOptions {
if k > 0 {
res += fmt.Sprintf(",'%v'", v)
} else {
res += fmt.Sprintf("'%v'", v)
}
opts := ""
for v, _ := range c.EnumOptions {
opts += fmt.Sprintf(",'%v'", v)
}
res += strings.TrimLeft(opts,",")
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)
}
opts := ""
for v, _ := range c.SetOptions {
opts += fmt.Sprintf(",'%v'", v)
}
res += strings.TrimLeft(opts,",")
res += ")"
default:
res = t