Skip to content

Commit 30a6acf

Browse files
author
Mark Unsworth
committed
Merge branch 'master' into feature/pymongo_3
2 parents 57cc51d + 2f259b4 commit 30a6acf

File tree

9 files changed

+34
-13
lines changed

9 files changed

+34
-13
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ dist/
1212
.tox
1313

1414
MANIFEST
15+
16+
17+
.env
18+
.idea

django_mongodb_engine/base.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
class DatabaseFeatures(NonrelDatabaseFeatures):
3939
supports_microsecond_precision = False
4040
supports_long_model_names = False
41+
distinguishes_insert_from_update = True
4142

4243

4344
class DatabaseOperations(NonrelDatabaseOperations):
@@ -72,6 +73,8 @@ def sql_flush(self, style, tables, sequence_list, allow_cascade=False):
7273
options = collection.options()
7374

7475
if not options.get('capped', False):
76+
77+
# TODO:Not backwards compatible
7578
collection.delete_many({})
7679

7780
return []

requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
12
pymongo>=3.0
3+
24
https://github.com/django-nonrel/djangotoolbox/tarball/master
35
https://github.com/django-nonrel/django/tarball/nonrel-1.5
46
https://github.com/django-nonrel/django-dbindexer/tarball/master

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
license='2-clause BSD',
1818
description=DESCRIPTION,
1919
long_description=LONG_DESCRIPTION,
20+
2021
install_requires=['pymongo>=3.0', 'djangotoolbox>=1.6.0'],
22+
2123
packages=find_packages(exclude=['tests', 'tests.*']),
2224
zip_safe=False,
2325
classifiers=[

tests/contrib/tests.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ class RawQueryTests(TestCase):
122122

123123
def setUp(self):
124124

125-
MapReduceModel.objects.all().delete()
126-
127125
for i in xrange(10):
128126
MapReduceModel.objects.create(n=i, m=i * 2)
129127

tests/lookup/tests.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ def setUp(self):
2424
Tag.objects.all().delete()
2525

2626
# Create a few Authors.
27+
Author.objects.all().delete()
28+
Article.objects.all().delete()
29+
Tag.objects.all().delete()
30+
2731
self.au1 = Author(name='Author 1')
2832
self.au1.save()
2933
self.au2 = Author(name='Author 2')

tests/mongodb/tests.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -249,17 +249,13 @@ def test_setup(flags, **method_kwargs):
249249
for name in method_kwargs:
250250
self.assertEqual(method_kwargs[name], Collection._method_kwargs[name])
251251

252+
self.assertEqual(*update_count)
252253

253254
test_setup({}, save={}, update={'multi': True}, remove={})
254-
test_setup({},
255-
save={},
256-
update={'multi': True},
257-
remove={})
258-
test_setup({'delete': {}, 'update': {}},
259-
save={},
260-
update={'multi': True},
261-
remove={})
262-
test_setup({'insert': {'fsync': True}, 'delete': {'fsync': True}},
255+
test_setup({}, save={}, update={'multi': True}, remove={})
256+
test_setup({'delete': {}, 'update': {}}, save={}, update={'multi': True}, remove={})
257+
test_setup({ 'insert': {'fsync': True}, 'delete': {'fsync': True}},
258+
263259
save={},
264260
update={'multi': True},
265261
remove={'fsync': True})

tests/query/tests.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
class BasicQueryTests(TestCase):
1717
"""Backend-agnostic query tests."""
1818

19+
def tearDown(self):
20+
Blog.objects.all().delete()
21+
Post.objects.all().delete()
22+
IntegerModel.objects.all().delete()
23+
1924
def test_add_and_delete_blog(self):
2025
Blog.objects.create(title='blog1')
2126
self.assertEqual(Blog.objects.count(), 1)
@@ -430,6 +435,9 @@ class OrLookupsTests(TestCase):
430435
"""Stolen from the Django test suite, shaked down for m2m tests."""
431436

432437
def setUp(self):
438+
439+
Article.objects.all().delete()
440+
433441
self.a1 = Article.objects.create(
434442
headline='Hello', pub_date=datetime.datetime(2005, 11, 27)).pk
435443
self.a2 = Article.objects.create(
@@ -438,6 +446,9 @@ def setUp(self):
438446
headline='Hello and goodbye',
439447
pub_date=datetime.datetime(2005, 11, 29)).pk
440448

449+
def tearDown(self):
450+
Article.objects.all().delete()
451+
441452
def test_filter_or(self):
442453
self.assertQuerysetEqual(
443454
Article.objects.filter(headline__startswith='Hello') |
@@ -572,6 +583,7 @@ def test_q_and(self):
572583
[])
573584

574585
def test_q_exclude(self):
586+
575587
self.assertQuerysetEqual(
576588
Article.objects.exclude(Q(headline__startswith='Hello')),
577589
['Goodbye'],

tests/settings/settings_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
'default': {
33
'ENGINE': 'django_mongodb_engine',
44
'NAME': 'test',
5-
'OPTIONS': {'OPERATIONS': {}},
5+
'OPTIONS': {'OPERATIONS': {}}
66
},
77
'other': {
88
'ENGINE': 'django_mongodb_engine',
9-
'NAME': 'test2',
9+
'NAME': 'test2'
1010
},
1111
}
1212

0 commit comments

Comments
 (0)