Skip to content

Commit 64a14cc

Browse files
authored
5.0: Update django.db.backends.base.operations.BaseDatabaseOperations (#2100)
* 5.0: Update django.db.backends.base.operations * Update allowlist_todo_django50.txt * Update allowlist_todo_django50.txt
1 parent b97efba commit 64a14cc

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

django-stubs/db/backends/base/operations.pyi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ from django.db.backends.base.base import BaseDatabaseWrapper
1010
from django.db.backends.utils import CursorWrapper
1111
from django.db.models.base import Model
1212
from django.db.models.constants import OnConflict
13-
from django.db.models.expressions import Case, Expression
13+
from django.db.models.expressions import Case, Col, Expression
1414
from django.db.models.fields import Field
1515
from django.db.models.sql.compiler import SQLCompiler
1616

@@ -111,3 +111,6 @@ class BaseDatabaseOperations:
111111
self, fields: Any, on_conflict: Any, update_fields: Any, unique_fields: Any
112112
) -> str | Any: ...
113113
def format_for_duration_arithmetic(self, sql: str) -> str: ...
114+
def prepare_join_on_clause(
115+
self, lhs_table: str, lhs_field: Field, rhs_table: str, rhs_field: Field
116+
) -> tuple[Col, Col]: ...

scripts/stubtest/allowlist_todo_django50.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ django.contrib.gis.management.commands
3636
django.contrib.gis.management.commands.inspectdb
3737
django.contrib.gis.management.commands.ogrinspect
3838
django.contrib.messages.test
39-
django.db.backends.base.operations.BaseDatabaseOperations.prepare_join_on_clause
4039
django.db.backends.mysql.features.DatabaseFeatures.allows_group_by_selected_pks
4140
django.db.backends.mysql.features.DatabaseFeatures.has_native_uuid_field
4241
django.db.backends.mysql.features.DatabaseFeatures.supports_expression_defaults
@@ -45,7 +44,6 @@ django.db.backends.oracle.features.DatabaseFeatures.test_collations
4544
django.db.backends.oracle.oracledb_any
4645
django.db.backends.postgresql.features.DatabaseFeatures.is_postgresql_15
4746
django.db.backends.postgresql.features.DatabaseFeatures.supports_nulls_distinct_unique_constraints
48-
django.db.backends.postgresql.operations.DatabaseOperations.prepare_join_on_clause
4947
django.db.backends.postgresql.psycopg_any
5048
django.db.backends.sqlite3.schema.DatabaseSchemaEditor.sql_alter_column_comment
5149
django.db.backends.sqlite3.schema.DatabaseSchemaEditor.sql_alter_table_comment

0 commit comments

Comments
 (0)