task/3382: Harmonisera tabellnamn #6

Merged
ansv7779 merged 104 commits from task/3382 into develop 2024-11-12 13:33:44 +01:00
5 changed files with 15 additions and 17 deletions
Showing only changes of commit 9d9ee49b2c - Show all commits

View File

@ -43,6 +43,7 @@ public class Idea extends DomainObject {
private Set<IdeaParticipation> ideaParticipations = new HashSet<>();
@ManyToOne(optional = true)
@JoinColumn(name = "application_period_id")
private ApplicationPeriod applicationPeriod;
@Column(nullable = false, length = TITLE_LENGTH)

View File

@ -39,7 +39,7 @@ public class ProjectPartner extends DomainObject {
private ApplicationPeriod applicationPeriod;
@Lob
@Basic(optional=false)
@Column(name = "info_text", nullable=false)
private String infotext;
@Basic(optional = false)

View File

@ -1,27 +1,26 @@
package se.su.dsv.scipro.report;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import jakarta.persistence.Basic;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Table;
import se.su.dsv.scipro.finalseminar.FinalSeminarOpposition;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.DomainObject;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
@Entity
@Table(name = "grading_report_template")
public class GradingReportTemplate extends DomainObject {
@ -31,7 +30,7 @@ public class GradingReportTemplate extends DomainObject {
private Long id;
@OneToOne(optional = false)
@Column(name = "proejct_type_id")
@JoinColumn(name = "proejct_type_id")
private ProjectType projectType;
@OneToMany(mappedBy = "gradingReportTemplate", cascade = {CascadeType.ALL})

View File

@ -1,16 +1,17 @@
package se.su.dsv.scipro.system;
import java.util.Objects;
import jakarta.persistence.Cacheable;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Table;
import java.util.Objects;
@Entity
@Cacheable(true)
@Table(name="project_type_settings")
@ -24,7 +25,7 @@ public class ProjectTypeSettings extends DomainObject {
private Long id;
@OneToOne(optional = false)
@Column(name = "project_type_id")
@JoinColumn(name = "project_type_id")
private ProjectType projectType;
/*

View File

@ -781,13 +781,10 @@ 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);
alter table `project_type_project_module` add primary key (project_type_id, project_module);
-- table: project_type_settings, except foreign key to coming table project_type
alter table `project_type_settings` drop foreign key `FK_oxqyb1t8jo7cq2fx8j9slvloa`;
alter table `project_type_settings` drop foreign key `FK_project_class_settings_projectType`;
alter table `project_type_settings` drop key `FK_oxqyb1t8jo7cq2fx8j9slvloa`;
alter table `project_type_settings` drop key `UK_project_class_settings_projectType`;
@ -1190,7 +1187,7 @@ alter table `milestone_activity_template_project_type`
-- add back foreign key reference from checklist_template_project_type to project_type
alter table `checklist_template_project_type`
add constraint fk_ct_pt_project_type_id
foreign key (fk_ct_pt_project_type_id) references project_type (id)
foreign key (project_type_id) references project_type (id)
on delete cascade on update cascade;
-- add back foreign key reference from grading_report_template to project_type