diff --git a/internal/db/schema/migrations/oss/postgres/56/01_oplog_key_id_scope_id_truncation.up.sql b/internal/db/schema/migrations/oss/postgres/56/01_oplog_key_id_scope_id_truncation.up.sql index 6734073b2..011747056 100644 --- a/internal/db/schema/migrations/oss/postgres/56/01_oplog_key_id_scope_id_truncation.up.sql +++ b/internal/db/schema/migrations/oss/postgres/56/01_oplog_key_id_scope_id_truncation.up.sql @@ -5,7 +5,7 @@ begin; truncate table oplog_entry, oplog_metadata; - -- replaced by 76/01_kms_oplog.up.sql and 76/03_kms_oplog.up.sql + -- replaced by 77/04_alter_oplog_entry.up.sql alter table oplog_entry add column key_id kms_private_id not null constraint kms_data_key_version_fkey @@ -18,7 +18,7 @@ begin; on delete cascade on update cascade; - -- replaced by 76/01_kms_oplog.up.sql + -- replaced by 77/04_alter_oplog_entry.up.sql create function insert_oplog_entry() returns trigger as $$ begin diff --git a/internal/db/schema/migrations/oss/postgres/77/03_kms_oplog.up.sql b/internal/db/schema/migrations/oss/postgres/77/03_kms_oplog.up.sql index a90aeb002..fffdacbcd 100644 --- a/internal/db/schema/migrations/oss/postgres/77/03_kms_oplog.up.sql +++ b/internal/db/schema/migrations/oss/postgres/77/03_kms_oplog.up.sql @@ -129,14 +129,7 @@ from kms_data_key_version kdkv, kms_oplog_data_key kodk where kdkv.data_key_id = kodk.private_id; -- ############################################################################ --- post conversion, we add the required constraints and triggers - -alter table oplog_entry - add constraint kms_oplog_data_key_version_fkey - foreign key(key_id) - references kms_oplog_data_key_version (private_id) - on delete restrict - on update cascade; +-- post conversion, we add the required triggers create trigger kms_default_create_time_column before insert on kms_oplog_root_key for each row execute procedure kms_default_create_time(); diff --git a/internal/db/schema/migrations/oss/postgres/77/04_alter_oplog_entry.up.sql b/internal/db/schema/migrations/oss/postgres/77/04_alter_oplog_entry.up.sql index 98fe67a6d..15f1fad9c 100644 --- a/internal/db/schema/migrations/oss/postgres/77/04_alter_oplog_entry.up.sql +++ b/internal/db/schema/migrations/oss/postgres/77/04_alter_oplog_entry.up.sql @@ -5,7 +5,12 @@ begin; alter table oplog_entry drop constraint iam_scope_fkey, - drop constraint kms_data_key_version_fkey; + drop constraint kms_data_key_version_fkey, + add constraint kms_oplog_data_key_version_fkey + foreign key(key_id) + references kms_oplog_data_key_version (private_id) + on delete restrict + on update cascade; drop trigger insert_oplog_entry on oplog_entry; drop function insert_oplog_entry(); @@ -27,4 +32,4 @@ comment on function insert_oplog_entry() is create trigger insert_oplog_entry before insert on oplog_entry for each row execute procedure insert_oplog_entry(); -commit; \ No newline at end of file +commit;