fix2
This commit is contained in:
parent
01a74e5c5e
commit
c9ca11d412
|
@ -128,15 +128,15 @@ export class User {
|
||||||
AND NOT EXISTS(SELECT sender, recipient FROM read_profiles WHERE sender = $2 AND recipient = room_id)
|
AND NOT EXISTS(SELECT sender, recipient FROM read_profiles WHERE sender = $2 AND recipient = room_id)
|
||||||
AND ${myinterest !== 'b' ? "sex = $3" : "$3 = $3 AND $4 = $4 AND $5 = $5 AND $6 = $6 AND $7 = $7"}
|
AND ${myinterest !== 'b' ? "sex = $3" : "$3 = $3 AND $4 = $4 AND $5 = $5 AND $6 = $6 AND $7 = $7"}
|
||||||
AND ${myrange !== 0 ?
|
AND ${myrange !== 0 ?
|
||||||
`location = ANY(ARRAY(SELECT ID
|
`(location = ANY(ARRAY(SELECT ID
|
||||||
FROM cities
|
FROM cities
|
||||||
WHERE
|
WHERE
|
||||||
check_distance($6::double precision, $7::double precision, lat, lng, $5::double precision)
|
check_distance($6::double precision, $7::double precision, lat, lng, $5::double precision)
|
||||||
AND (check_distance($6::double precision, $7::double precision, lat, lng, range) OR range = 0)
|
AND (check_distance($6::double precision, $7::double precision, lat, lng, range) OR range = 0)
|
||||||
))`
|
)))`
|
||||||
:
|
:
|
||||||
`range = 0 OR
|
`(range = 0 OR
|
||||||
check_distance($6::double precision, $7::double precision, (SELECT lat FROM cities WHERE ID = location), (SELECT lng FROM cities WHERE ID = location), range)`
|
check_distance($6::double precision, $7::double precision, (SELECT lat FROM cities WHERE ID = location), (SELECT lng FROM cities WHERE ID = location), range))`
|
||||||
}
|
}
|
||||||
AND (interest = $4 OR interest = 'b')
|
AND (interest = $4 OR interest = 'b')
|
||||||
ORDER BY RANDOM()
|
ORDER BY RANDOM()
|
||||||
|
|
Loading…
Reference in New Issue