INTPYTHON-736 - Update test to not expect $expr

django/contrib/admin/apps.py

@@ -7,7 +7,7 @@
 class SimpleAdminConfig(AppConfig):
     """Simple AppConfig which does not do automatic discovery."""
 
-    default_auto_field = "django.db.models.AutoField"
+    default_auto_field = "django_mongodb_backend.fields.ObjectIdAutoField"
     default_site = "django.contrib.admin.sites.AdminSite"
     name = "django.contrib.admin"
     verbose_name = _("Administration")

django/contrib/auth/apps.py

@@ -11,7 +11,7 @@
 
 
 class AuthConfig(AppConfig):
-    default_auto_field = "django.db.models.AutoField"
+    default_auto_field = "django_mongodb_backend.fields.ObjectIdAutoField"
     name = "django.contrib.auth"
     verbose_name = _("Authentication and Authorization")
 

django/contrib/contenttypes/apps.py

@@ -11,7 +11,7 @@
 
 
 class ContentTypesConfig(AppConfig):
-    default_auto_field = "django.db.models.AutoField"
+    default_auto_field = "django_mongodb_backend.fields.ObjectIdAutoField"
     name = "django.contrib.contenttypes"
     verbose_name = _("Content Types")
 

django/contrib/contenttypes/views.py

@@ -1,7 +1,7 @@
 from django.apps import apps
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.shortcuts import get_current_site
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.http import Http404, HttpResponseRedirect
 from django.utils.translation import gettext as _
 
@@ -19,7 +19,7 @@ def shortcut(request, content_type_id, object_id):
                 % {"ct_id": content_type_id}
             )
         obj = content_type.get_object_for_this_type(pk=object_id)
