Skip to content

revert can_return_rows_from_bulk_insert to False #336

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

Merged
merged 5 commits into from
Jan 26, 2024
Merged

revert can_return_rows_from_bulk_insert to False #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef8540b
revert can_return_rows_from_bulk_insert to False
mShan0 Jan 18, 2024
3684a02
set return_rows_bulk_insert to true in testapp
mShan0 Jan 18, 2024
78f4380
move flag set in test
mShan0 Jan 22, 2024
fe9cf90
change flag back after test complete
mShan0 Jan 22, 2024
a1d2d0e
Merge branch 'dev' into revert_return_rows
mShan0 Jan 24, 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
2 changes: 1 addition & 1 deletion mssql/features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
can_introspect_small_integer_field = True
can_return_columns_from_insert = True
can_return_id_from_insert = True
can_return_rows_from_bulk_insert = True
can_return_rows_from_bulk_insert = False
can_rollback_ddl = True
can_use_chunked_reads = False
for_update_after_from = True
Expand Down
4 changes: 2 additions & 2 deletions testapp/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"PASSWORD": "MyPassword42",
"HOST": "localhost",
"PORT": "1433",
"OPTIONS": {"driver": "ODBC Driver 17 for SQL Server", },
"OPTIONS": {"driver": "ODBC Driver 17 for SQL Server", "return_rows_bulk_insert": True},
},
'other': {
"ENGINE": "mssql",
Expand All @@ -24,7 +24,7 @@
"PASSWORD": "MyPassword42",
"HOST": "localhost",
"PORT": "1433",
"OPTIONS": {"driver": "ODBC Driver 17 for SQL Server", },
"OPTIONS": {"driver": "ODBC Driver 17 for SQL Server", "return_rows_bulk_insert": True},
},
}

Expand Down
9 changes: 5 additions & 4 deletions testapp/tests/test_queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
class TestTableWithTrigger(TransactionTestCase):
def test_insert_into_table_with_trigger(self):
connection = connections['default']
# Change can_return_rows_from_bulk_insert to be the same as when
# has_trigger = True
connection.features_class.can_return_rows_from_bulk_insert = False

with connection.schema_editor() as cursor:
cursor.execute("""
CREATE TRIGGER TestTrigger
Expand All @@ -21,9 +17,14 @@ def test_insert_into_table_with_trigger(self):
""")

try:
# Change can_return_rows_from_bulk_insert to be the same as when
# has_trigger = True
old_return_rows_flag = connection.features_class.can_return_rows_from_bulk_insert
connection.features_class.can_return_rows_from_bulk_insert = False
Author.objects.create(name='Foo')
except django.db.utils.ProgrammingError as e:
self.fail('Check for regression of issue #130. Insert with trigger failed with exception: %s' % e)
finally:
with connection.schema_editor() as cursor:
cursor.execute("DROP TRIGGER TestTrigger")
connection.features_class.can_return_rows_from_bulk_insert = old_return_rows_flag