DMC/scipro
7
0
Fork 0
Code Issues 25 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 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 28e617ef9b - Show all commits

2
core/src/main/java/se/su/dsv/scipro/activityplan/Activity.java
View File

@ -72,7 +72,7 @@ public class Activity extends LazyDeletableDomainObject {
private Checklist checklist; private Checklist checklist;
@OneToOne(optional = true, cascade = CascadeType.ALL) @OneToOne(optional = true, cascade = CascadeType.ALL)
@JoinColumn(name = "file_reference_id", referencedColumnName = "id") @JoinColumn(name = "upload_file_reference_id", referencedColumnName = "id")
tozh4728 marked this conversation as resolved Outdated
ansv7779 commented 2024-11-11 14:08:59 +01:00
Outdated
Review
Copy Link

This feels like a downgrade in terms of documentation from the column name. file_upload_reference_id tells you that it is an uploaded file to the activity while file_reference_id conveys no such information.

This feels like a downgrade in terms of documentation from the column name. `file_upload_reference_id` tells you that it is an uploaded file to the activity while `file_reference_id` conveys no such information.
tozh4728 commented 2024-11-12 11:17:24 +01:00
Outdated
Review
Copy Link

It's renamed to 'upload_file_reference_id', following the same scheme _user_id. "file_reference" is the table name.

It's renamed to 'upload_file_reference_id', following the same scheme <context>_user_id. "file_reference" is the table name.
private FileReference fileUpload; private FileReference fileUpload;
//</editor-fold> //</editor-fold>

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

@ -1841,7 +1841,7 @@ alter table `activity` change `action` `action` varchar(64) not null default 'no
alter table `activity` change `editable` `editable` bit(1) not null default b'1' after `action`; alter table `activity` change `editable` `editable` bit(1) not null default b'1' after `action`;
alter table `activity` rename column `activityTemplate_id` to `activity_plan_id`; alter table `activity` rename column `activityTemplate_id` to `activity_plan_id`;
alter table `activity` rename column `file_upload_reference_id` to `file_reference_id`; alter table `activity` rename column `file_upload_reference_id` to `upload_file_reference_id`;
alter table `activity` add constraint uk_activity_checklist_id unique (checklist_id); alter table `activity` add constraint uk_activity_checklist_id unique (checklist_id);
create index idx_activity_deleted on activity(deleted); create index idx_activity_deleted on activity(deleted);
@ -1852,8 +1852,8 @@ alter table `activity`
on delete cascade on update cascade ; on delete cascade on update cascade ;
alter table `activity` alter table `activity`
add constraint `fk_activity_file_reference_id` add constraint `fk_activity_upload_file_reference_id`
foreign key (file_reference_id) references file_reference (id) foreign key (upload_file_reference_id) references file_reference (id)
on delete cascade on update cascade ; on delete cascade on update cascade ;
-- table: ActivityPlan -- table: ActivityPlan