DMC/scipro
7
0
Fork 0
Code Issues 33 Pull Requests 4 Actions Projects 1 Wiki Activity

task/3382: Harmonisera tabellnamn #6

Merged
ansv7779 merged 104 commits from task/3382 into develop 2024-11-12 13:33:44 +01:00
Conversation 6 Commits 104 Files Changed 129 +13 -6
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0c93ee2f6b - Show all commits

4
core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategory.java
View File

@ -21,11 +21,11 @@ public class NationalSubjectCategory {
private Long id; private Long id;
@Basic @Basic
@Column(name = "swedish_name") @Column(name = "name_sv")
private String swedishName; private String swedishName;
@Basic @Basic
@Column(name = "english_name") @Column(name = "name_en")
private String englishName; private String englishName;
@Basic @Basic

8
core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadata.java
View File

@ -25,19 +25,19 @@ public class PublicationMetadata {
private Long id; private Long id;
@Basic @Basic
@Column(name = "abstract_swedish") @Column(name = "abstract_sv")
private String abstractSwedish; private String abstractSwedish;
@Basic @Basic
@Column(name = "abstract_english") @Column(name = "abstract_en")
private String abstractEnglish; private String abstractEnglish;
@Basic @Basic
@Column(name = "keywords_swedish") @Column(name = "keywords_sv")
private String keywordsSwedish; private String keywordsSwedish;
@Basic @Basic
@Column(name = "keywords_english") @Column(name = "keywords_en")
private String keywordsEnglish; private String keywordsEnglish;
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------

7
core/src/main/resources/db/migration/V390__harmonize_table_attribute_name.sql
View File

@ -2460,6 +2460,8 @@ alter table `grading_history_approval`
alter table `national_subject_category` drop key `U_national_subject_category_external_id`; alter table `national_subject_category` drop key `U_national_subject_category_external_id`;
alter table `national_subject_category` change `swedish_name` `name_sv` varchar(255) not null after `id`;
alter table `national_subject_category` change `english_name` `name_en` varchar(255) not null after `name_sv`;
alter table `national_subject_category` change `external_id` `external_id` int(11) not null after `preselected`; alter table `national_subject_category` change `external_id` `external_id` int(11) not null after `preselected`;
alter table `national_subject_category` alter table `national_subject_category`
@ -2475,6 +2477,11 @@ alter table `publication_metadata` drop key `FK_publication_metadata_national_su
alter table `publication_metadata` change `project_id` `project_id` bigint(20) not null after `national_subject_category_id`; alter table `publication_metadata` change `project_id` `project_id` bigint(20) not null after `national_subject_category_id`;
alter table `publication_metadata` change `abstract_swedish` `abstract_sv` text default null after `id`;
alter table `publication_metadata` change `abstract_english` `abstract_en` text default null after `abstract_sv`;
alter table `publication_metadata` change `keywords_swedish` `keywords_sv` text default null after `abstract_en`;
alter table `publication_metadata` change `keywords_english` `keywords_en` text default null after `keywords_sv`;
alter table `publication_metadata` alter table `publication_metadata`
add constraint fk_publication_metadata_national_subject_category_id add constraint fk_publication_metadata_national_subject_category_id
foreign key (national_subject_category_id) references national_subject_category (id) foreign key (national_subject_category_id) references national_subject_category (id)