From 5d539daa56ae1964f0e8627577a2ee2f310b66d0 Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Sun, 26 Mar 2023 19:20:09 -0400
Subject: [PATCH] Removed unnecessary usage of .extra() in tests.

---
 tests/backends/tests.py | 7 +++++--
 tests/schema/tests.py   | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/backends/tests.py b/tests/backends/tests.py
index 2adfa51360..3aeee852ef 100644
--- a/tests/backends/tests.py
+++ b/tests/backends/tests.py
@@ -19,6 +19,7 @@ from django.db import (
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.backends.signals import connection_created
 from django.db.backends.utils import CursorWrapper
+from django.db.models import Value
 from django.db.models.sql.constants import CURSOR
 from django.test import (
     TestCase,
@@ -84,8 +85,10 @@ class LastExecutedQueryTest(TestCase):
 
     def test_query_encoding(self):
         """last_executed_query() returns a string."""
-        data = RawData.objects.filter(raw_data=b"\x00\x46  \xFE").extra(
-            select={"föö": 1}
+        data = RawData.objects.filter(raw_data=b"\x00\x46  \xFE").annotate(
+            **{
+                "föö": Value(1),
+            }
         )
         sql, params = data.query.sql_with_params()
         with data.query.get_compiler("default").execute_sql(CURSOR) as cursor:
diff --git a/tests/schema/tests.py b/tests/schema/tests.py
index 3a2947cf43..a51e0f742f 100644
--- a/tests/schema/tests.py
+++ b/tests/schema/tests.py
@@ -53,6 +53,7 @@ from django.db.models import (
     UUIDField,
     Value,
 )
+from django.db.models.expressions import RawSQL
 from django.db.models.fields.json import KT, KeyTextTransform
 from django.db.models.functions import (
     Abs,
@@ -774,7 +775,9 @@ class SchemaTests(TransactionTestCase):
             field_type, connection.features.introspected_field_types["IntegerField"]
         )
         # Make sure the values were transformed correctly
-        self.assertEqual(Author.objects.extra(where=["thing = 1"]).count(), 2)
+        self.assertEqual(
+            Author.objects.filter(RawSQL("thing = %s", (1,), BooleanField())).count(), 2
+        )
 
     def test_add_field_o2o_nullable(self):
         with connection.schema_editor() as editor: