PYTHON-697 - Fix upsert _id backward compatibility

Author: behackett

pymongo/collection.py

@@ -554,6 +554,10 @@ def update(self, spec, document, upsert=False, manipulate=False,
  result['updatedExisting'] = True
  else:
  result['updatedExisting'] = False
+ # MongoDB >= 2.6.0 returns the upsert _id in an array
+ # element. Break it out for backward compatibility.
+ if isinstance(result.get('upserted'), list):
+ result['upserted'] = result['upserted'][0]['_id']
 
  return result
 

test/test_collection.py

@@ -2224,6 +2224,20 @@ class ExtendedDict(dict):
  as_class=ExtendedDict)
  self.assertTrue(isinstance(result, ExtendedDict))
 
+ def test_update_backward_compat(self):
+ # MongoDB versions >= 2.6.0 don't return the updatedExisting field
+ # and return upsert _id in an array subdocument. This test should
+ # pass regardless of server version or type (mongod/s).
+ c = self.db.test
+ c.drop()
+ oid = ObjectId()
+ res = c.update({'_id': oid}, {'$set': {'a': 'a'}}, upsert=True)
+ self.assertFalse(res.get('updatedExisting'))
+ self.assertEqual(oid, res.get('upserted'))
+
+ res = c.update({'_id': oid}, {'$set': {'b': 'b'}})
+ self.assertTrue(res.get('updatedExisting'))
+
  def test_find_and_modify_with_sort(self):
  c = self.db.test
  c.drop()