Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.0: Update django.db.backends.base.operations.BaseDatabaseOperations #2100

Merged
merged 4 commits into from
May 2, 2024
Merged

5.0: Update django.db.backends.base.operations.BaseDatabaseOperations #2100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
826b913
5.0: Update django.db.backends.base.operations
JaeHyuckSa Apr 30, 2024
a3eb484
Merge branch 'master' into operations
JaeHyuckSa May 2, 2024
3968c3e
Update allowlist_todo_django50.txt
JaeHyuckSa May 2, 2024
c3556e8
Update allowlist_todo_django50.txt
JaeHyuckSa May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion django-stubs/db/backends/base/operations.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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]: ...
2 changes: 0 additions & 2 deletions scripts/stubtest/allowlist_todo_django50.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading