From 574f3c23d3ce633d830f55918a009c30305e3dbd Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Fri, 21 Jun 2013 09:35:22 +0000
Subject: [PATCH 1/5] get should clone before calling

---
 mongoengine/queryset/queryset.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index d58a13b7..9b53df2a 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -245,8 +245,10 @@ class QuerySet(object):
 
         .. versionadded:: 0.3
         """
-        queryset = self.__call__(*q_objs, **query)
+        queryset = self.clone()
         queryset = queryset.limit(2)
+        queryset = queryset.filter(*q_objs, **query)
+
         try:
             result = queryset.next()
         except StopIteration:

From f1a1aa54d8a31336d2a76a21f2e4b166d776f526 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Fri, 21 Jun 2013 10:19:40 +0000
Subject: [PATCH 2/5] Added full_result kwarg to update (#380)

---
 docs/changelog.rst               |  3 +++
 mongoengine/document.py          |  8 +++++++-
 mongoengine/queryset/queryset.py | 16 ++++++++++------
 tests/queryset/queryset.py       | 17 +++++++++++++++++
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3a397524..8fa5af05 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+Changes in 0.8.3
+================
+- Added full_result kwarg to update (#380)
 
 Changes in 0.8.2
 ================
diff --git a/mongoengine/document.py b/mongoengine/document.py
index a61ed079..a1bac195 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -353,7 +353,13 @@ class Document(BaseDocument):
         been saved.
         """
         if not self.pk:
-            raise OperationError('attempt to update a document not yet saved')
+            if kwargs.get('upsert', False):
+                query = self.to_mongo()
+                if "_cls" in query:
+                    del(query["_cls"])
+                return self._qs.filter(**query).update_one(**kwargs)
+            else:
+                raise OperationError('attempt to update a document not yet saved')
 
         # Need to add shard key to query, or you get an error
         return self._qs.filter(**self._object_key).update_one(**kwargs)
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 9b53df2a..4b32ab12 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -474,7 +474,8 @@ class QuerySet(object):
 
         queryset._collection.remove(queryset._query, write_concern=write_concern)
 
