YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1704 from YunoHost/Tagadda-patch-1

Browse source 
Use the existing db_name setting for database provising
This commit is contained in:
Alexandre Aubin 2023-08-31 17:27:46 +02:00 • committed by GitHub
commit 52951239c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/utils/resources.py
View file

@ -1337,8 +1337,8 @@ class DatabaseAppResource(AppResource):
def provision_or_update(self, context: Dict = {}): def provision_or_update(self, context: Dict = {}):
# This is equivalent to ynh_sanitize_dbid # This is equivalent to ynh_sanitize_dbid
db_name = self.app.replace("-", "_").replace(".", "_") db_user = self.app.replace("-", "_").replace(".", "_")
db_user = db_name db_name = self.get_setting("db_name") or db_user
self.set_setting("db_name", db_name) self.set_setting("db_name", db_name)
self.set_setting("db_user", db_user) self.set_setting("db_user", db_user)
@ -1372,8 +1372,8 @@ class DatabaseAppResource(AppResource):
) )
def deprovision(self, context: Dict = {}): def deprovision(self, context: Dict = {}):
db_name = self.app.replace("-", "_").replace(".", "_") db_user = self.app.replace("-", "_").replace(".", "_")
db_user = db_name db_name = self.get_setting("db_name") or db_user
if self.dbtype == "mysql": if self.dbtype == "mysql":
self._run_script( self._run_script(