diff --git a/app/Config/Schema/CreationBase/patchs/2.0.0_to_2.0.1.sql b/app/Config/Schema/CreationBase/patchs/2.0.0_to_2.0.1.sql index 03e906fbdf7e6b6b2297cb0b24f09c24d115e179..4be1b4f221526f6b2db610e80d01c2b220f6d257 100644 --- a/app/Config/Schema/CreationBase/patchs/2.0.0_to_2.0.1.sql +++ b/app/Config/Schema/CreationBase/patchs/2.0.0_to_2.0.1.sql @@ -16,6 +16,11 @@ INSERT INTO role_droits (role_id, liste_droit_id) 'Gestion des co-responsables lors de la déclaration d''un traitement', 'Gestion des sous-traitants lors de la déclaration d''un traitement' ) + AND liste_droits.id NOT IN ( + SELECT existing_roles_droits.liste_droit_id + FROM role_droits AS existing_roles_droits + WHERE existing_roles_droits.role_id = roles.id + ) ORDER BY roles.id, liste_droits.id; INSERT INTO droits (organisation_user_id, liste_droit_id, created, modified) @@ -37,6 +42,11 @@ INSERT INTO droits (organisation_user_id, liste_droit_id, created, modified) 'Gestion des co-responsables lors de la déclaration d''un traitement', 'Gestion des sous-traitants lors de la déclaration d''un traitement' ) + AND liste_droits.id NOT IN ( + SELECT existing_droits.liste_droit_id + FROM droits AS existing_droits + WHERE existing_droits.organisation_user_id = organisations_users.id + ) ORDER BY organisations_users.id, liste_droits.id; COMMIT; diff --git a/docker/app/usr/bin/docker-entrypoint.sh b/docker/app/usr/bin/docker-entrypoint.sh index 4b264782428c16410c8e4227fd6e1a0e75a8626b..d05a547db5f78660ba0eb202bbef17b7d8abb6af 100755 --- a/docker/app/usr/bin/docker-entrypoint.sh +++ b/docker/app/usr/bin/docker-entrypoint.sh @@ -203,6 +203,8 @@ init_data_db() files+=(${__APP_DIR__}/app/Config/Schema/CreationBase/data-dev/1.2.0.sql) fi + files+=(${__APP_DIR__}/app/Config/Schema/CreationBase/patchs/2.0.0_to_2.0.1.sql) + for file in ${files[*]}; do echo "Installation de ${file}" psql postgres://${DATA_USER}:${DATA_PASSWORD}@${DATA_HOST}/${DATA_DB} -v "ON_ERROR_STOP=1" -f "${file}"