Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix schema editor interaction with new transactions

  • Loading branch information...
commit 6e21a59402e1a90c16113e1fac8e4ff39b6914d3 1 parent 7f3678d
@andrewgodwin andrewgodwin authored
Showing with 6 additions and 4 deletions.
  1. +5 −3 django/db/backends/schema.py
  2. +1 −1  tests/schema/tests.py
View
8 django/db/backends/schema.py
@@ -64,7 +64,9 @@ def start(self):
Marks the start of a schema-altering run.
"""
self.deferred_sql = []
- self.connection.set_autocommit(False)
+ self.old_autocommit = self.connection.autocommit
+ if self.connection.autocommit:
+ self.connection.set_autocommit(False)
def commit(self):
"""
@@ -73,7 +75,7 @@ def commit(self):
for sql in self.deferred_sql:
self.execute(sql)
self.connection.commit()
- self.connection.set_autocommit(True)
+ self.connection.set_autocommit(self.old_autocommit)
def rollback(self):
"""
@@ -82,7 +84,7 @@ def rollback(self):
if not self.connection.features.can_rollback_ddl:
raise RuntimeError("Cannot rollback schema changes on this backend")
self.connection.rollback()
- self.connection.set_autocommit(True)
+ self.connection.set_autocommit(self.old_autocommit)
# Core utility functions
View
2  tests/schema/tests.py
@@ -453,7 +453,7 @@ def test_unique(self):
Tag.objects.create(title="foo", slug="foo")
Tag.objects.create(title="bar", slug="foo")
connection.rollback()
- # Alter the slug field to be non-unique
+ # Alter the slug field to be unique
new_new_field = SlugField(unique=True)
new_new_field.set_attributes_from_name("slug")
editor = connection.schema_editor()
Please sign in to comment.
Something went wrong with that request. Please try again.