hcengineering/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2024-12-22 11:01:54 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Qfix: empty where clause (#6793)

Browse Source 
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
This commit is contained in:
Alexey Zinoviev 2024-10-03 13:33:41 +04:00 committed by GitHub
parent 09e3e21068
commit 7441fa146d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dev/tool/src/db.ts
View File

@ -140,6 +140,7 @@ export async function moveAccountDbFromMongoToPG (
mongoDb: AccountDB,
pgDb: AccountDB
): Promise<void> {
// [accountId, workspaceId]
const workspaceAssignments: [ObjectId, ObjectId][] = []
const accounts = await listAccounts(mongoDb)
const workspaces = await listWorkspacesPure(mongoDb)
@ -153,14 +154,18 @@ export async function moveAccountDbFromMongoToPG (
delete (pgAccount as any).workspaces
const exists = await getAccount(pgDb, pgAccount.email)
if (exists === null) {
await pgDb.account.insertOne(pgAccount)
ctx.info('Moved account', { email: pgAccount.email })
if (pgAccount.createdOn === undefined) {
pgAccount.createdOn = Date.now()
}
for (const workspace of mongoAccount.workspaces) {
workspaceAssignments.push([pgAccount._id, workspace.toString()])
}
const exists = await getAccount(pgDb, pgAccount.email)
if (exists === null) {
await pgDb.account.insertOne(pgAccount)
ctx.info('Moved account', { email: pgAccount.email })
}
}
@ -202,9 +207,19 @@ export async function moveAccountDbFromMongoToPG (
}
}
if (workspaceAssignments.length > 0) {
for (const [accountId, workspaceId] of workspaceAssignments) {
const pgAssignments = (await listAccounts(pgDb)).reduce<Record<ObjectId, ObjectId[]>>((assignments, acc) => {
assignments[acc._id] = acc.workspaces
return assignments
}, {})
const assignmentsToInsert = workspaceAssignments.filter(
([accountId, workspaceId]) =>
pgAssignments[accountId] === undefined || !pgAssignments[accountId].includes(workspaceId)
)
for (const [accountId, workspaceId] of assignmentsToInsert) {
await pgDb.assignWorkspace(accountId, workspaceId)
}
}
ctx.info('Assignments made', { count: assignmentsToInsert.length })
}

10
server/account/src/collections/postgres.ts
View File

@ -59,6 +59,10 @@ export abstract class PostgresDbCollection<T extends Record<string, any>> implem
}
protected buildWhereClause (query: Query<T>, lastRefIdx: number = 0): [string, any[]] {
if (Object.keys(query).length === 0) {
return ['', []]
}
const whereChunks: string[] = []
const values: any[] = []
let currIdx: number = lastRefIdx
@ -131,7 +135,9 @@ export abstract class PostgresDbCollection<T extends Record<string, any>> implem
const sqlChunks: string[] = [this.buildSelectClause()]
const [whereClause, whereValues] = this.buildWhereClause(query)
if (whereClause !== '') {
sqlChunks.push(whereClause)
}
if (sort !== undefined) {
sqlChunks.push(this.buildSortClause(sort))
@ -200,7 +206,9 @@ export abstract class PostgresDbCollection<T extends Record<string, any>> implem
const [whereClause, whereValues] = this.buildWhereClause(query, updateValues.length)
sqlChunks.push(updateClause)
if (whereClause !== '') {
sqlChunks.push(whereClause)
}
const finalSql = sqlChunks.join(' ')
await this.client.query(finalSql, [...updateValues, ...whereValues])
@ -210,7 +218,9 @@ export abstract class PostgresDbCollection<T extends Record<string, any>> implem
const sqlChunks: string[] = [`DELETE FROM ${this.name}`]
const [whereClause, whereValues] = this.buildWhereClause(query)
if (whereClause !== '') {
sqlChunks.push(whereClause)
}
const finalSql = sqlChunks.join(' ')
await this.client.query(finalSql, whereValues)