mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-12 21:59:12 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #36502 -- Restored UNNEST strategy for foreign key bulk inserts on PostgreSQL.

Browse Source 
Regression in 764af7a3d6c0b543dcf659a2c327f214da768fe4.
This commit is contained in:
Simon Charette 2025-07-10 12:33:00 -04:00 committed by GitHub
parent 994950e886
commit 0fe218842e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/postgresql/compiler.py
View File

@ -40,7 +40,8 @@ class SQLInsertCompiler(BaseSQLInsertCompiler):
# unnest'able (e.g. array and geometry types are known to be # unnest'able (e.g. array and geometry types are known to be
# problematic). # problematic).
or any( or any(
field.get_internal_type() not in self.connection.data_types (field.target_field if field.is_relation else field).get_internal_type()
not in self.connection.data_types
for field in fields for field in fields
) )
# Compilable cannot be combined in an array of literal values. # Compilable cannot be combined in an array of literal values.

4
docs/releases/5.2.5.txt
View File

@ -9,4 +9,6 @@ Django 5.2.5 fixes several bugs in 5.2.4.
Bugfixes Bugfixes
======== ========
* ... * Fixed a regression in Django 5.2.1 that prevented the usage of ``UNNEST``
PostgreSQL strategy of ``QuerySet.bulk_create()`` with foreign keys
(:ticket:`36502`).

17
tests/backends/postgresql/test_compilation.py
View File

@ -1,10 +1,11 @@
import unittest import unittest
from datetime import date
from django.db import connection from django.db import connection
from django.db.models.expressions import RawSQL from django.db.models.expressions import RawSQL
from django.test import TestCase from django.test import TestCase
from ..models import Square from ..models import Article, Reporter, Square
@unittest.skipUnless(connection.vendor == "postgresql", "PostgreSQL tests") @unittest.skipUnless(connection.vendor == "postgresql", "PostgreSQL tests")
@ -33,3 +34,17 @@ class BulkCreateUnnestTests(TestCase):
squares = Square.objects.bulk_create([Square(root=3), Square(root=3)]) squares = Square.objects.bulk_create([Square(root=3), Square(root=3)])
self.assertIn("UNNEST", ctx[0]["sql"]) self.assertIn("UNNEST", ctx[0]["sql"])
self.assertEqual([square.square for square in squares], [9, 9]) self.assertEqual([square.square for square in squares], [9, 9])
def test_unnest_eligible_foreign_keys(self):
reporter = Reporter.objects.create()
with self.assertNumQueries(1) as ctx:
articles = Article.objects.bulk_create(
[
Article(pub_date=date.today(), reporter=reporter),
Article(pub_date=date.today(), reporter=reporter),
]
)
self.assertIn("UNNEST", ctx[0]["sql"])
self.assertEqual(
[article.reporter for article in articles], [reporter, reporter]
)