Commit 4ee6cc30 authored by slene's avatar slene

Merge pull request #312 from bronze1man/pr-orm-querytable-nil-ptr-struct

[orm] QueryTable with nil ptr struct
parents a0dff914 ceb4aa9e
......@@ -274,9 +274,7 @@ func (o *orm) QueryTable(ptrStructOrTableName interface{}) (qs QuerySeter) {
qs = newQuerySet(o, mi)
}
} else {
val := reflect.ValueOf(ptrStructOrTableName)
ind := reflect.Indirect(val)
name = getFullName(ind.Type())
name = getFullName(indirectType(reflect.TypeOf(ptrStructOrTableName)))
if mi, ok := modelCache.getByFN(name); ok {
qs = newQuerySet(o, mi)
}
......
......@@ -473,6 +473,7 @@ The program—and web server—godoc processes Go source files to extract docume
func TestExpr(t *testing.T) {
user := &User{}
qs := dORM.QueryTable(user)
qs = dORM.QueryTable((*User)(nil))
qs = dORM.QueryTable("User")
qs = dORM.QueryTable("user")
num, err := qs.Filter("UserName", "slene").Filter("user_name", "slene").Filter("profile__Age", 28).Count()
......
......@@ -231,3 +231,13 @@ func timeParse(dateString, format string) (time.Time, error) {
func timeFormat(t time.Time, format string) string {
return t.Format(format)
}
func indirectType(v reflect.Type) reflect.Type {
switch v.Kind() {
case reflect.Ptr:
return indirectType(v.Elem())
default:
return v
}
return v
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment