diff --git a/dmp-backend/web/src/main/resources/config/application.properties b/dmp-backend/web/src/main/resources/config/application.properties index a77c74d91..632e533d8 100644 --- a/dmp-backend/web/src/main/resources/config/application.properties +++ b/dmp-backend/web/src/main/resources/config/application.properties @@ -20,10 +20,10 @@ spring.mail.properties.mail.smtp.auth=false spring.mail.properties.mail.smtp.starttls.enable=false ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## -configuration.externalUrls= -configuration.rda= -configuration.h2020template= -configuration.configurable_login_providers= +configuration.externalUrls=externalUrls/ExternalUrls.xml +configuration.rda=RDACommonStandards.txt +configuration.h2020template=documents/h2020.docx +configuration.configurable_login_providers=ConfigurableLoginProviders.json #############LOGIN CONFIGURATIONS######### #############GENERIC LOGIN CONFIGURATIONS######### diff --git a/dmp-db-scema/updates/00.00.005_remove_user_association_table.sql b/dmp-db-scema/updates/00.00.005_remove_user_association_table.sql index 443504f2a..50ce61b68 100644 --- a/dmp-db-scema/updates/00.00.005_remove_user_association_table.sql +++ b/dmp-db-scema/updates/00.00.005_remove_user_association_table.sql @@ -1,4 +1,10 @@ -DROP TABLE IF EXISTS "UserAssociation"; - -INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.005', '2020-06-03 12:00:00.000000+03', now(), 'Remove user association table'); - \ No newline at end of file +DO $$DECLARE + this_version CONSTANT varchar := '00.00.005'; +BEGIN + PERFORM * FROM "DBVersion" WHERE version = this_version; + IF FOUND THEN RETURN; END IF; + + DROP TABLE IF EXISTS "UserAssociation"; + + INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.005', '2020-06-03 12:00:00.000000+03', now(), 'Remove user association table'); +END$$; \ No newline at end of file