From 2dc85ecf3e19515ef7d151a8a40d0779916d525a Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Tue, 3 May 2022 14:22:34 +0200 Subject: [PATCH] [3.2.x] Fixed CoveringIndexTests.test_covering_partial_index() when DEFAULT_INDEX_TABLESPACE is set. Backport of aa8b9279e40da343f5b91e5aec07f868184056f4 from main --- tests/indexes/tests.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/indexes/tests.py b/tests/indexes/tests.py index e114a90fba..97afe75a62 100644 --- a/tests/indexes/tests.py +++ b/tests/indexes/tests.py @@ -1,6 +1,7 @@ import datetime from unittest import skipUnless +from django.conf import settings from django.db import connection from django.db.models import CASCADE, ForeignKey, Index, Q from django.db.models.functions import Lower @@ -531,10 +532,16 @@ class CoveringIndexTests(TransactionTestCase): condition=Q(pub_date__isnull=False), ) with connection.schema_editor() as editor: + extra_sql = "" + if settings.DEFAULT_INDEX_TABLESPACE: + extra_sql = "TABLESPACE %s " % editor.quote_name( + settings.DEFAULT_INDEX_TABLESPACE + ) self.assertIn( - '(%s) INCLUDE (%s) WHERE %s ' % ( + '(%s) INCLUDE (%s) %sWHERE %s ' % ( editor.quote_name('headline'), editor.quote_name('pub_date'), + extra_sql, editor.quote_name('pub_date'), ), str(index.create_sql(Article, editor)),