summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-03-07 11:50:49 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-03-11 14:48:54 +0100
commit7b4815b455fc99a2661492f91f7242cfb09a7017 (patch)
tree7a1cc9495407e30b428de8b55c78cc91677c72f4
parentcd364efa00dba5aa86187aee83e4ed9917e7e93c (diff)
Expressed the dirty flag handling logic in terms of autocommit.
-rw-r--r--django/db/backends/__init__.py3
-rw-r--r--django/db/backends/postgresql_psycopg2/base.py4
2 files changed, 2 insertions, 5 deletions
diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py
index ada0e038b4..d372384fc5 100644
--- a/django/db/backends/__init__.py
+++ b/django/db/backends/__init__.py
@@ -311,7 +311,8 @@ class BaseDatabaseWrapper(object):
to decide in a managed block of code to decide whether there are open
changes waiting for commit.
"""
- self._dirty = True
+ if not self.autocommit:
+ self._dirty = True
def set_clean(self):
"""
diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py
index 385206221d..cc1d1ae567 100644
--- a/django/db/backends/postgresql_psycopg2/base.py
+++ b/django/db/backends/postgresql_psycopg2/base.py
@@ -202,10 +202,6 @@ class DatabaseWrapper(BaseDatabaseWrapper):
level = self.isolation_level
self.connection.set_isolation_level(level)
- def set_dirty(self):
- if self.transaction_state and self.transaction_state[-1]:
- super(DatabaseWrapper, self).set_dirty()
-
def check_constraints(self, table_names=None):
"""
To check constraints, we set constraints to immediate. Then, when, we're done we must ensure they