Fixed #21453 -- Enabled autocommit before calling init_connection_state.

Also ensured the transaction state is clean on Oracle while I was there.

This change cannot be backported to 1.6 because it's
backwards-incompatible for custom database backends.

1 files changed, 5 insertions, 5 deletions

diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py
index c7fd98ae98..7725b0c7a0 100644
--- a/django/db/backends/postgresql_psycopg2/base.py
+++ b/django/db/backends/postgresql_psycopg2/base.py
@@ -142,12 +142,12 @@ class DatabaseWrapper(BaseDatabaseWrapper):
                 conn_tz = get_parameter_status('TimeZone')
 
             if conn_tz != tz:
-                self.connection.cursor().execute(
-                    self.ops.set_time_zone_sql(), [tz]
-                )
+                cursor = self.connection.cursor()
+                cursor.execute(self.ops.set_time_zone_sql(), [tz])
+                cursor.close()
                 # Commit after setting the time zone (see #17062)
-                self.connection.commit()
-        self.connection.set_isolation_level(self.isolation_level)
+                if not self.get_autocommit():
+                    self.connection.commit()
 
     def create_cursor(self):
         cursor = self.connection.cursor()