orm string type default will use varchar(255)

This commit is contained in:
slene 2013-08-16 22:24:10 +08:00
parent c81bbf9801
commit 618cbf1e66
3 changed files with 7 additions and 7 deletions

View File

@ -206,8 +206,8 @@ checkType:
if err != nil {
goto end
}
if fieldType == TypeTextField && size != "" {
fieldType = TypeCharField
if fieldType == TypeCharField && tags["type"] == "text" {
fieldType = TypeTextField
}
if fieldType == TypeFloatField && (digits != "" || decimals != "") {
fieldType = TypeDecimalField
@ -312,7 +312,7 @@ checkType:
fi.size = int(v)
}
} else {
err = fmt.Errorf("size must be specify")
fi.size = 255
}
case TypeTextField:
fi.index = false

View File

@ -15,7 +15,7 @@ import (
type Data struct {
Id int
Boolean bool
Char string `orm:size(50)`
Char string `orm:"size(50)"`
Text string `orm:"type(text)"`
Date time.Time `orm:"type(date)"`
DateTime time.Time
@ -100,7 +100,7 @@ type Post struct {
Id int
User *User `orm:"rel(fk)"`
Title string `orm:"size(60)"`
Content string ``
Content string `orm:"type(text)"`
Created time.Time `orm:"auto_now_add"`
Updated time.Time `orm:"auto_now"`
Tags []*Tag `orm:"rel(m2m)"`
@ -125,7 +125,7 @@ func NewTag() *Tag {
type Comment struct {
Id int
Post *Post `orm:"rel(fk)"`
Content string ``
Content string `orm:"type(text)"`
Parent *Comment `orm:"null;rel(fk)"`
Created time.Time `orm:"auto_now_add"`
}

View File

@ -64,7 +64,7 @@ func getFieldType(val reflect.Value) (ft int, err error) {
case reflect.Bool:
ft = TypeBooleanField
case reflect.String:
ft = TypeTextField
ft = TypeCharField
case reflect.Invalid:
default:
if elm.CanInterface() {