Merge branch 'master' into hotfix/pkchain

Author: emperorcezar

django_mongodb_engine/compiler.py

@@ -136,6 +136,7 @@ def add_filters(self, filters, query=None):
             query = self._mongo_query
 
         if filters.connector == OR:
+            assert '$or' not in query, "Multiple ORs are not supported"
             or_conditions = query['$or'] = []
 
         if filters.negated:
@@ -153,7 +154,7 @@ def add_filters(self, filters, query=None):
                         raise DatabaseError("Nested ORs are not supported")
 
                 if filters.connector == OR and filters.negated:
-                    raise NotImplementedError("Negated ORs are not implemented")
+                    raise NotImplementedError("Negated ORs are not supported")
 
                 self.add_filters(child, query=subquery)
 

django_mongodb_engine/creation.py

@@ -78,7 +78,7 @@ def get_column_name(field):
 
     def _handle_oldstyle_indexes(self, ensure_index, meta):
         from warnings import warn
-        warn("'descending_indexes', 'sparse_indexes' and 'index_together' are"
+        warn("'descending_indexes', 'sparse_indexes' and 'index_together' are "
              "deprecated and will be ignored as of version 0.6. "
              "Use 'indexes' instead", DeprecationWarning)
         sparse_indexes = []

django_mongodb_engine/south.py

@@ -7,6 +7,7 @@ class DatabaseOperations(object):
 
     supports_foreign_keys = False
     has_check_constraints = False
+    has_ddl_transactions = False
 
     def __init__(self, db_alias):
         pass
@@ -37,3 +38,33 @@ def delete_table(self, table_name, cascade=True):
 
     def connection_init(self):
         pass
+
+    def send_pending_create_signals(self, verbosity=False, interactive=False):
+        pass
+
+    def get_pending_creates(self):
+        pass
+
+    def start_transaction(self):
+        pass
+
+    def rollback_transaction(self):
+        pass
+
+    def rollback_transactions_dry_run(self):
+        pass
+
+    def clear_run_data(self, pending_creates):
+        pass
+
+    def create_table(self, unique=True, null=True, blank=True):
+        pass
+
+    def send_create_signal(self, verbosity=False, interactive=False):
+        pass
+
+    def execute_deferred_sql(self):
+        pass
+
+    def commit_transaction(self):
+        pass

docs/source/meta/contributing.rst

@@ -44,6 +44,6 @@ use `GitHub's pull requests`_. It's perfectly fine, however, to send regular
 patches to :ref:`the mailing list <contributing/mailinglist>`.
 
 .. _mailing list: http://groups.google.com/group/django-non-relational
-.. _on Github: https://github.com/django-mongodb-engine
-.. _ticket tracker on GitHub: https://github.com/django-mongodb-engine/mongodb-engine/issues/
+.. _on Github: https://github.com/django-nonrel
+.. _ticket tracker on GitHub: https://github.com/django-nonrel/mongodb-engine/issues/
 .. _GitHub's pull requests: http://help.github.com/pull-requests/

docs/source/topics/cache.rst

@@ -28,7 +28,7 @@ Installation
 ------------
 .. code-block:: bash
 
-   git clone https://github.com/django-mongodb-engine/mongodb-cache
+   git clone https://github.com/django-nonrel/mongodb-cache
    cd mongodb-cache
    python setup.py install
 
@@ -50,5 +50,5 @@ Django MongoDB Cache will also honor all optional settings the default database
 cache backend takes care of (``TIMEOUT``, ``OPTIONS``, etc).
 
 .. _Django's caching framework: http://docs.djangoproject.com/en/dev/topics/cache/
-.. _Django MongoDB Cache: https://github.com/django-mongodb-engine/mongodb-cache
+.. _Django MongoDB Cache: https://github.com/django-nonrel/mongodb-cache
 .. _Django db cache setup docs: http://docs.djangoproject.com/en/dev/topics/cache/#database-caching

docs/source/topics/setup.rst

@@ -43,7 +43,7 @@ Django MongoDB Engine
 .....................
 You should use the latest Git revision. ::
 
-   pip install git+https://github.com/django-mongodb-engine/mongodb-engine
+   pip install git+https://github.com/django-nonrel/mongodb-engine
 
 
 Configuration

tests/mongodb/tests.py

@@ -2,6 +2,7 @@
 from django.core.management import call_command
 from django.db import connection, connections
 from django.db.utils import DatabaseError, IntegrityError
+from django.db.models import Q
 from django.contrib.sites.models import Site
 
 from pymongo.objectid import InvalidId
@@ -170,6 +171,11 @@ def test_multiple_exclude_random(self):
                 q = getattr(q, 'filter' if randint(0, 1) else 'exclude')(raw=i)
             list(q)
 
+    def test_issue_89(self):
+        query = [Q(raw='a') | Q(raw='b'),
+                 Q(raw='c') | Q(raw='d')]
+        self.assertRaises(AssertionError, RawModel.objects.get, *query)
+
 class DatabaseOptionTests(TestCase):
     """ Tests for MongoDB-specific database options """