Revert "PostgreSQL last version doesn't accept to use public schema"

This reverts commit b022fb6.
MapServer · Jun 30, 2023 · e9e02f8 · e9e02f8
1 parent cac198a
commit e9e02f8
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 50 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,6 @@ OSM_NAME_COLUMN?=name
 OSM_SRID?=3857
 OSM_UNITS?=meters
 OSM_DB_CONNECTION?=host=localhost dbname=osm user=osm password=osm port=5432
-OSM_SCHEMA?=public
 OSM_EXTENT?=-20000000 -20000000 20000000 20000000
 OSM_FORCE_POSTGIS_EXTENT?=0
 OSM_WMS_SRS?=EPSG:900913 EPSG:4326 EPSG:3857 EPSG:2154 EPSG:310642901 EPSG:4171 EPSG:310024802 EPSG:310915814 EPSG:310486805 EPSG:310702807 EPSG:310700806 EPSG:310547809 EPSG:310706808 EPSG:310642810 EPSG:310642801 EPSG:310642812 EPSG:310032811 EPSG:310642813 EPSG:2986 EPSG:3035
@@ -112,7 +111,6 @@ $(mapfile):$(template) $(includes)
 	$(SED) 's/##.*$$//g' $(mapfile)
 	$(SED) '/^ *$$/d' $(mapfile)
 	$(SED) -e 's/OSM_PREFIX_/$(OSM_PREFIX)/g' $(mapfile)
-	$(SED) -e 's/OSM_SCHEMA/$(OSM_SCHEMA)/g' $(mapfile)
 	$(SED) -e 's/OSM_SRID/$(OSM_SRID)/g' $(mapfile)
 	$(SED) -e 's/OSM_UNITS/$(OSM_UNITS)/g' $(mapfile)
 	$(SED) -e 's/OSM_EXTENT/$(OSM_EXTENT)/g' $(mapfile)

diff --git a/buildings.map b/buildings.map
@@ -12,7 +12,7 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
-    DATA "geometry from (select geometry,osm_id, OSM_NAME_COLUMN as name from OSM_SCHEMA.OSM_PREFIX_buildings) as foo using unique osm_id using srid=OSM_SRID"
+    DATA "geometry from (select geometry,osm_id, OSM_NAME_COLUMN as name from OSM_PREFIX_buildings) as foo using unique osm_id using srid=OSM_SRID"
     LABELITEM "name"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"

diff --git a/docker.mk b/docker.mk
@@ -1,5 +1,4 @@
 OSM_DB_CONNECTION=host=postgis dbname=osm user=osm password=osm port=5432
-OSM_SCHEMA=prod
 OSM_PREFIX=osm_
 OSM_FORCE_POSTGIS_EXTENT=1
 OSM_WMS_SRS=EPSG:900913 EPSG:4326 EPSG:3857 EPSG:28992

diff --git a/docker/imposm/import.sh b/docker/imposm/import.sh
@@ -35,4 +35,4 @@ for url in $PBF_FILES; do
 done
 
 imposm import $OPTIONS -write
-imposm import $OPTIONS --dbschema-production=prod -deployproduction
+imposm import $OPTIONS -deployproduction
diff --git a/generate_style.py b/generate_style.py
diff --git a/highways.map b/highways.map
@@ -930,7 +930,7 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
-    DATA "geometry from (select geometry, osm_id, type from OSM_SCHEMA.OSM_PREFIX_aeroways) as foo using unique osm_id using srid=OSM_SRID"
+    DATA "geometry from (select geometry, osm_id, type from OSM_PREFIX_aeroways) as foo using unique osm_id using srid=OSM_SRID"
     CLASSITEM "type"
     CLASS
       EXPRESSION "runway"

diff --git a/landusage.map b/landusage.map
@@ -257,7 +257,7 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
-   DATA "geometry from OSM_SCHEMA.OSM_PREFIX_transport_areas using unique osm_id using srid=OSM_SRID"
+   DATA "geometry from OSM_PREFIX_transport_areas using unique osm_id using srid=OSM_SRID"
    PROCESSING "CLOSE_CONNECTION=DEFER"
    MAXSCALEDENOM _maxscale
    MINSCALEDENOM _minscale