Add support for AddEmbeddedIndex

AUTHORS

@@ -531,6 +531,7 @@ answer newbie questions, and generally made Django that much better:
     Jonathan Buchanan <[email protected]>
     Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
     Jonathan Feignberg <[email protected]>
+    Jonathan McFee <[email protected]>
     Jonathan Slenders
     Jonny Park <[email protected]>
     Jordan Bae <[email protected]>

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/admin/sites.py

@@ -282,7 +282,7 @@ def wrapper(*args, **kwargs):
             path("autocomplete/", wrap(self.autocomplete_view), name="autocomplete"),
             path("jsi18n/", wrap(self.i18n_javascript, cacheable=True), name="jsi18n"),
             path(
-                "r/<int:content_type_id>/<path:object_id>/",
+                "r/<str:content_type_id>/<path:object_id>/",
                 wrap(contenttype_views.shortcut),
                 name="view_on_site",
             ),

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/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/db/backends/base/creation.py

@@ -347,12 +347,19 @@ def mark_expected_failures_and_skips(self):
         for reason, tests in self.connection.features.django_test_skips.items():
             for test_name in tests:
                 test_case_name, _, test_method_name = test_name.rpartition(".")
+                if not test_method_name.startswith("test"):
+                    test_case_name = test_name
+                    test_method_name = None
                 test_app = test_name.split(".")[0]
                 # Importing a test app that isn't installed raises RuntimeError.
                 if test_app in settings.INSTALLED_APPS:
                     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))
