Simplify parsing of postgres and postgis versions

[nominatim.git] / sql / partition-tables.src.sql

diff --git a/sql/partition-tables.src.sql b/sql/partition-tables.src.sql
index d8f02e10825a0c851b80cbee6b100e333657b889..20dafcd754f3c54888bc58ee1445d507f0954715 100644 (file)
--- a/sql/partition-tables.src.sql
+++ b/sql/partition-tables.src.sql
@@ -38,10 +38,6 @@ CREATE TABLE search_name_blank (
 CREATE TABLE location_area_country () INHERITS (location_area_large) {ts:address-data};
 CREATE INDEX idx_location_area_country_geometry ON location_area_country USING GIST (geometry) {ts:address-index};
 
-CREATE TABLE search_name_country () INHERITS (search_name_blank) {ts:address-data};
-CREATE INDEX idx_search_name_country_place_id ON search_name_country USING BTREE (place_id) {ts:address-index};
-CREATE INDEX idx_search_name_country_name_vector ON search_name_country USING GIN (name_vector) WITH (fastupdate = off) {ts:address-index};
-
 -- start
 CREATE TABLE location_area_large_-partition- () INHERITS (location_area_large) {ts:address-data};
 CREATE INDEX idx_location_area_large_-partition-_place_id ON location_area_large_-partition- USING BTREE (place_id) {ts:address-index};
@@ -52,6 +48,7 @@ CREATE INDEX idx_search_name_-partition-_place_id ON search_name_-partition- USI
 CREATE INDEX idx_search_name_-partition-_centroid ON search_name_-partition- USING GIST (centroid) {ts:address-index};
 CREATE INDEX idx_search_name_-partition-_name_vector ON search_name_-partition- USING GIN (name_vector) WITH (fastupdate = off) {ts:address-index};
 
+DROP TABLE IF EXISTS location_road_-partition-;
 CREATE TABLE location_road_-partition- (
   place_id BIGINT,
   partition SMALLINT,