osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-26 06:22:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove SQL lambdas with IN expressions

Browse Source 
The values of IN expressions are incorrectly cached.
This commit is contained in:
Sarah Hoffmann 2023-08-02 12:34:07 +02:00
parent 2171b38551
commit 2c7e1db5f6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nominatim/api/search/db_searches.py
View File

@ -406,9 +406,9 @@ class CountrySearch(AbstractSearch):
t = conn.t.placex
ccodes = self.countries.values
sql: SaLambdaSelect = sa.lambda_stmt(lambda: _select_placex(t)\
sql = _select_placex(t)\
.where(t.c.country_code.in_(ccodes))\
.where(t.c.rank_address == 4))
.where(t.c.rank_address == 4)
if details.geometry_output:
sql = _add_geometry_columns(sql, t.c.geometry, details)
@ -495,12 +495,11 @@ class PostcodeSearch(AbstractSearch):
t = conn.t.postcode
pcs = self.postcodes.values
sql: SaLambdaSelect = sa.lambda_stmt(lambda:
sa.select(t.c.place_id, t.c.parent_place_id,
sql = sa.select(t.c.place_id, t.c.parent_place_id,
t.c.rank_search, t.c.rank_address,
t.c.postcode, t.c.country_code,
t.c.geometry.label('centroid'))
.where(t.c.postcode.in_(pcs)))
t.c.geometry.label('centroid'))\
.where(t.c.postcode.in_(pcs))
if details.geometry_output:
sql = _add_geometry_columns(sql, t.c.geometry, details)
@ -609,7 +608,7 @@ class PlaceSearch(AbstractSearch):
pcs = self.postcodes.values
if self.expected_count > 1000:
# Many results expected. Restrict by postcode.
sql = sql.where(lambda: sa.select(tpc.c.postcode)
sql = sql.where(sa.select(tpc.c.postcode)
.where(tpc.c.postcode.in_(pcs))
.where(tsearch.c.centroid.ST_DWithin(tpc.c.geometry, 0.12))
.exists())