From bf9cf9d3b486c898f37fb38c6606bfc33019f9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Mon, 25 Dec 2023 13:16:59 +0000 Subject: [PATCH] Update schema_generate.sh --- tools/database/schema.sql | 4 ++-- tools/database/schema_generate.sh | 12 ++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tools/database/schema.sql b/tools/database/schema.sql index fbb4251a..70c93c21 100644 --- a/tools/database/schema.sql +++ b/tools/database/schema.sql @@ -36,8 +36,8 @@ $function$; -- PostgreSQL database dump -- --- Dumped from database version 11.8 --- Dumped by pg_dump version 11.7 (Debian 11.7-0+deb10u1) +-- Dumped from database version 13.13 (Debian 13.13-0+deb11u1) +-- Dumped by pg_dump version 13.13 (Debian 13.13-0+deb11u1) SET statement_timeout = 0; SET lock_timeout = 0; diff --git a/tools/database/schema_generate.sh b/tools/database/schema_generate.sh index f9dbc7f9..63447203 100755 --- a/tools/database/schema_generate.sh +++ b/tools/database/schema_generate.sh @@ -17,17 +17,9 @@ WHERE -- Before Postgres 11: -- NOT p.proisagg AND - d.objid IS NULL + (d.objid IS NULL OR proname = 'marker_elem_ids') ORDER BY - CASE p.proname - WHEN 'lon2tile' THEN '1' - WHEN 'lat2tile' THEN '2' - WHEN 'z_order_curve' THEN '3' - WHEN 'lonlat2z_order_curve' THEN '4' - WHEN 'zoc18min' THEN '5' - WHEN 'zoc18max' THEN '6' - ELSE p.proname - END + p.proname " > schema.sql pg_dump --no-tablespaces -s -O -x -t "backends|markers|categories|markers_counts|class|items|sources|sources_password|stats|markers_status|updates|updates_last" -h "$DB_HOST" -U osmose osmose_frontend >> schema.sql