diff options
| -rw-r--r-- | django/db/backends/postgresql_psycopg2/base.py | 4 | ||||
| -rw-r--r-- | tests/backends/tests.py | 23 |
2 files changed, 21 insertions, 6 deletions
diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py index 6ed2cfcc7c..ec2b71c3a1 100644 --- a/django/db/backends/postgresql_psycopg2/base.py +++ b/django/db/backends/postgresql_psycopg2/base.py @@ -129,10 +129,10 @@ class DatabaseWrapper(BaseDatabaseWrapper): conn_tz = get_parameter_status('TimeZone') if conn_tz != tz: - # Set the time zone in autocommit mode (see #17062) - self.set_autocommit(True) self.connection.cursor().execute( self.ops.set_time_zone_sql(), [tz]) + # Commit after setting the time zone (see #17062) + self.connection.commit() self.connection.set_isolation_level(self.isolation_level) def create_cursor(self): diff --git a/tests/backends/tests.py b/tests/backends/tests.py index be0c3a418f..90794a5472 100644 --- a/tests/backends/tests.py +++ b/tests/backends/tests.py @@ -352,10 +352,25 @@ class PostgresNewConnectionTests(TestCase): tz = cursor.fetchone()[0] self.assertEqual(new_tz, tz) finally: - try: - new_connection.close() - except DatabaseError: - pass + new_connection.close() + + @unittest.skipUnless( + connection.vendor == 'postgresql', + "This test applies only to PostgreSQL") + def test_connect_non_autocommit(self): + """ + The connection wrapper shouldn't believe that autocommit is enabled + after setting the time zone when AUTOCOMMIT is False (#21452). + """ + databases = copy.deepcopy(settings.DATABASES) + new_connections = ConnectionHandler(databases) + new_connection = new_connections[DEFAULT_DB_ALIAS] + try: + new_connection.settings_dict['AUTOCOMMIT'] = False + cursor = new_connection.cursor() + self.assertFalse(new_connection.get_autocommit()) + finally: + new_connection.close() # This test needs to run outside of a transaction, otherwise closing the |