8282-testToMaster #3284

Merged
alexm merged 157 commits from 8282-testToMaster into master 2024-12-10 06:18:52 +00:00
2 changed files with 3 additions and 24 deletions
Showing only changes of commit fa108e2af0 - Show all commits

View File

@ -1,15 +0,0 @@
-- ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_disabilityGradeFk;
-- ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_workerFk;
-- RENAME TABLE `vn`.`workerRelatives` TO `vn`.`workerRelative`;
-- ALTER TABLE vn.workerRelative ADD CONSTRAINT `workerRelatives_disabilityGradeFk` FOREIGN KEY (`disabilityGradeFk`) REFERENCES `disabilityGrade` (`id`) ON UPDATE CASCADE;
-- ALTER TABLE vn.workerRelative ADD CONSTRAINT `workerRelatives_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `workerIrpf` (`workerFk`) ON DELETE CASCADE ON UPDATE CASCADE;
-- INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-- VALUES
-- ('workerRelative','*','*','ALLOW','ROLE','hr'),
-- ('workerIrpf','*','*','ALLOW','ROLE','hr'),
-- ('disabilityGrade','*','*','ALLOW','ROLE','hr');

View File

@ -1,15 +1,9 @@
ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_disabilityGradeFk;
ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_workerFk;
-- RENAME TABLE `vn`.`workerRelatives` TO `vn`.`workerRelative`;
-- ALTER TABLE vn.workerRelative ADD CONSTRAINT `workerRelatives_disabilityGradeFk` FOREIGN KEY (`disabilityGradeFk`) REFERENCES `disabilityGrade` (`id`) ON UPDATE CASCADE;
-- ALTER TABLE vn.workerRelative ADD CONSTRAINT `workerRelatives_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `workerIrpf` (`workerFk`) ON DELETE CASCADE ON UPDATE CASCADE;
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES
('workerRelatives','*','*','ALLOW','ROLE','hr'),
('workerIrpf','*','*','ALLOW','ROLE','hr'),
('disabilityGrade','*','*','ALLOW','ROLE','hr');
('WorkerRelative','*','*','ALLOW','ROLE','hr'),
('WorkerIrpf','*','*','ALLOW','ROLE','hr'),
('DisabilityGrade','*','*','ALLOW','ROLE','hr');