cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Control file for version 0.15 and empty upgrade/downgrade

Browse Source
This commit is contained in:
Mario de Frutos
2016-08-26 16:39:54 +02:00
parent 71d5ce951a
commit 06462fdf7a
8 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/extension/sql/50_namedplaces.sql
View File

@@ -93,10 +93,10 @@ RETURNS Geometry AS $$
try:
if admin1_name and country_name:
plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_geocode_namedplace_point(trim($1), trim($2), trim($3)) AS mypoint", ["text", "text", "text"])
rv = plpy.execute(plan, [city_name, plpy.quote_nullable(admin1_name), plpy.quote_nullable(country_name)], 1)
rv = plpy.execute(plan, [city_name, admin1_name, country_name], 1)
elif country_name:
plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_geocode_namedplace_point(trim($1), trim($2)) AS mypoint", ["text", "text"])
rv = plpy.execute(plan, [city_name, plpy.quote_nullable(country_name)], 1)
rv = plpy.execute(plan, [city_name, country_name], 1)
else:
plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_geocode_namedplace_point(trim($1)) AS mypoint", ["text"])
rv = plpy.execute(plan, [city_name], 1)