Merge pull request #4056 from GeotrekCE/fix_allow_db_username_with_dash

🐛 [Fix] Fix crash on migrate when db username or dbname contains dash
GeotrekCE · Apr 10, 2024 · feeaf32 · feeaf32
2 parents 8ddaa54 + b9798d5
commit feeaf32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -8,12 +8,16 @@ CHANGELOG
 **Bug fixes**
 
 - Fix OptionalRangeFilter and CustomDateFromToRangeFilter labels translation (fixes #3852)
-- Remove unused `postgres` volume in docker compose file for production
+- Fix crash on migrate when db username or dbname contains dash
 
 **Documentation**
 
 - Improve static pages documentation (#4050
 
+**Improvements**
+
+- Remove unused `postgres` volume in docker compose file for production
+
 
 2.104.2 (2024-04-04)
 --------------------

diff --git a/geotrek/common/utils/postgresql.py b/geotrek/common/utils/postgresql.py
@@ -124,5 +124,5 @@ def move_models_to_schemas(app):
         dbname = settings.DATABASES['default']['NAME']
         dbuser = settings.DATABASES['default']['USER']
         search_path = ', '.join(('public', ) + tuple(set(settings.DATABASE_SCHEMAS.values())))
-        sql = "ALTER ROLE %s IN DATABASE %s SET search_path=%s;" % (dbuser, dbname, search_path)
+        sql = "ALTER ROLE \"%s\" IN DATABASE \"%s\" SET search_path=%s;" % (dbuser, dbname, search_path)
         cursor.execute(sql)