awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-14 19:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: resolved upstream rebase conflict

Browse Source
This commit is contained in:
Akhil Mohan
2024-03-28 19:55:12 +05:30
parent e850b82fb3
commit f551a4158d
6 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/db/migrations/20240313185040_project-user-additional-privilege.ts → backend/src/db/migrations/20240326172010_project-user-additional-privilege.ts
-2
View File
@@ -7,9 +7,7 @@ export async function up(knex: Knex): Promise<void> {
if (!(await knex.schema.hasTable(TableName.ProjectUserAdditionalPrivilege))) {
await knex.schema.createTable(TableName.ProjectUserAdditionalPrivilege, (t) => {
t.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
t.string("name").notNullable();
t.string("slug", 60).notNullable();
t.string("description");
t.uuid("projectMembershipId").notNullable();
t.foreign("projectMembershipId").references("id").inTable(TableName.ProjectMembership).onDelete("CASCADE");
t.boolean("isTemporary").notNullable().defaultTo(false);
backend/src/db/migrations/20240315102813_machine-identity-additional-privilege.ts → backend/src/db/migrations/20240326172011_machine-identity-additional-privilege.ts
-2
View File
@@ -7,9 +7,7 @@ export async function up(knex: Knex): Promise<void> {
if (!(await knex.schema.hasTable(TableName.IdentityProjectAdditionalPrivilege))) {
await knex.schema.createTable(TableName.IdentityProjectAdditionalPrivilege, (t) => {
t.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
t.string("name").notNullable();
t.string("slug", 60).notNullable();
t.string("description");
t.uuid("projectMembershipId").notNullable();
t.foreign("projectMembershipId")
.references("id")