From d8393e57931770f96df0764d7604dcfb4b0b8f7f Mon Sep 17 00:00:00 2001 From: Michael Gaffney Date: Wed, 6 Sep 2023 19:00:48 -0400 Subject: [PATCH] style(sql): fix indenting and remove trailing whitespace --- .../postgres/77/02_kms_oplog_version.up.sql | 10 +++--- .../oss/postgres/77/03_kms_oplog.up.sql | 32 +++++++++---------- .../oss/postgres/77/04_kms_oplog.up.sql | 12 +++---- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/internal/db/schema/migrations/oss/postgres/77/02_kms_oplog_version.up.sql b/internal/db/schema/migrations/oss/postgres/77/02_kms_oplog_version.up.sql index ba0169f5e..c79b529f0 100644 --- a/internal/db/schema/migrations/oss/postgres/77/02_kms_oplog_version.up.sql +++ b/internal/db/schema/migrations/oss/postgres/77/02_kms_oplog_version.up.sql @@ -5,9 +5,9 @@ begin; create table kms_oplog_schema_version( - version text not null, - create_time kms_timestamp, - update_time kms_timestamp + version text not null, + create_time kms_timestamp, + update_time kms_timestamp ); comment on table kms_oplog_schema_version is 'kms_oplog_schema_version contains the kms schema version for oplog keys'; @@ -23,8 +23,8 @@ create trigger kms_default_create_time_column before insert on kms_oplog_schema_ for each row execute procedure kms_default_create_time(); create trigger kms_update_time_column before update on kms_oplog_schema_version - for each row execute procedure kms_update_time_column(); + for each row execute procedure kms_update_time_column(); insert into kms_oplog_schema_version(version) values('v0.0.1'); -commit; \ No newline at end of file +commit; 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 3f93e3f2b..a90aeb002 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 @@ -23,8 +23,8 @@ create table kms_oplog_root_key_version ( private_id kms_private_id primary key, root_key_id kms_private_id not null constraint kms_oplog_root_key_fkey - references kms_oplog_root_key(private_id) - on delete cascade + references kms_oplog_root_key(private_id) + on delete cascade on update cascade, version kms_version, key bytea not null @@ -38,7 +38,7 @@ create table kms_oplog_root_key_version ( ); comment on table kms_oplog_root_key_version is 'kms_oplog_root_key_version contains versions of a kms_oplog_root_key'; - + -- define the immutable fields for kms_root_key_version (all of them) create trigger kms_immutable_columns before update on kms_oplog_root_key_version for each row execute procedure kms_immutable_columns('private_id', 'root_key_id', 'create_time'); @@ -75,13 +75,13 @@ create table kms_oplog_data_key_version ( private_id kms_private_id primary key, data_key_id kms_private_id not null constraint kms_oplog_data_key_fkey - references kms_oplog_data_key(private_id) - on delete cascade - on update cascade, + references kms_oplog_data_key(private_id) + on delete cascade + on update cascade, root_key_version_id kms_private_id not null constraint kms_oplog_root_key_version_fkey - references kms_oplog_root_key_version(private_id) - on delete cascade + references kms_oplog_root_key_version(private_id) + on delete cascade on update cascade, version kms_version, key bytea not null @@ -105,7 +105,7 @@ create trigger kms_immutable_columns before update on kms_oplog_data_key_version -- to change) -- ############################################################################ --- Next: we will convert all the existing oplog DEK into the new schema model +-- Next: we will convert all the existing oplog DEK into the new schema model -- before adding triggers for create_time, and version -- this is important, especially for the version column! @@ -126,17 +126,17 @@ from kms_data_key where purpose = 'oplog'; insert into kms_oplog_data_key_version (private_id, data_key_id, root_key_version_id, version, key, create_time) select kdkv.private_id, kdkv.data_key_id, kdkv.root_key_version_id, kdkv.version, kdkv.key, kdkv.create_time from kms_data_key_version kdkv, kms_oplog_data_key kodk -where kdkv.data_key_id = kodk.private_id; +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 + 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; + references kms_oplog_data_key_version (private_id) + on delete restrict + on update cascade; create trigger kms_default_create_time_column before insert on kms_oplog_root_key for each row execute procedure kms_default_create_time(); @@ -154,6 +154,6 @@ create trigger default_create_time before insert on kms_oplog_data_key_version for each row execute procedure kms_default_create_time(); create trigger kms_version_column before insert on kms_oplog_data_key_version - for each row execute procedure kms_version_column('data_key_id'); + for each row execute procedure kms_version_column('data_key_id'); -commit; \ No newline at end of file +commit; diff --git a/internal/db/schema/migrations/oss/postgres/77/04_kms_oplog.up.sql b/internal/db/schema/migrations/oss/postgres/77/04_kms_oplog.up.sql index 719279707..53e218f73 100644 --- a/internal/db/schema/migrations/oss/postgres/77/04_kms_oplog.up.sql +++ b/internal/db/schema/migrations/oss/postgres/77/04_kms_oplog.up.sql @@ -3,12 +3,12 @@ begin; create table kms_oplog_collection_version ( - version kms_version, - create_time kms_timestamp not null default current_timestamp, - update_time kms_timestamp not null default current_timestamp + version kms_version, + create_time kms_timestamp not null default current_timestamp, + update_time kms_timestamp not null default current_timestamp ); comment on table kms_oplog_collection_version is - 'kms_oplog_collection_version is a single-row table which stores the current version of the kms collection'; + 'kms_oplog_collection_version is a single-row table which stores the current version of the kms collection'; -- ensure that it's only ever one row create unique index kms_oplog_collection_version_one_row @@ -18,11 +18,11 @@ create trigger kms_immutable_columns before update on kms_oplog_collection_versi for each row execute procedure kms_immutable_columns('create_time'); create trigger kms_update_time_column before update on kms_oplog_collection_version - for each row execute procedure kms_update_time_column(); + for each row execute procedure kms_update_time_column(); insert into kms_oplog_collection_version(version) values(1); update kms_oplog_schema_version set version = 'v0.0.2'; -commit; \ No newline at end of file +commit;