core/src/main/java/se/su/dsv/scipro/generalsystemsettings/GeneralSystemSettings.java

@@ -67,9 +67,9 @@ public class GeneralSystemSettings extends DomainObject {
 
     @ElementCollection
     @Enumerated(EnumType.STRING)
-    @Column(name = "system_module")
     @CollectionTable(name = "general_system_settings_system_module",
             joinColumns = @JoinColumn(name = "general_system_settings_id", referencedColumnName = "id"))
+    @Column(name = "system_module")
     private Set<SystemModule> systemModules = EnumSet.allOf(SystemModule.class);
 
     @Column(name = "match_responsible_mail", nullable = true)

core/src/main/java/se/su/dsv/scipro/system/ProjectType.java

@@ -34,7 +34,9 @@ public class ProjectType extends LazyDeletableDomainObject {
 
     @ElementCollection
     @Enumerated(EnumType.STRING)
-    @JoinTable(name = "project_type_project_modules")
+    @CollectionTable(name = "project_type_project_module",
+            joinColumns = @JoinColumn(name = "project_type_id", referencedColumnName = "id"))
+    @Column(name = "project_module")
     private Set<ProjectModule> projectModules = EnumSet.allOf(ProjectModule.class);
 
     @Basic(optional = false)

core/src/main/resources/db/migration/V388__harmonize_table_attribute_name.sql

@@ -760,9 +760,28 @@ rename table `ExternalResource` to `external_resource`;
 
 alter table `external_resource` rename column `relevantFor_id` to `project_type_id`;
 
+-- fix table project_type_project_modules except foreign key to table project_type
+
+alter table `project_type_project_modules` drop primary key;
+alter table `project_type_project_modules` drop foreign key `FK_4attsf1e22qpveesgl6o9b7lg`;
+
+rename table `project_type_project_modules` to `project_type_project_module`;
+
+alter table `project_type_project_module` rename column `ProjectType_id` to `project_type_id`;
+alter table `project_type_project_module` rename column `projectModules` to `project_module`;
+
+alter table `project_type_project_module`
+    add constraint pk_project_type_project_module
+        primary key(project_type_id, project_module);
 
 -- activate following later
 /*
+-- add foreign key reference from project_type_project_module to project_type
+alter table `project_type_project_module`
+    add constraint fk_project_type_project_module_project_type_id
+        foreign key(project_type_id) references project_type(id)
+        on delete cascade on update cascade;
+
 -- add foreign key reference from external_resource to project_type
 alter table `external_resource`
     add constraint fk_external_resource_project_type_id