Merge branch 'django42' into add-comments-support

Author: mShan0

testapp/migrations/0024_publisher_book.py

@@ -0,0 +1,58 @@
+# Generated by Django 4.2 on 2023-05-03 15:08
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("testapp", "0023_number"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Publisher",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name="Book",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=100)),
+                ("updated", models.DateTimeField(auto_now=True)),
+                (
+                    "authors",
+                    models.ManyToManyField(related_name="books", to="testapp.author"),
+                ),
+                (
+                    "publisher",
+                    models.ForeignKey(
+                        db_column="publisher_id_column",
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="books",
+                        to="testapp.publisher",
+                    ),
+                ),
+            ],
+        ),
+    ]

testapp/models.py

@@ -9,7 +9,7 @@
 from django.db.models import Q
 from django.utils import timezone
 
-# We are using this Mixin to test casting of BigAuto and Auto fields 
+# We are using this Mixin to test casting of BigAuto and Auto fields
 class BigAutoFieldMixin(models.Model):
     id = models.BigAutoField(primary_key=True)
 
@@ -229,4 +229,20 @@ class Number(models.Model):
     decimal_value = models.DecimalField(max_digits=20, decimal_places=17, null=True)
 
     def __str__(self):
-        return "%i, %.3f, %.17f" % (self.integer, self.float, self.decimal_value)
+        return "%i, %.3f, %.17f" % (self.integer, self.float, self.decimal_value)
+
+
+class Publisher(models.Model):
+    name = models.CharField(max_length=100)
+
+
+class Book(models.Model):
+    name = models.CharField(max_length=100)
+    authors = models.ManyToManyField(Author, related_name="books")
+    publisher = models.ForeignKey(
+        Publisher,
+        models.CASCADE,
+        related_name="books",
+        db_column="publisher_id_column",
+    )
+    updated = models.DateTimeField(auto_now=True)

testapp/settings.py

@@ -289,6 +289,9 @@
     'model_fields.test_jsonfield.TestQuerying.test_lookups_with_key_transform',
     'model_fields.test_jsonfield.TestQuerying.test_ordering_grouping_by_count',
     'model_fields.test_jsonfield.TestQuerying.test_has_key_number',
+
+    # Django 4.2
+    'get_or_create.tests.UpdateOrCreateTests.test_update_only_defaults_and_pre_save_fields_when_local_fields'
 ]
 
 REGEX_TESTS = [

testapp/tests/test_getorcreate.py

@@ -0,0 +1,41 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the BSD license.
+from unittest import skipUnless
+
+from django import VERSION
+from django.test import TestCase
+from django.db import connection
+from django.test.utils import CaptureQueriesContext
+
+from ..models import Book, Publisher
+
+DJANGO42 = VERSION >= (4, 2)
+
+# Copied from Django test suite but modified to test our code
+@skipUnless(DJANGO42, "Django 4.2 specific tests")
+class UpdateOrCreateTests(TestCase):
+
+    def test_update_only_defaults_and_pre_save_fields_when_local_fields(self):
+        publisher = Publisher.objects.create(name="Acme Publishing")
+        book = Book.objects.create(publisher=publisher, name="The Book of Ed & Fred")
+
+        for defaults in [{"publisher": publisher}, {"publisher_id": publisher}]:
+            with self.subTest(defaults=defaults):
+                with CaptureQueriesContext(connection) as captured_queries:
+                    book, created = Book.objects.update_or_create(
+                        pk=book.pk,
+                        defaults=defaults,
+                    )
+                self.assertIs(created, False)
+                update_sqls = [
+                    q["sql"] for q in captured_queries if "UPDATE" in q["sql"]
+                ]
+                self.assertEqual(len(update_sqls), 1)
+                update_sql = update_sqls[0]
+                self.assertIsNotNone(update_sql)
+                self.assertIn(
+                    connection.ops.quote_name("publisher_id_column"), update_sql
+                )
+                self.assertIn(connection.ops.quote_name("updated"), update_sql)
+                # Name should not be updated.
+                self.assertNotIn(connection.ops.quote_name("name"), update_sql)