-    def update(self, upsert=False, multi=True, write_concern=None, **update):
+    def update(self, upsert=False, multi=True, write_concern=None,
+               full_result=False, **update):
         """Perform an atomic update on the fields matched by the query.
 
         :param upsert: Any existing document with that "_id" is overwritten.
@@ -485,6 +486,8 @@ class QuerySet(object):
             ``save(..., write_concern={w: 2, fsync: True}, ...)`` will
             wait until at least two servers have recorded the write and
             will force an fsync on the primary server.
+        :param full_result: Return the full result rather than just the number
+            updated.
         :param update: Django-style update keyword arguments
 
         .. versionadded:: 0.2
@@ -506,12 +509,13 @@ class QuerySet(object):
                 update["$set"]["_cls"] = queryset._document._class_name
             else:
                 update["$set"] = {"_cls": queryset._document._class_name}
-
         try:
-            ret = queryset._collection.update(query, update, multi=multi,
-                                              upsert=upsert, **write_concern)
-            if ret is not None and 'n' in ret:
-                return ret['n']
+            result = queryset._collection.update(query, update, multi=multi,
+                                                 upsert=upsert, **write_concern)
+            if full_result:
+                return result
+            elif result:
+                return result['n']
         except pymongo.errors.OperationFailure, err:
             if unicode(err) == u'multi not coded yet':
                 message = u'update() method requires MongoDB 1.1.3+'
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 21df22c5..bd231e33 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -536,6 +536,23 @@ class QuerySetTest(unittest.TestCase):
         self.assertEqual(club.members['John']['gender'], "F")
         self.assertEqual(club.members['John']['age'], 14)
 
+    def test_update_results(self):
+        self.Person.drop_collection()
+
+        result = self.Person(name="Bob", age=25).update(upsert=True, full_result=True)
+        self.assertIsInstance(result, dict)
+        self.assertTrue("upserted" in result)
+        self.assertFalse(result["updatedExisting"])
+
+        bob = self.Person.objects.first()
+        result = bob.update(set__age=30, full_result=True)
+        self.assertIsInstance(result, dict)
+        self.assertTrue(result["updatedExisting"])
+
+        self.Person(name="Bob", age=20).save()
+        result = self.Person.objects(name="Bob").update(set__name="bobby", multi=True)
+        self.assertEqual(result, 2)
+
     def test_upsert(self):
         self.Person.drop_collection()
 

From e116bb92272246528df242c587f1b8e5e6fb6f48 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Fri, 21 Jun 2013 10:39:10 +0000
Subject: [PATCH 3/5] Fixed queryset.get() respecting no_dereference (#373)

---
 docs/changelog.rst               | 1 +
 mongoengine/queryset/queryset.py | 4 ++--
 tests/queryset/queryset.py       | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8fa5af05..b04bba53 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Changes in 0.8.3
 ================
+- Fixed queryset.get() respecting no_dereference (#373)
 - Added full_result kwarg to update (#380)
 
 Changes in 0.8.2
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 4b32ab12..ded8d5eb 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -1165,8 +1165,8 @@ class QuerySet(object):
         raw_doc = self._cursor.next()
         if self._as_pymongo:
             return self._get_as_pymongo(raw_doc)
-
-        doc = self._document._from_son(raw_doc)
+        doc = self._document._from_son(raw_doc,
+                                       _auto_dereference=self._auto_dereference)
         if self._scalar:
             return self._get_scalar(doc)
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index bd231e33..7c473603 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -3258,6 +3258,8 @@ class QuerySetTest(unittest.TestCase):
         self.assertTrue(isinstance(qs.first().organization, Organization))
         self.assertFalse(isinstance(qs.no_dereference().first().organization,
                                     Organization))
+        self.assertFalse(isinstance(qs.no_dereference().get().organization,
+                                    Organization))
         self.assertTrue(isinstance(qs.first().organization, Organization))
 
     def test_cached_queryset(self):

From e6374ab425d45c3d4007a1773b364bd29a40bd24 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Fri, 21 Jun 2013 10:40:15 +0000
Subject: [PATCH 4/5] Added Michael Bartnett to Authors (#373)

---
 AUTHORS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 7788139e..a50eb570 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -169,4 +169,5 @@ that much better:
  * Massimo Santini (https://github.com/mapio)
  * Nigel McNie (https://github.com/nigelmcnie)
  * ygbourhis (https://github.com/ygbourhis)
- * Bob Dickinson (https://github.com/BobDickinson)
\ No newline at end of file
+ * Bob Dickinson (https://github.com/BobDickinson)
+ * Michael Bartnett (https://github.com/michaelbartnett)
\ No newline at end of file

From 9867e918fa58f99cceca8a8917c9673251cc309d Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Fri, 21 Jun 2013 11:04:29 +0000
Subject: [PATCH 5/5] Fixed weakref being valid after reload (#374)

---
 docs/changelog.rst         |  1 +
 mongoengine/document.py    |  1 +
 tests/queryset/queryset.py | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b04bba53..265ad13d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Changes in 0.8.3
 ================
+- Fixed weakref being valid after reload (#374)
 - Fixed queryset.get() respecting no_dereference (#373)
 - Added full_result kwarg to update (#380)
 
diff --git a/mongoengine/document.py b/mongoengine/document.py
index a1bac195..ab8fa2ac 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -480,6 +480,7 @@ class Document(BaseDocument):
             value = [self._reload(key, v) for v in value]
             value = BaseList(value, self, key)
         elif isinstance(value, (EmbeddedDocument, DynamicEmbeddedDocument)):
+            value._instance = None
             value._changed_fields = []
         return value
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 7c473603..6dcbd9f3 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1613,6 +1613,32 @@ class QuerySetTest(unittest.TestCase):
         self.assertEqual(message.authors[1].name, "Ross")
         self.assertEqual(message.authors[2].name, "Adam")
 
+    def test_reload_embedded_docs_instance(self):
+
+        class SubDoc(EmbeddedDocument):
+            val = IntField()
+
+        class Doc(Document):
+            embedded = EmbeddedDocumentField(SubDoc)
+
+        doc = Doc(embedded=SubDoc(val=0)).save()
+        doc.reload()
+
+        self.assertEqual(doc.pk, doc.embedded._instance.pk)
+
+    def test_reload_list_embedded_docs_instance(self):
+
+        class SubDoc(EmbeddedDocument):
+            val = IntField()
+
+        class Doc(Document):
+            embedded = ListField(EmbeddedDocumentField(SubDoc))
+
+        doc = Doc(embedded=[SubDoc(val=0)]).save()
+        doc.reload()
+
+        self.assertEqual(doc.pk, doc.embedded[0]._instance.pk)
+
     def test_order_by(self):
         """Ensure that QuerySets may be ordered.
         """