Merge pull request #213 from knowsis/safe-writes

Safe writes

Author: aburgel

django_mongodb_engine/base.py

@@ -64,7 +64,13 @@ def sql_flush(self, style, tables, sequence_list, allow_cascade=False):
             if table.startswith('system.'):
                 # Do not try to drop system collections.
                 continue
-            self.connection.database[table].remove()
+
+            collection = self.connection.database[table]
+            options = collection.options()
+
+            if not options.get('capped', False):
+                collection.remove({})
+
         return []
 
     def validate_autopk_value(self, value):
@@ -248,12 +254,8 @@ def pop(name, default=None):
         conn_options = dict(
             host=host,
             port=int(port),
-            max_pool_size=None,
             document_class=dict,
-            tz_aware=False,
-            _connect=True,
-            auto_start_request=True,
-            safe=False
+            tz_aware=False
         )
         conn_options.update(options)
 

requirements.txt

@@ -1,4 +1,4 @@
-pymongo
+pymongo<3.0
 https://github.com/django-nonrel/djangotoolbox/tarball/master
 https://github.com/django-nonrel/django/tarball/nonrel-1.5
 https://github.com/django-nonrel/django-dbindexer/tarball/master

setup.py

@@ -17,7 +17,7 @@
     license='2-clause BSD',
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
-    install_requires=['pymongo', 'djangotoolbox>=1.6.0'],
+    install_requires=['pymongo<3.0', 'djangotoolbox>=1.6.0'],
     packages=find_packages(exclude=['tests', 'tests.*']),
     zip_safe=False,
     classifiers=[

tests/contrib/tests.py

@@ -121,6 +121,8 @@ def test_map_reduce_with_custom_primary_key(self, inline=False):
 class RawQueryTests(TestCase):
 
     def setUp(self):
+        MapReduceModel.objects.all().delete()
+
         for i in xrange(10):
             MapReduceModel.objects.create(n=i, m=i * 2)
 

tests/lookup/tests.py

@@ -19,6 +19,10 @@ class LookupTests(TestCase):
 
     def setUp(self):
         # Create a few Authors.
+        Author.objects.all().delete()
+        Article.objects.all().delete()
+        Tag.objects.all().delete()
+
         self.au1 = Author(name='Author 1')
         self.au1.save()
         self.au2 = Author(name='Author 2')

tests/mongodb/tests.py

@@ -248,32 +248,25 @@ def test_setup(flags, **method_kwargs):
                 self.assertEqual(method_kwargs[name],
                                  Collection._method_kwargs[name])
 
-            if Collection._method_kwargs['update'].get('safe'):
-                self.assertEqual(*update_count)
+
+            self.assertEqual(*update_count)
 
         test_setup({}, save={}, update={'multi': True}, remove={})
+        test_setup({},
+            save={},
+            update={'multi': True},
+            remove={})
         test_setup({
-            'safe': True},
-            save={'safe': True},
-            update={'safe': True, 'multi': True},
-            remove={'safe': True})
-        test_setup({
-            'delete': {'safe': True}, 'update': {}},
+            'delete': {}, 'update': {}},
             save={},
             update={'multi': True},
-            remove={'safe': True})
+            remove={})
         test_setup({
             'insert': {'fsync': True}, 'delete': {'fsync': True}},
             save={},
             update={'multi': True},
             remove={'fsync': True})
 
-    def test_unique(self):
-        with self.custom_database_wrapper({'OPTIONS': {}}):
-            Post.objects.create(title='a', content='x')
-            Post.objects.create(title='a', content='y')
-            self.assertEqual(Post.objects.count(), 1)
-            self.assertEqual(Post.objects.get().content, 'x')
 
     def test_unique_safe(self):
         Post.objects.create(title='a')

tests/query/tests.py

@@ -16,6 +16,11 @@
 class BasicQueryTests(TestCase):
     """Backend-agnostic query tests."""
 
+    def tearDown(self):
+        Blog.objects.all().delete()
+        Post.objects.all().delete()
+        IntegerModel.objects.all().delete()
+
     def test_add_and_delete_blog(self):
         Blog.objects.create(title='blog1')
         self.assertEqual(Blog.objects.count(), 1)
@@ -430,6 +435,9 @@ class OrLookupsTests(TestCase):
     """Stolen from the Django test suite, shaked down for m2m tests."""
 
     def setUp(self):
+
+        Article.objects.all().delete()
+
         self.a1 = Article.objects.create(
             headline='Hello', pub_date=datetime.datetime(2005, 11, 27)).pk
         self.a2 = Article.objects.create(
@@ -438,6 +446,9 @@ def setUp(self):
             headline='Hello and goodbye',
             pub_date=datetime.datetime(2005, 11, 29)).pk
 
+    def tearDown(self):
+        Article.objects.all().delete()
+
     def test_filter_or(self):
         self.assertQuerysetEqual(
             Article.objects.filter(headline__startswith='Hello') |
@@ -572,6 +583,7 @@ def test_q_and(self):
             [])
 
     def test_q_exclude(self):
+
         self.assertQuerysetEqual(
             Article.objects.exclude(Q(headline__startswith='Hello')),
             ['Goodbye'],

tests/settings/settings_base.py

@@ -2,7 +2,7 @@
     'default': {
         'ENGINE': 'django_mongodb_engine',
         'NAME': 'test',
-        'OPTIONS': {'OPERATIONS': {'safe': True}},
+        'OPTIONS': {'OPERATIONS':{}},
     },
     'other': {
         'ENGINE': 'django_mongodb_engine',