From 03191b4af116206014a5cb62a1eaeee751afe8c1 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Fri, 16 Aug 2024 17:07:21 +0200 Subject: [PATCH] Remove forgotten code still supporting old middle format It seems removing thise code was forgotten in 515dfb25e900fa781f97145246fb280e0d93f187 --- src/middle-pgsql.cpp | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp index 83e229cd9..99b81a8c3 100644 --- a/src/middle-pgsql.cpp +++ b/src/middle-pgsql.cpp @@ -703,22 +703,12 @@ INSERT INTO osm2pgsql_changed_ways )"); } - if (m_options->middle_database_format == 1) { - queries.emplace_back(R"( -INSERT INTO osm2pgsql_changed_relations - SELECT r.id - FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_nodes n - WHERE r.parts && ARRAY[n.id] - AND r.parts[1:way_off] && ARRAY[n.id] - )"); - } else { - queries.emplace_back(R"( + queries.emplace_back(R"( INSERT INTO osm2pgsql_changed_relations SELECT r.id FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_nodes c WHERE {schema}"{prefix}_member_ids"(r.members, 'N'::char) && ARRAY[c.id]; - )"); - } + )"); for (auto const &query : queries) { m_db_connection.exec(build_sql(*m_options, query)); @@ -755,22 +745,12 @@ void middle_pgsql_t::get_way_parents(idlist_t const &changed_ways, m_db_connection.exec("ANALYZE osm2pgsql_changed_ways"); - if (m_options->middle_database_format == 1) { - m_db_connection.exec(build_sql(*m_options, R"( -INSERT INTO osm2pgsql_changed_relations - SELECT DISTINCT r.id - FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_ways w - WHERE r.parts && ARRAY[w.id] - AND r.parts[way_off+1:rel_off] && ARRAY[w.id] - )")); - } else { - m_db_connection.exec(build_sql(*m_options, R"( + m_db_connection.exec(build_sql(*m_options, R"( INSERT INTO osm2pgsql_changed_relations SELECT DISTINCT r.id FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_ways c WHERE {schema}"{prefix}_member_ids"(r.members, 'W'::char) && ARRAY[c.id]; - )")); - } + )")); load_id_list(m_db_connection, "osm2pgsql_changed_relations", parent_relations);