Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add project id foreign key to data sources tables. #5026

Merged
merged 1 commit into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions database/migrations/000109_data_sources_project_id.down.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
-- SPDX-FileCopyrightText: Copyright 2024 The Minder Authors
-- SPDX-License-Identifier: Apache-2.0

BEGIN;

DROP INDEX data_sources_functions_name_lower_idx;

ALTER TABLE data_sources_functions
DROP COLUMN project_id;

CREATE UNIQUE INDEX data_sources_functions_name_lower_idx
ON data_sources_functions (data_source_id, lower(name));

ALTER TABLE rule_type_data_sources
DROP COLUMN project_id;

COMMIT;
69 changes: 69 additions & 0 deletions database/migrations/000109_data_sources_project_id.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
-- SPDX-FileCopyrightText: Copyright 2024 The Minder Authors
-- SPDX-License-Identifier: Apache-2.0

BEGIN;

-- In the previous migration we forgot to add `project_id` foreign key
-- to both `data_sources_functions` and `rule_type_data_sources`
-- tables.
--
-- While having that foreign key is not terribly important from the
-- data model perspective, since a function is indirectly connected to
-- a project id anyway, from the security perspective we want to
-- ensure that all database objects are tied to a single project and
-- all statements operating on them explicitly filter by project id,
-- since project is the entity by which we enforce permissions.

-- fix data_sources_functions

ALTER TABLE data_sources_functions
ADD COLUMN project_id UUID;

DO $$
DECLARE
ds_id UUID;
pj_id UUID;
BEGIN
FOR ds_id, pj_id IN SELECT id, project_id FROM data_sources
LOOP
UPDATE data_sources_functions
SET project_id = pj_id
WHERE data_source_id = ds_id;
END LOOP;
END $$;
Comment on lines +26 to +33
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this and the loop below be optimised using a JOIN?

e.g.:

UPDATE data_sources_functions dsf
SET project_id = ds.project_id
FROM data_sources ds
WHERE dsf.data_source_id = ds.id;


ALTER TABLE data_sources_functions
ALTER COLUMN project_id SET NOT NULL;
ALTER TABLE data_sources_functions
ADD CONSTRAINT data_sources_functions_project_id_fkey
FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;

DROP INDEX data_sources_functions_name_lower_idx;
CREATE UNIQUE INDEX data_sources_functions_name_lower_idx
ON data_sources_functions (data_source_id, project_id, lower(name));

-- fix rule_type_data_sources

ALTER TABLE rule_type_data_sources
ADD COLUMN project_id UUID;

DO $$
DECLARE
ds_id UUID;
pj_id UUID;
BEGIN
FOR ds_id, pj_id IN SELECT id, project_id FROM data_sources
LOOP
UPDATE rule_type_data_sources
SET project_id = pj_id
WHERE data_sources_id = ds_id;
END LOOP;
END $$;

ALTER TABLE rule_type_data_sources
ALTER COLUMN project_id SET NOT NULL;
ALTER TABLE rule_type_data_sources
ADD CONSTRAINT rule_type_data_sources_project_id_fkey
FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;

COMMIT;
2 changes: 2 additions & 0 deletions internal/db/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading