Skip to content

Commit 6a6f91e

Browse files
authored
Merge pull request #1872 from joto/refactor-get-node
Slightly better implementation to get node from database
2 parents ade848d + e3228cd commit 6a6f91e

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/middle-pgsql.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,7 @@ std::size_t middle_query_pgsql_t::get_way_node_locations_flatnodes(
362362

363363
osmium::Location middle_query_pgsql_t::get_node_location_db(osmid_t id) const
364364
{
365-
auto const res =
366-
m_sql_conn.exec_prepared("get_node_list", "{{{}}}"_format(id));
365+
auto const res = m_sql_conn.exec_prepared("get_node", id);
367366
if (res.num_tuples() == 0) {
368367
return osmium::Location{};
369368
}
@@ -724,7 +723,10 @@ static table_sql sql_for_nodes(bool create_table) noexcept
724723
sql.prepare_query =
725724
"PREPARE get_node_list(int8[]) AS"
726725
" SELECT id, lon, lat FROM {schema}\"{prefix}_nodes\""
727-
" WHERE id = ANY($1::int8[]);\n";
726+
" WHERE id = ANY($1::int8[]);\n"
727+
"PREPARE get_node(int8) AS"
728+
" SELECT id, lon, lat FROM {schema}\"{prefix}_nodes\""
729+
" WHERE id = $1;\n";
728730
}
729731

730732
return sql;

0 commit comments

Comments
 (0)