mirror of
https://github.com/django/django.git
synced 2025-10-24 22:26:08 +00:00
Fixed #34470 -- Enforced UTF-8 encoding on PostgreSQL.
Regression in 6a21658163.
This commit is contained in:
@@ -208,7 +208,6 @@ class DatabaseWrapper(BaseDatabaseWrapper):
|
||||
self.ops.max_name_length(),
|
||||
)
|
||||
)
|
||||
conn_params = {"client_encoding": "UTF8"}
|
||||
if settings_dict["NAME"]:
|
||||
conn_params = {
|
||||
"dbname": settings_dict["NAME"],
|
||||
@@ -220,6 +219,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
|
||||
conn_params = {"dbname": "postgres", **settings_dict["OPTIONS"]}
|
||||
else:
|
||||
conn_params = {**settings_dict["OPTIONS"]}
|
||||
conn_params["client_encoding"] = "UTF8"
|
||||
|
||||
conn_params.pop("assume_role", None)
|
||||
conn_params.pop("isolation_level", None)
|
||||
|
||||
Reference in New Issue
Block a user