mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-06 08:27:22 +00:00
PIT: fix migration
This commit is contained in:
@@ -8,6 +8,7 @@ import { ChangeType } from "@app/services/folder-commit/folder-commit-service";
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
ProjectType,
|
ProjectType,
|
||||||
|
SecretType,
|
||||||
TableName,
|
TableName,
|
||||||
TFolderCheckpoints,
|
TFolderCheckpoints,
|
||||||
TFolderCommits,
|
TFolderCommits,
|
||||||
@@ -65,6 +66,7 @@ const sortFoldersByHierarchy = (folders: TSecretFolders[]) => {
|
|||||||
const getSecretsByFolderIds = async (knex: Knex, folderIds: string[]): Promise<Record<string, string[]>> => {
|
const getSecretsByFolderIds = async (knex: Knex, folderIds: string[]): Promise<Record<string, string[]>> => {
|
||||||
const secrets = await knex(TableName.SecretV2)
|
const secrets = await knex(TableName.SecretV2)
|
||||||
.whereIn(`${TableName.SecretV2}.folderId`, folderIds)
|
.whereIn(`${TableName.SecretV2}.folderId`, folderIds)
|
||||||
|
.where(`${TableName.SecretV2}.type`, SecretType.Shared)
|
||||||
.join<TableName.SecretVersionV2>(TableName.SecretVersionV2, (queryBuilder) => {
|
.join<TableName.SecretVersionV2>(TableName.SecretVersionV2, (queryBuilder) => {
|
||||||
void queryBuilder
|
void queryBuilder
|
||||||
.on(`${TableName.SecretVersionV2}.secretId`, `${TableName.SecretV2}.id`)
|
.on(`${TableName.SecretVersionV2}.secretId`, `${TableName.SecretV2}.id`)
|
||||||
@@ -88,6 +90,7 @@ const getSecretsByFolderIds = async (knex: Knex, folderIds: string[]): Promise<R
|
|||||||
const getFoldersByParentIds = async (knex: Knex, parentIds: string[]): Promise<Record<string, string[]>> => {
|
const getFoldersByParentIds = async (knex: Knex, parentIds: string[]): Promise<Record<string, string[]>> => {
|
||||||
const folders = await knex(TableName.SecretFolder)
|
const folders = await knex(TableName.SecretFolder)
|
||||||
.whereIn(`${TableName.SecretFolder}.parentId`, parentIds)
|
.whereIn(`${TableName.SecretFolder}.parentId`, parentIds)
|
||||||
|
.where(`${TableName.SecretFolder}.isReserved`, false)
|
||||||
.join<TableName.SecretFolderVersion>(TableName.SecretFolderVersion, (queryBuilder) => {
|
.join<TableName.SecretFolderVersion>(TableName.SecretFolderVersion, (queryBuilder) => {
|
||||||
void queryBuilder
|
void queryBuilder
|
||||||
.on(`${TableName.SecretFolderVersion}.folderId`, `${TableName.SecretFolder}.id`)
|
.on(`${TableName.SecretFolderVersion}.folderId`, `${TableName.SecretFolder}.id`)
|
||||||
|
|||||||
Reference in New Issue
Block a user