Ticket #12180: 12180-2.diff

django/db/backends/postgresql_psycopg2/base.py

@@ -67 +67 @@
         autocommit = self.settings_dict["DATABASE_OPTIONS"].get('autocommit', False)
         self.features.uses_autocommit = autocommit
         self._set_isolation_level(int(not autocommit))
+        self.features.can_return_id_from_insert = autocommit
         self.ops = DatabaseOperations()
         self.client = DatabaseClient(self)
         self.creation = DatabaseCreation(self)
@@ -114 +115 @@
                     # handling, so we forbid it for now.
                     from django.core.exceptions import ImproperlyConfigured
                     raise ImproperlyConfigured("You cannot use autocommit=True with PostgreSQL prior to 8.2 at the moment.")
-                else:
-                    # FIXME: Eventually we're enable this by default for
-                    # versions that support it, but, right now, that's hard to
-                    # do without breaking other things (#10509).
-                    self.features.can_return_id_from_insert = True
         return cursor
 
     def _enter_transaction_management(self, managed):