Refs #32292 -- Made dbshell do not use 'postgres' database when service name is set.

Regression in dcb3ad3319.

django/db/backends/postgresql/client.py

@@ -13,7 +13,7 @@ class DatabaseClient(BaseDatabaseClient):
 
         host = settings_dict.get('HOST')
         port = settings_dict.get('PORT')
-        dbname = settings_dict.get('NAME') or 'postgres'
+        dbname = settings_dict.get('NAME')
         user = settings_dict.get('USER')
         passwd = settings_dict.get('PASSWORD')
         service = options.get('service')
@@ -22,12 +22,16 @@ class DatabaseClient(BaseDatabaseClient):
         sslcert = options.get('sslcert')
         sslkey = options.get('sslkey')
 
+        if not dbname and not service:
+            # Connect to the default 'postgres' db.
+            dbname = 'postgres'
         if user:
             args += ['-U', user]
         if host:
             args += ['-h', host]
         if port:
             args += ['-p', str(port)]
+        if dbname:
             args += [dbname]
         args.extend(parameters)
 

tests/dbshell/test_postgresql.py

@@ -70,7 +70,7 @@ class PostgreSqlDbshellCommandTestCase(SimpleTestCase):
     def test_service(self):
         self.assertEqual(
             self.settings_to_cmd_args_env({'OPTIONS': {'service': 'django_test'}}),
-            (['psql', 'postgres'], {'PGSERVICE': 'django_test'}),
+            (['psql'], {'PGSERVICE': 'django_test'}),
         )
 
     def test_column(self):