document.go

@@ -301,9 +301,9 @@ func (d *Document) Populate(fields ...string) {
 		for _, field := range fields {
 			// 0 = fieldname, 1 = typename, 2 = bson name
 
-			r, refOk := cm.references[field]
+			r, _ := readFields(field, cm)
 
-			if refOk {
+			if r.exists {
 				// get self
 				// get ptr
 				// find
@@ -328,11 +328,8 @@ func (d *Document) Populate(fields ...string) {
 					asIDocument.markPopulated(field)
 				}
 
-				v := reflect.ValueOf(d.self)
-				tt := v.Elem().Type()
-				tmp1 = populate(r, refColl.collection, rawDoc, field, d.self)
-				nv := reflect.NewAt(tt, v.UnsafePointer())
-				nv.Elem().Set(reflect.ValueOf(tmp1).Elem())
+				tmp1 = populate(r, refColl.collection, rawDoc, field, reflect.ValueOf(d.self).Interface())
+				d.self = tmp1
 			}
 		}
 	}

query.go

@@ -611,18 +611,10 @@ func (q *Query) Exec(result interface{}) {
 			imodel, ok := cur.Interface().(IDocument)
 			if ok {
 				imodel.setExists(true)
-				imodel.SetSelf(imodel)
 				doc.Elem().Index(i).Set(reflect.ValueOf(imodel))
 			}
 		}
 	}
-
-	if idoc, ok := q.doc.(IDocument); ok {
-		idoc.SetSelf(result)
-	}
-	if rdoc, ok2 := result.(IDocument); ok2 {
-		rdoc.SetSelf(result)
-	}
 	reflect.ValueOf(result).Elem().Set(reflect.ValueOf(q.doc).Elem())
 	q.done = true
 }