mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Refs #29444 -- Removed redundant DatabaseFeatures.can_return_multiple_columns_from_insert.

Browse Source 
Unnecessary since b31e63879e.
This commit is contained in:
Mariusz Felisiak
2019-09-24 10:32:26 +02:00
parent b31e63879e
commit 01104368ff
5 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
django/db/backends/base/features.py
View File

@@ -23,7 +23,6 @@ class BaseDatabaseFeatures:
can_use_chunked_reads = True
can_return_columns_from_insert = False
can_return_multiple_columns_from_insert = False
can_return_rows_from_bulk_insert = False
has_bulk_insert = True
uses_savepoints = True

1
django/db/backends/oracle/features.py
View File

@@ -10,7 +10,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
has_select_for_update_of = True
select_for_update_of_column = True
can_return_columns_from_insert = True
can_return_multiple_columns_from_insert = True
can_introspect_autofield = True
supports_subqueries_in_group_by = False
supports_transactions = True

1
django/db/backends/postgresql/features.py
View File

@@ -8,7 +8,6 @@ from django.utils.functional import cached_property
class DatabaseFeatures(BaseDatabaseFeatures):
allows_group_by_selected_pks = True
can_return_columns_from_insert = True
can_return_multiple_columns_from_insert = True
can_return_rows_from_bulk_insert = True
has_real_datatype = True
has_native_uuid_field = True

8
django/db/models/sql/compiler.py
View File

@@ -1334,14 +1334,6 @@ class SQLInsertCompiler(SQLCompiler):
if self.connection.features.can_return_rows_from_bulk_insert and len(self.query.objs) > 1:
return self.connection.ops.fetch_returned_insert_rows(cursor)
if self.connection.features.can_return_columns_from_insert:
if (
len(self.returning_fields) > 1 and
not self.connection.features.can_return_multiple_columns_from_insert
):
raise NotSupportedError(
'Returning multiple columns from INSERT statements is '
'not supported on this database backend.'
)
assert len(self.query.objs) == 1
return self.connection.ops.fetch_returned_insert_columns(cursor, self.returning_params)
return [self.connection.ops.last_insert_id(