Merge pull request #121 from pxue/issue-120

Issue 120

mongo/collection.go

@@ -240,9 +240,11 @@ func (col *Collection) Append(item interface{}) (interface{}, error) {
 	}
 
 	// And other interfaces?
-	if setter, ok := item.(ObjectIdIDSetter); ok {
-		if err := setter.SetID(id); err != nil {
-			return nil, err
+	if _, ok := id.(bson.ObjectId); ok {
+		if setter, ok := item.(ObjectIdIDSetter); ok {
+			if err := setter.SetID(id.(bson.ObjectId)); err != nil {
+				return nil, err
+			}
 		}
 	}
 
@@ -260,7 +262,7 @@ func (col *Collection) Exists() bool {
 }
 
 // Fetches object _id or generates a new one if object doesn't have one or the one it has is invalid
-func getID(item interface{}) bson.ObjectId {
+func getID(item interface{}) interface{} {
 	v := reflect.ValueOf(item)
 
 	switch v.Kind() {
@@ -312,6 +314,8 @@ func getID(item interface{}) bson.ObjectId {
 				if bsonID.Valid() {
 					return bsonID
 				}
+			} else {
+				return v.FieldByName(fieldName).Interface()
 			}
 		}
 	}

mongo/database.go

@@ -249,6 +249,11 @@ func (s *Source) versionAtLeast(version ...int) bool {
 		s.version = buildInfo.VersionArray
 	}
 
+	// Check major version first
+	if s.version[0] > version[0] {
+		return true
+	}
+
 	for i := range version {
 		if i == len(s.version) {
 			return false