+                    if test_method_name:
+                        test_method = getattr(test_case, test_method_name)
+                        setattr(test_case, test_method_name, skip(reason)(test_method))
+                    else:
+                        setattr(test_case, "__unittest_skip__", True)
+                        setattr(test_case, "__unittest_skip_why__", reason)
 
     def sql_table_creation_suffix(self):
         """

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/db/migrations/autodetector.py

@@ -5,6 +5,9 @@
 from graphlib import TopologicalSorter
 from itertools import chain
 
+from django_mongodb_backend.fields import EmbeddedModelField
+from django_mongodb_backend.models import EMBEDDED
+
 from django.conf import settings
 from django.db import models
 from django.db.migrations import operations
@@ -143,18 +146,23 @@ def _detect_changes(self, convert_apps=None, graph=None):
         # resolve dependencies caused by M2Ms and FKs.
         self.generated_operations = {}
         self.altered_indexes = {}
+        self.altered_embedded_indexes = {}
         self.altered_constraints = {}
         self.renamed_fields = {}
 
         # Prepare some old/new state and model lists, separating
         # proxy models and ignoring unmigrated apps.
+        self.old_embedded_keys = set()
         self.old_model_keys = set()
         self.old_proxy_keys = set()
         self.old_unmanaged_keys = set()
+        self.new_embedded_keys = set()
         self.new_model_keys = set()
         self.new_proxy_keys = set()
         self.new_unmanaged_keys = set()
         for (app_label, model_name), model_state in self.from_state.models.items():
+            if model_state.options.get("db_table") is EMBEDDED:
+                self.old_embedded_keys.add((app_label, model_name))
             if not model_state.options.get("managed", True):
                 self.old_unmanaged_keys.add((app_label, model_name))
             elif app_label not in self.from_state.real_apps:
@@ -164,7 +172,9 @@ def _detect_changes(self, convert_apps=None, graph=None):
                     self.old_model_keys.add((app_label, model_name))
 
         for (app_label, model_name), model_state in self.to_state.models.items():
-            if not model_state.options.get("managed", True):
+            if model_state.options.get("db_table") is EMBEDDED:
+                self.new_embedded_keys.add((app_label, model_name))
+            elif not model_state.options.get("managed", True):
                 self.new_unmanaged_keys.add((app_label, model_name))
             elif app_label not in self.from_state.real_apps or (
                 convert_apps and app_label in convert_apps
@@ -202,6 +212,7 @@ def _detect_changes(self, convert_apps=None, graph=None):
         # This avoids the same computation in generate_removed_indexes()
         # and generate_added_indexes().
         self.create_altered_indexes()
+        self.create_altered_embedded_indexes()
         self.create_altered_constraints()
         # Generate index removal operations before field is removed
         self.generate_removed_constraints()
@@ -1411,6 +1422,81 @@ def create_altered_indexes(self):
                 }
             )
 
+    def create_altered_embedded_indexes(self, column_prefix=None, parent_model=None):
+        option_name = operations.AddEmbeddedIndex.option_name
+        for app_label, model_name in sorted(self.kept_model_keys):
+            # old_model_name = self.renamed_models.get(
+            #     (app_label, model_name), model_name
+            # )
+            # old_parent_model_state = self.from_state.models[app_label, old_model_name]
+            new_parent_model_state = self.to_state.models[app_label, model_name]
+
+            for field_name in new_parent_model_state.fields:
+                field = new_parent_model_state.get_field(field_name)
+                if isinstance(field, EmbeddedModelField):
+                    parent_model = new_parent_model_state.name
+                    embedded_model = field.embedded_model
+                    column_prefix = f"{field_name}."
+                    embedded_model_name = embedded_model._meta.model_name
+
+                    # TODO: handle renamed embedded models
+                    old_model_state = self.from_state.models[
+                        embedded_model._meta.app_label, embedded_model_name
+                    ]
+                    new_model_state = self.to_state.models[
+                        embedded_model._meta.app_label, embedded_model_name
+                    ]
+
+                    old_indexes = old_model_state.options[option_name]
+                    new_indexes = new_model_state.options[option_name]
+                    added_indexes = [
+                        idx for idx in new_indexes if idx not in old_indexes
+                    ]
+                    # removed_indexes = [
+                    #     idx for idx in old_indexes if idx not in new_indexes
+                    # ]
+                    # renamed_indexes = []
+                    # Find renamed indexes.
+                    remove_from_added = []
+                    # remove_from_removed = []
+                    # for new_index in added_indexes:
+                    #     new_index_dec = new_index.deconstruct()
+                    #     new_index_name = new_index_dec[2].pop("name")
+                    #     for old_index in removed_indexes:
+                    #         old_index_dec = old_index.deconstruct()
+                    #         old_index_name = old_index_dec[2].pop("name")
+                    #         # Indexes are the same except for the names.
+                    #         if (
+                    #             new_index_dec == old_index_dec
+                    #             and new_index_name != old_index_name
+                    #         ):
+                    #             renamed_indexes.append((old_index_name, new_index_name, None))  # noqa [temp line length]
+                    #             remove_from_added.append(new_index)
+                    #             remove_from_removed.append(old_index)
+                    # Remove renamed indexes from the lists of added and removed
+                    # indexes.
+                    added_indexes = [
+                        idx for idx in added_indexes if idx not in remove_from_added
+                    ]
+                    # removed_indexes = [
+                    #     idx for idx in removed_indexes if idx not in remove_from_removed  # noqa [temp line length]
+                    # ]
+
+                    self.altered_embedded_indexes.update(
+                        {
+                            (
+                                app_label,
+                                embedded_model_name,
+                                column_prefix,
+                                parent_model,
+                            ): {
+                                "added_indexes": added_indexes,
+                                # "removed_indexes": removed_indexes,
+                                # "renamed_indexes": renamed_indexes,
+                            }
+                        }
+                    )
+
     def generate_added_indexes(self):
         for (app_label, model_name), alt_indexes in self.altered_indexes.items():
             dependencies = self._get_dependencies_for_model(app_label, model_name)
@@ -1423,6 +1509,24 @@ def generate_added_indexes(self):
                     ),
                     dependencies=dependencies,
                 )
+        for (
+            app_label,
+            model_name,
+            column_prefix,
+            parent_model_name,
+        ), alt_indexes in self.altered_embedded_indexes.items():
+            dependencies = self._get_dependencies_for_model(app_label, model_name)
+            for index in alt_indexes["added_indexes"]:
+                self.add_operation(
+                    app_label,
+                    operations.AddEmbeddedIndex(
+                        model_name=model_name,
+                        index=index,
+                        column_prefix=column_prefix,
+                        parent_model_name=parent_model_name,
+                    ),
+                    dependencies=dependencies,
+                )
 
     def generate_removed_indexes(self):
         for (app_label, model_name), alt_indexes in self.altered_indexes.items():

django/db/migrations/operations/__init__.py

@@ -1,6 +1,7 @@
 from .fields import AddField, AlterField, RemoveField, RenameField
 from .models import (
     AddConstraint,
+    AddEmbeddedIndex,
     AddIndex,
     AlterIndexTogether,
     AlterModelManagers,
@@ -41,4 +42,5 @@
     "RunPython",
     "AlterOrderWithRespectTo",
     "AlterModelManagers",
+    "AddEmbeddedIndex",
 ]