Merge remote-tracking branch 'upstream/master' into update-xorm

2018-03-20 19:21:58 +01:00
parent 3ca1e06509 70630d742e
commit 1cef373d16
139 changed files with 80643 additions and 943 deletions
@@ -196,7 +196,7 @@ func (rs *Rows) ScanMap(dest interface{}) error {
 	newDest := make([]interface{}, len(cols))
 	vvv := vv.Elem()

-	for i := range cols {
+	for i, _ := range cols {
 		newDest[i] = ReflectNew(vvv.Type().Elem()).Interface()
 		//v := reflect.New(vvv.Type().Elem())
 		//newDest[i] = v.Interface()