Added a tree transformer, got complex ANDs working

2010-10-04 00:06:42 +01:00
parent c0f7c4ca2d
commit 8e65154201
2 changed files with 53 additions and 0 deletions
--- a/tests/queryset.py
+++ b/tests/queryset.py
@@ -1456,5 +1456,19 @@ class NewQTest(unittest.TestCase):
            ]
        })

+    def test_and_or_combination(self):
+        class TestDoc(Document):
+            x = IntField()
+
+        query = NewQ(x__gt=0) | NewQ(x__exists=False)
+        query &= NewQ(x__lt=100) | NewQ(x__in=[100, 200, 3000])
+        print query.to_query(TestDoc)
+#        self.assertEqual(query.to_query(TestDoc, {
+#            '$or': [
+#                {'x': {'$lt': 3}},
+#                {'x': {'$gt': 7}},
+#            ]
+#        })
+
 if __name__ == '__main__':
    unittest.main()