-    except (ObjectDoesNotExist, ValueError):
+    except (ObjectDoesNotExist, ValidationError, ValueError):
         raise Http404(
             _("Content type %(ct_id)s object %(obj_id)s doesn’t exist")
             % {"ct_id": content_type_id, "obj_id": object_id}

django/contrib/flatpages/apps.py

@@ -3,6 +3,6 @@
 
 
 class FlatPagesConfig(AppConfig):
-    default_auto_field = "django.db.models.AutoField"
+    default_auto_field = "django_mongodb_backend.fields.ObjectIdAutoField"
     name = "django.contrib.flatpages"
     verbose_name = _("Flat Pages")

django/contrib/gis/apps.py

@@ -4,7 +4,7 @@
 
 
 class GISConfig(AppConfig):
-    default_auto_field = "django.db.models.AutoField"
+    default_auto_field = "django_mongodb_backend.fields.ObjectIdAutoField"
     name = "django.contrib.gis"
     verbose_name = _("GIS")
 

django/contrib/gis/db/backends/base/features.py

@@ -58,14 +58,6 @@ class BaseSpatialFeatures:
     # for empty results?
     empty_intersection_returns_none = True
 
-    @property
-    def supports_bbcontains_lookup(self):
-        return "bbcontains" in self.connection.ops.gis_operators
-
-    @property
-    def supports_contained_lookup(self):
-        return "contained" in self.connection.ops.gis_operators
-
     @property
     def supports_crosses_lookup(self):
         return "crosses" in self.connection.ops.gis_operators
@@ -74,10 +66,6 @@ def supports_crosses_lookup(self):
     def supports_distances_lookups(self):
         return self.has_Distance_function
 
-    @property
-    def supports_dwithin_lookup(self):
-        return "dwithin" in self.connection.ops.gis_operators
-
     @property
     def supports_relate_lookup(self):
         return "relate" in self.connection.ops.gis_operators

django/contrib/gis/db/backends/base/operations.py

@@ -39,13 +39,16 @@ def select_extent(self):
         "AsGML",
         "AsKML",
         "AsSVG",
+        "AsWKB",
+        "AsWKT",
         "Azimuth",
         "BoundingCircle",
         "Centroid",
         "ClosestPoint",
         "Difference",
         "Distance",
         "Envelope",
+        "ForcePolygonCW",
         "FromWKB",
         "FromWKT",
         "GeoHash",

django/contrib/redirects/apps.py

@@ -3,6 +3,6 @@
 
 
 class RedirectsConfig(AppConfig):
-    default_auto_field = "django.db.models.AutoField"
+    default_auto_field = "django_mongodb_backend.fields.ObjectIdAutoField"
     name = "django.contrib.redirects"
     verbose_name = _("Redirects")

django/contrib/sites/apps.py

@@ -8,7 +8,7 @@
 
 
 class SitesConfig(AppConfig):
-    default_auto_field = "django.db.models.AutoField"
+    default_auto_field = "django_mongodb_backend.fields.ObjectIdAutoField"
     name = "django.contrib.sites"
     verbose_name = _("Sites")
 

django/contrib/sites/migrations/0001_initial.py

@@ -1,3 +1,5 @@
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 import django.contrib.sites.models
 from django.contrib.sites.models import _simple_domain_name_validator
 from django.db import migrations, models
@@ -12,7 +14,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    ObjectIdAutoField(
                         verbose_name="ID",
                         serialize=False,
                         auto_created=True,

django/core/management/commands/loaddata.py

@@ -18,6 +18,7 @@
     DEFAULT_DB_ALIAS,
     DatabaseError,
     IntegrityError,
+    connection,
     connections,
     router,
     transaction,
@@ -251,7 +252,24 @@ def load_label(self, fixture_label):
 
                 for obj in objects:
                     objects_in_fixture += 1
+
+                    # Workaround for MongoDB to ignore unsupported SRIDs in test
+                    # fixtures.
+                    if connection.features.gis_enabled:
+                        from django.contrib.gis.db.models import GeometryField
+
+                        invalid_srid = False
+                        for field in obj.object._meta.fields:
+                            if isinstance(field, GeometryField):
+                                val = getattr(obj.object, field.name)
+                                if val and val.srid in {32140, 2278}:
+                                    invalid_srid = True
+                                    break
+                        if invalid_srid:
+                            continue
+
                     if self.save_obj(obj):
+
                         loaded_objects_in_fixture += 1
                         if show_progress:
                             self.stdout.write(

django/db/backends/base/creation.py

@@ -350,6 +350,9 @@ def mark_expected_failures_and_skips(self):
                 test_app = test_name.split(".")[0]
                 # Importing a test app that isn't installed raises RuntimeError.
                 if test_app in settings.INSTALLED_APPS:
+                    # If this is a a test class, it may need to be imported.
+                    if test_name.count(".") == 2:
+                        import_string(test_name)
                     test_case = import_string(test_case_name)
                     test_method = getattr(test_case, test_method_name)
                     setattr(test_case, test_method_name, skip(reason)(test_method))

django/db/backends/base/features.py

@@ -87,6 +87,9 @@ class BaseDatabaseFeatures:
     # by returning the type used to store duration field?
     supports_temporal_subtraction = False
 
+    # Do time/datetime fields have microsecond precision?
+    supports_microsecond_precision = True
+
     # Does the __regex lookup support backreferencing and grouping?
     supports_regex_backreferencing = True
 

django/forms/models.py

@@ -1562,7 +1562,12 @@ def to_python(self, value):
             if isinstance(value, self.queryset.model):
                 value = getattr(value, key)
             value = self.queryset.get(**{key: value})
-        except (ValueError, TypeError, self.queryset.model.DoesNotExist):
+        except (
+            ValueError,
+            TypeError,
+            ValidationError,
+            self.queryset.model.DoesNotExist,
+        ):
             raise ValidationError(
                 self.error_messages["invalid_choice"],
                 code="invalid_choice",
@@ -1640,7 +1645,7 @@ def _check_values(self, value):
             self.validate_no_null_characters(pk)
             try:
                 self.queryset.filter(**{key: pk})
-            except (ValueError, TypeError):
+            except (ValueError, TypeError, ValidationError):
                 raise ValidationError(
                     self.error_messages["invalid_pk_value"],
                     code="invalid_pk_value",

tests/admin_changelist/models.py

@@ -1,5 +1,7 @@
 import uuid
 
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.contrib.auth.models import User
 from django.db import models
 
@@ -130,7 +132,7 @@ class OrderedObject(models.Model):
 
 
 class CustomIdUser(models.Model):
-    uuid = models.AutoField(primary_key=True)
+    uuid = ObjectIdAutoField(primary_key=True)
 
 
 class CharPK(models.Model):