From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 16 Apr 2012 22:17:05 +0000 (+0200)
Subject: make it run with 64bit and 32bit osm2pgsql
X-Git-Tag: v2.0.0~77^2~2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ec9a4ac61bc3a10723abc901a9b8965c15218042?ds=inline

make it run with 64bit and 32bit osm2pgsql

Needs tweaking on the osm2pgsql side, too: the osmid column
needs to have the same format as in osm2pgsql. That means
that the changes are still not compatible with existing installations.
---

diff --git a/sql/tables.sql b/sql/tables.sql
index 385e1fc9..ff9c1c50 100644
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -191,18 +191,7 @@ drop table placex;
 CREATE TABLE placex (
   place_id BIGINT NOT NULL,
   partition integer,
-  osm_type char(1),
-  osm_id BIGINT,
-  class TEXT NOT NULL,
-  type TEXT NOT NULL,
-  name HSTORE,
-  admin_level INTEGER,
-  housenumber TEXT,
-  street TEXT,
-  isin TEXT,
-  postcode TEXT,
-  country_code varchar(2),
-  extratags HSTORE,
+  LIKE place INCLUDING CONSTRAINTS,
   parent_place_id BIGINT,
   linked_place_id BIGINT,
   rank_address INTEGER,
@@ -212,7 +201,6 @@ CREATE TABLE placex (
   indexed_date TIMESTAMP,
   geometry_sector INTEGER
   );
-SELECT AddGeometryColumn('placex', 'geometry', 4326, 'GEOMETRY', 2);
 SELECT AddGeometryColumn('placex', 'centroid', 4326, 'GEOMETRY', 2);
 CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id);
 CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id);