diff --git a/django-stubs/db/backends/base/operations.pyi b/django-stubs/db/backends/base/operations.pyi index a1d8c7e2b..ac3a1981b 100644 --- a/django-stubs/db/backends/base/operations.pyi +++ b/django-stubs/db/backends/base/operations.pyi @@ -10,7 +10,7 @@ from django.db.backends.base.base import BaseDatabaseWrapper from django.db.backends.utils import CursorWrapper from django.db.models.base import Model from django.db.models.constants import OnConflict -from django.db.models.expressions import Case, Expression +from django.db.models.expressions import Case, Col, Expression from django.db.models.fields import Field from django.db.models.sql.compiler import SQLCompiler @@ -111,3 +111,6 @@ class BaseDatabaseOperations: self, fields: Any, on_conflict: Any, update_fields: Any, unique_fields: Any ) -> str | Any: ... def format_for_duration_arithmetic(self, sql: str) -> str: ... + def prepare_join_on_clause( + self, lhs_table: str, lhs_field: Field, rhs_table: str, rhs_field: Field + ) -> tuple[Col, Col]: ... diff --git a/scripts/stubtest/allowlist_todo_django50.txt b/scripts/stubtest/allowlist_todo_django50.txt index b45576572..291e577cb 100644 --- a/scripts/stubtest/allowlist_todo_django50.txt +++ b/scripts/stubtest/allowlist_todo_django50.txt @@ -36,7 +36,6 @@ django.contrib.gis.management.commands django.contrib.gis.management.commands.inspectdb django.contrib.gis.management.commands.ogrinspect django.contrib.messages.test -django.db.backends.base.operations.BaseDatabaseOperations.prepare_join_on_clause django.db.backends.mysql.features.DatabaseFeatures.allows_group_by_selected_pks django.db.backends.mysql.features.DatabaseFeatures.has_native_uuid_field django.db.backends.mysql.features.DatabaseFeatures.supports_expression_defaults @@ -45,7 +44,6 @@ django.db.backends.oracle.features.DatabaseFeatures.test_collations django.db.backends.oracle.oracledb_any django.db.backends.postgresql.features.DatabaseFeatures.is_postgresql_15 django.db.backends.postgresql.features.DatabaseFeatures.supports_nulls_distinct_unique_constraints -django.db.backends.postgresql.operations.DatabaseOperations.prepare_join_on_clause django.db.backends.postgresql.psycopg_any django.db.backends.sqlite3.schema.DatabaseSchemaEditor.sql_alter_column_comment django.db.backends.sqlite3.schema.DatabaseSchemaEditor.sql_alter_table_comment