mirror/Compass
1
0
Fork 0
mirror of https://github.com/CompassConnections/Compass.git synced 2026-04-04 06:51:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix query collision on i variable

Browse Source
This commit is contained in:
MartinBraquet
2025-12-09 19:08:16 +01:00
parent 787d35e057
commit 57beefb894
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/api/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@compass/api",
"description": "Backend API endpoints",
"version": "1.0.10",
"version": "1.0.11",
"private": true,
"scripts": {
"watch:serve": "tsx watch src/serve.ts",

18
backend/api/src/get-profiles.ts
View File

@@ -111,7 +111,7 @@ export const loadProfiles = async (props: profileQueryType) => {
FROM profile_${label}
JOIN ${label} ON ${label}.id = profile_${label}.option_id
GROUP BY profile_${label}.profile_id
) i ON i.profile_id = profiles.id`
) profile_${label} ON profile_${label}.profile_id = profiles.id`
}
const interestsJoin = getManyToManyJoin('interests')
const causesJoin = getManyToManyJoin('causes')
@@ -143,10 +143,10 @@ export const loadProfiles = async (props: profileQueryType) => {
function getManyToManyClause(label: OptionTableKey) {
return `EXISTS (
SELECT 1 FROM profile_${label} pi2
JOIN ${label} ii2 ON ii2.id = pi2.option_id
WHERE pi2.profile_id = profiles.id
AND ii2.name = ANY (ARRAY[$(values)])
SELECT 1 FROM profile_${label}
JOIN ${label} ON ${label}.id = profile_${label}.option_id
WHERE profile_${label}.profile_id = profiles.id
AND ${label}.name = ANY (ARRAY[$(values)])
)`
}
@@ -278,9 +278,9 @@ export const loadProfiles = async (props: profileQueryType) => {
} else if (orderByParam === 'last_online_time') {
selectCols += ', user_activity.last_online_time'
}
if (interests) selectCols += `, COALESCE(i.interests, '{}') AS interests`
if (causes) selectCols += `, COALESCE(i.causes, '{}') AS causes`
if (work) selectCols += `, COALESCE(i.work, '{}') AS work`
if (interests) selectCols += `, COALESCE(profile_interests.interests, '{}') AS interests`
if (causes) selectCols += `, COALESCE(profile_causes.causes, '{}') AS causes`
if (work) selectCols += `, COALESCE(profile_work.work, '{}') AS work`
const query = renderSql(
select(selectCols),
@@ -291,7 +291,7 @@ export const loadProfiles = async (props: profileQueryType) => {
limitParam && limit(limitParam),
)
console.debug('query:', query)
// console.debug('query:', query)
const profiles = await pg.map(query, [], convertRow)