Ticket #25955: django_master_v2.patch

django/db/backends/oracle/base.py

@@ -206 +206 @@
 
     def get_connection_params(self):
         conn_params = self.settings_dict['OPTIONS'].copy()
-        if 'use_returning_into' in conn_params:
-            del conn_params['use_returning_into']
+        conn_params.pop('use_returning_into', None)
+        conn_params.pop('savepoint_check_constraints', None)
         return conn_params
 
     def get_new_connection(self, conn_params):

django/db/backends/base/base.py

@@ -63 +63 @@
         self.savepoint_state = 0
         # List of savepoints created by 'atomic'.
         self.savepoint_ids = []
+        self._savepoint_check_constraints = False
         # Tracks if the outermost 'atomic' block should commit on exit,
         # ie. if autocommit was active on entry.
         self.commit_on_exit = True
@@ -161 +162 @@
         self.in_atomic_block = False
         self.savepoint_ids = []
         self.needs_rollback = False
+        self._savepoint_check_constraints = self.settings_dict['OPTIONS']\
+            .get('savepoint_check_constraints', False) and \
+            self.features.can_defer_constraint_checks
         # Reset parameters defining when to close the connection
         max_age = self.settings_dict['CONN_MAX_AGE']
         self.close_at = None if max_age is None else time.time() + max_age
@@ -340 +344 @@
             return
 
         self.validate_thread_sharing()
+        self.savepoint_check_constraints()
         self._savepoint_commit(sid)
 
     def clean_savepoints(self):
@@ -465 +470 @@
         IntegrityError if any invalid foreign key references are encountered.
         """
         pass
+
+    def savepoint_check_constraints(self):
+        if self._savepoint_check_constraints:
+            self.check_constraints()
+
 
     # ##### Connection termination handling #####
 

django/db/backends/postgresql/base.py

@@ -161 +161 @@
         }
         conn_params.update(settings_dict['OPTIONS'])
         conn_params.pop('isolation_level', None)
+        conn_params.pop('savepoint_check_constraints', None)
         if settings_dict['USER']:
             conn_params['user'] = settings_dict['USER']
         if settings_dict['PASSWORD']: