Merge pull request #1202 from NASA-AMMOS/refactor/simplify-extension-…

…roles Simplify extension_roles
NASA-AMMOS · Oct 16, 2023 · 82e0e8f · 82e0e8f
2 parents 7264991 + 5864853
commit 82e0e8f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/deployment/hasura/metadata/databases/AerieUI/tables/public_extension_roles.yaml b/deployment/hasura/metadata/databases/AerieUI/tables/public_extension_roles.yaml
@@ -29,7 +29,7 @@ insert_permissions:
 update_permissions:
   - role: aerie_admin
     permission:
-      columns: [extension_id, role]
+      columns: [role]
       filter: {}
 delete_permissions:
   - role: aerie_admin

diff --git a/deployment/hasura/migrations/AerieUI/2_extensions/up.sql b/deployment/hasura/migrations/AerieUI/2_extensions/up.sql
@@ -35,16 +35,11 @@ create trigger extensions_set_timestamp
 execute function extensions_set_updated_at();
 
 create table extension_roles (
-  id integer generated always as identity,
-  extension_id  integer not null,
+  extension_id integer not null references extensions(id)
+    on update cascade
+    on delete cascade,
   role text not null,
-
-  constraint extension_roles_primary_key primary key (id),
-  constraint extension_roles_to_extension
-    foreign key (extension_id)
-      references "extensions"
-      on update cascade
-      on delete cascade
+  primary key(extension_id, role)
 );
 
 comment on table extension_roles is e''

diff --git a/deployment/postgres-init-db/sql/ui/tables/extension_roles.sql b/deployment/postgres-init-db/sql/ui/tables/extension_roles.sql
@@ -1,14 +1,9 @@
 create table extension_roles (
-  id integer generated always as identity,
-  extension_id  integer not null,
+  extension_id  integer not null references extensions(id)
+    on update cascade
+    on delete cascade,
   role text not null,
-
-  constraint extension_roles_primary_key primary key (id),
-  constraint extension_roles_to_extension
-    foreign key (extension_id)
-      references "extensions"
-      on update cascade
-      on delete cascade
+  primary key (extension_id, role)
 );
 
 comment on table extension_roles is e''