orm 1. complete QueryRow/QueryRows api 2. QuerySeter.All support *[]Type and *[]*Type

orm/db.go

@@ -479,15 +479,19 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi
 	ind := reflect.Indirect(val)
 
 	errTyp := true
-
 	one := true
+	isPtr := true
 
 	if val.Kind() == reflect.Ptr {
 		fn := ""
 		if ind.Kind() == reflect.Slice {
 			one = false
-			if ind.Type().Elem().Kind() == reflect.Ptr {
-				typ := ind.Type().Elem().Elem()
+			typ := ind.Type().Elem()
+			switch typ.Kind() {
+			case reflect.Ptr:
+				fn = getFullName(typ.Elem())
+			case reflect.Struct:
+				isPtr = false
 				fn = getFullName(typ)
 			}
 		} else {
@@ -601,13 +605,21 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi
 			if one {
 				ind.Set(mind)
 			} else {
-				slice = reflect.Append(slice, mind.Addr())
+				if cnt == 0 {
+					slice = reflect.New(ind.Type()).Elem()
+				}
+
+				if isPtr {
+					slice = reflect.Append(slice, mind.Addr())
+				} else {
+					slice = reflect.Append(slice, mind)
+				}
 			}
 		}
 		cnt++
 	}
 
-	if one == false {
+	if one == false && cnt > 0 {
 		ind.Set(slice)
 	}
 

orm/models.go

@@ -5,11 +5,12 @@ import (
 )
 
 const (
-	od_CASCADE           = "cascade"
-	od_SET_NULL          = "set_null"
-	od_SET_DEFAULT       = "set_default"
-	od_DO_NOTHING        = "do_nothing"
-	defaultStructTagName = "orm"
+	od_CASCADE            = "cascade"
+	od_SET_NULL           = "set_null"
+	od_SET_DEFAULT        = "set_default"
+	od_DO_NOTHING         = "do_nothing"
+	defaultStructTagName  = "orm"
+	defaultStructTagDelim = ";"
 )
 
 var (

orm/models_test.go

@@ -16,7 +16,7 @@ type Data struct {
 	Char     string    `orm:"size(50)"`
 	Text     string    `orm:"type(text)"`
 	Date     time.Time `orm:"type(date)"`
-	DateTime time.Time
+	DateTime time.Time `orm:"column(datetime)"`
 	Byte     byte
 	Rune     rune
 	Int      int
@@ -37,10 +37,10 @@ type Data struct {
 type DataNull struct {
 	Id       int
 	Boolean  bool      `orm:"null"`
-	Char     string    `orm:"size(50);null"`
-	Text     string    `orm:"type(text);null"`
-	Date     time.Time `orm:"type(date);null"`
-	DateTime time.Time `orm:"null"`
+	Char     string    `orm:"null;size(50)"`
+	Text     string    `orm:"null;type(text)"`
+	Date     time.Time `orm:"null;type(date)"`
+	DateTime time.Time `orm:"null;column(datetime)""`
 	Byte     byte      `orm:"null"`
 	Rune     rune      `orm:"null"`
 	Int      int       `orm:"null"`
@@ -174,7 +174,10 @@ var (
 	IsPostgres = DBARGS.Driver == "postgres"
 )
 
-var dORM Ormer
+var (
+	dORM     Ormer
+	dDbBaser dbBaser
+)
 
 func init() {
 	Debug, _ = StrTo(DBARGS.Debug).Bool()

orm/models_utils.go

@@ -114,7 +114,7 @@ func getFieldType(val reflect.Value) (ft int, err error) {
 func parseStructTag(data string, attrs *map[string]bool, tags *map[string]string) {
 	attr := make(map[string]bool)
 	tag := make(map[string]string)
-	for _, v := range strings.Split(data, ";") {
+	for _, v := range strings.Split(data, defaultStructTagDelim) {
 		v = strings.TrimSpace(v)
 		if supportTag[v] == 1 {
 			attr[v] = true

orm/orm_raw.go

@@ -4,6 +4,8 @@ import (
 	"database/sql"
 	"fmt"
 	"reflect"
+	"strings"
+	"time"
 )
 
 type rawPrepare struct {
@@ -64,14 +66,362 @@ func (o *rawSet) Exec() (sql.Result, error) {
 	return o.orm.db.Exec(query, args...)
 }
 
-func (o *rawSet) QueryRow(...interface{}) error {
-	//TODO
+func (o *rawSet) setFieldValue(ind reflect.Value, value interface{}) {
+	switch ind.Kind() {
+	case reflect.Bool:
+		if value == nil {
+			ind.SetBool(false)
+		} else if v, ok := value.(bool); ok {
+			ind.SetBool(v)
+		} else {
+			v, _ := StrTo(ToStr(value)).Bool()
+			ind.SetBool(v)
+		}
+
+	case reflect.String:
+		if value == nil {
+			ind.SetString("")
+		} else {
+			ind.SetString(ToStr(value))
+		}
+
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		if value == nil {
+			ind.SetInt(0)
+		} else {
+			val := reflect.ValueOf(value)
+			switch val.Kind() {
+			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+				ind.SetInt(val.Int())
+			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+				ind.SetInt(int64(val.Uint()))
+			default:
+				v, _ := StrTo(ToStr(value)).Int64()
+				ind.SetInt(v)
+			}
+		}
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		if value == nil {
+			ind.SetUint(0)
+		} else {
+			val := reflect.ValueOf(value)
+			switch val.Kind() {
+			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+				ind.SetUint(uint64(val.Int()))
+			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+				ind.SetUint(val.Uint())
+			default:
+				v, _ := StrTo(ToStr(value)).Uint64()
+				ind.SetUint(v)
+			}
+		}
+	case reflect.Float64, reflect.Float32:
+		if value == nil {
+			ind.SetFloat(0)
+		} else {
+			val := reflect.ValueOf(value)
+			switch val.Kind() {
+			case reflect.Float64:
+				ind.SetFloat(val.Float())
+			default:
+				v, _ := StrTo(ToStr(value)).Float64()
+				ind.SetFloat(v)
+			}
+		}
+
+	case reflect.Struct:
+		if value == nil {
+			ind.Set(reflect.Zero(ind.Type()))
+
+		} else if _, ok := ind.Interface().(time.Time); ok {
+			var str string
+			switch d := value.(type) {
+			case time.Time:
+				o.orm.alias.DbBaser.TimeFromDB(&d, o.orm.alias.TZ)
+				ind.Set(reflect.ValueOf(d))
+			case []byte:
+				str = string(d)
+			case string:
+				str = d
+			}
+			if str != "" {
+				if len(str) >= 19 {
+					str = str[:19]
+					t, err := time.ParseInLocation(format_DateTime, str, o.orm.alias.TZ)
+					if err == nil {
+						t = t.In(DefaultTimeLoc)
+						ind.Set(reflect.ValueOf(t))
+					}
+				} else if len(str) >= 10 {
+					str = str[:10]
+					t, err := time.ParseInLocation(format_Date, str, DefaultTimeLoc)
+					if err == nil {
+						ind.Set(reflect.ValueOf(t))
+					}
+				}
+			}
+		}
+	}
+}
+
+func (o *rawSet) loopInitRefs(typ reflect.Type, refsPtr *[]interface{}, sIdxesPtr *[][]int) {
+	sIdxes := *sIdxesPtr
+	refs := *refsPtr
+
+	if typ.Kind() == reflect.Struct {
+		if typ.String() == "time.Time" {
+			var ref interface{}
+			refs = append(refs, &ref)
+			sIdxes = append(sIdxes, []int{0})
+		} else {
+			idxs := []int{}
+		outFor:
+			for idx := 0; idx < typ.NumField(); idx++ {
+				ctyp := typ.Field(idx)
+
+				tag := ctyp.Tag.Get(defaultStructTagName)
+				for _, v := range strings.Split(tag, defaultStructTagDelim) {
+					if v == "-" {
+						continue outFor
+					}
+				}
+
+				tp := ctyp.Type
+				if tp.Kind() == reflect.Ptr {
+					tp = tp.Elem()
+				}
+
+				if tp.String() == "time.Time" {
+					var ref interface{}
+					refs = append(refs, &ref)
+
+				} else if tp.Kind() != reflect.Struct {
+					var ref interface{}
+					refs = append(refs, &ref)
+
+				} else {
+					// skip other type
+					continue
+				}
+
+				idxs = append(idxs, idx)
+			}
+			sIdxes = append(sIdxes, idxs)
+		}
+	} else {
+		var ref interface{}
+		refs = append(refs, &ref)
+		sIdxes = append(sIdxes, []int{0})
+	}
+
+	*sIdxesPtr = sIdxes
+	*refsPtr = refs
+}
+
+func (o *rawSet) loopSetRefs(refs []interface{}, sIdxes [][]int, sInds []reflect.Value, nIndsPtr *[]reflect.Value, eTyps []reflect.Type, init bool) {
+	nInds := *nIndsPtr
+
+	cur := 0
+	for i, idxs := range sIdxes {
+		sInd := sInds[i]
+		eTyp := eTyps[i]
+
+		typ := eTyp
+		isPtr := false
+		if typ.Kind() == reflect.Ptr {
+			isPtr = true
+			typ = typ.Elem()
+		}
+		if typ.Kind() == reflect.Ptr {
+			isPtr = true
+			typ = typ.Elem()
+		}
+
+		var nInd reflect.Value
+		if init {
+			nInd = reflect.New(sInd.Type()).Elem()
+		} else {
+			nInd = nInds[i]
+		}
+
+		val := reflect.New(typ)
+		ind := val.Elem()
+
+		tpName := ind.Type().String()
+
+		if ind.Kind() == reflect.Struct {
+			if tpName == "time.Time" {
+				value := reflect.ValueOf(refs[cur]).Elem().Interface()
+				if isPtr && value == nil {
+					val = reflect.New(val.Type()).Elem()
+				} else {
+					o.setFieldValue(ind, value)
+				}
+				cur++
+			} else {
+				hasValue := false
+				for _, idx := range idxs {
+					tind := ind.Field(idx)
+					value := reflect.ValueOf(refs[cur]).Elem().Interface()
+					if value != nil {
+						hasValue = true
+					}
+					if tind.Kind() == reflect.Ptr {
+						if value == nil {
+							tindV := reflect.New(tind.Type()).Elem()
+							tind.Set(tindV)
+						} else {
+							tindV := reflect.New(tind.Type().Elem())
+							o.setFieldValue(tindV.Elem(), value)
+							tind.Set(tindV)
+						}
+					} else {
+						o.setFieldValue(tind, value)
+					}
+					cur++
+				}
+				if hasValue == false && isPtr {
+					val = reflect.New(val.Type()).Elem()
+				}
+			}
+		} else {
+			value := reflect.ValueOf(refs[cur]).Elem().Interface()
+			if isPtr && value == nil {
+				val = reflect.New(val.Type()).Elem()
+			} else {
+				o.setFieldValue(ind, value)
+			}
+			cur++
+		}
+
+		if nInd.Kind() == reflect.Slice {
+			if isPtr {
+				nInd = reflect.Append(nInd, val)
+			} else {
+				nInd = reflect.Append(nInd, ind)
+			}
+		} else {
+			if isPtr {
+				nInd.Set(val)
+			} else {
+				nInd.Set(ind)
+			}
+		}
+
+		nInds[i] = nInd
+	}
+}
+
+func (o *rawSet) QueryRow(containers ...interface{}) error {
+	if len(containers) == 0 {
+		panic("<RawSeter.QueryRow> need at least one arg")
+	}
+
+	refs := make([]interface{}, 0, len(containers))
+	sIdxes := make([][]int, 0)
+	sInds := make([]reflect.Value, 0)
+	eTyps := make([]reflect.Type, 0)
+
+	for _, container := range containers {
+		val := reflect.ValueOf(container)
+		ind := reflect.Indirect(val)
+
+		if val.Kind() != reflect.Ptr {
+			panic("<RawSeter.QueryRow> all args must be use ptr")
+		}
+
+		etyp := ind.Type()
+		typ := etyp
+		if typ.Kind() == reflect.Ptr {
+			typ = typ.Elem()
+		}
+		if typ.Kind() == reflect.Ptr {
+			typ = typ.Elem()
+		}
+
+		sInds = append(sInds, ind)
+		eTyps = append(eTyps, etyp)
+
+		o.loopInitRefs(typ, &refs, &sIdxes)
+	}
+
+	query := o.query
+	o.orm.alias.DbBaser.ReplaceMarks(&query)
+
+	args := getFlatParams(nil, o.args, o.orm.alias.TZ)
+	row := o.orm.db.QueryRow(query, args...)
+
+	if err := row.Scan(refs...); err == sql.ErrNoRows {
+		return ErrNoRows
+	} else if err != nil {
+		return err
+	}
+
+	nInds := make([]reflect.Value, len(sInds))
+	o.loopSetRefs(refs, sIdxes, sInds, &nInds, eTyps, true)
+	for i, sInd := range sInds {
+		nInd := nInds[i]
+		sInd.Set(nInd)
+	}
+
 	return nil
 }
 
-func (o *rawSet) QueryRows(...interface{}) (int64, error) {
-	//TODO
-	return 0, nil
+func (o *rawSet) QueryRows(containers ...interface{}) (int64, error) {
+	refs := make([]interface{}, 0)
+	sIdxes := make([][]int, 0)
+	sInds := make([]reflect.Value, 0)
+	eTyps := make([]reflect.Type, 0)
+
+	for _, container := range containers {
+		val := reflect.ValueOf(container)
+		sInd := reflect.Indirect(val)
+		if val.Kind() != reflect.Ptr || sInd.Kind() != reflect.Slice {
+			panic("<RawSeter.QueryRows> all args must be use ptr slice")
+		}
+
+		etyp := sInd.Type().Elem()
+		typ := etyp
+		if typ.Kind() == reflect.Ptr {
+			typ = typ.Elem()
+		}
+
+		sInds = append(sInds, sInd)
+		eTyps = append(eTyps, etyp)
+
+		o.loopInitRefs(typ, &refs, &sIdxes)
+	}
+
+	query := o.query
+	o.orm.alias.DbBaser.ReplaceMarks(&query)
+
+	args := getFlatParams(nil, o.args, o.orm.alias.TZ)
+	rows, err := o.orm.db.Query(query, args...)
+	if err != nil {
+		return 0, err
+	}
+
+	nInds := make([]reflect.Value, len(sInds))
+
+	var cnt int64
+	for rows.Next() {
+		if err := rows.Scan(refs...); err != nil {
+			return 0, err
+		}
+
+		o.loopSetRefs(refs, sIdxes, sInds, &nInds, eTyps, cnt == 0)
+
+		cnt++
+	}
+
+	if cnt > 0 {
+		for i, sInd := range sInds {
+			nInd := nInds[i]
+			sInd.Set(nInd)
+		}
+	}
+
+	return cnt, nil
 }
 
 func (o *rawSet) readValues(container interface{}) (int64, error) {

orm/utils.go

@@ -115,6 +115,8 @@ func ToStr(value interface{}, args ...int) (s string) {
 		s = strconv.FormatUint(v, argInt(args).Get(0, 10))
 	case string:
 		s = v
+	case []byte:
+		s = string(v)
 	default:
 		s = fmt.Sprintf("%v", v)
 	}