From a707598042fb0312eb01c15b57b4796dd63ad9a1 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Tue, 20 Aug 2013 13:13:17 +0000
Subject: [PATCH] Allow fields to be named the same as query operators (#445)

---
 AUTHORS                    |  3 ++-
 docs/changelog.rst         |  3 ++-
 tests/queryset/queryset.py | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2a2eb363..a5b73c7b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -175,4 +175,5 @@ that much better:
  * Paul Uithol (https://github.com/PaulUithol)
  * Thom Knowles (https://github.com/fleat)
  * Paul (https://github.com/squamous)
- * Olivier Cortès (https://github.com/Karmak23)
\ No newline at end of file
+ * Olivier Cortès (https://github.com/Karmak23)
+ * crazyzubr (https://github.com/crazyzubr)
\ No newline at end of file
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 489f2ff5..27754293 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,8 @@ Changelog
 
 Changes in 0.8.4
 ================
-- Fixed can now exclude subclass fields (#443)
+- Allow fields to be named the same as query operators (#445)
+- Updated field filter logic - can now exclude subclass fields (#443)
 - Fixed dereference issue with embedded listfield referencefields (#439)
 - Fixed slice when using inheritance causing fields to be excluded (#437)
 - Fixed ._get_db() attribute after a Document.switch_db() (#441)
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 75708cab..7f641351 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -3691,6 +3691,23 @@ class QuerySetTest(unittest.TestCase):
             '_cls': 'Animal.Cat'
         })
 
+    def test_can_have_field_same_name_as_query_operator(self):
+
+        class Size(Document):
+            name = StringField()
+
+        class Example(Document):
+            size = ReferenceField(Size)
+
+        Size.drop_collection()
+        Example.drop_collection()
+
+        instance_size = Size(name="Large").save()
+        Example(size=instance_size).save()
+
+        self.assertEqual(Example.objects(size=instance_size).count(), 1)
+        self.assertEqual(Example.objects(size__in=[instance_size]).count(), 1)
+
 
 if __name__ == '__main__':
     unittest.main()