From f312a4cd74e6fb5701136b5ef3d6c44faa53ce2a Mon Sep 17 00:00:00 2001
From: Changaco <changaco@changaco.oy.lc>
Date: Wed, 25 Oct 2023 16:31:37 +0200
Subject: [PATCH] merge branch.sql

---
 sql/branch.sql     | 2 --
 sql/migrations.sql | 4 ++++
 sql/schema.sql     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 sql/branch.sql

diff --git a/sql/branch.sql b/sql/branch.sql
deleted file mode 100644
index ce60dbb7d..000000000
--- a/sql/branch.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE app_conf SET value = '"https://api.openstreetmap.org/api/0.6"'::jsonb WHERE key = 'openstreetmap_api_url';
-UPDATE app_conf SET value = '"https://www.openstreetmap.org"'::jsonb WHERE key = 'openstreetmap_auth_url';
diff --git a/sql/migrations.sql b/sql/migrations.sql
index b78b5274a..74e74d010 100644
--- a/sql/migrations.sql
+++ b/sql/migrations.sql
@@ -3423,3 +3423,7 @@ DELETE FROM rate_limiting WHERE key LIKE 'refetch_%';
 
 -- migration #170
 CREATE TYPE localized_string AS (string text, lang text);
+
+-- migration #171
+UPDATE app_conf SET value = '"https://api.openstreetmap.org/api/0.6"'::jsonb WHERE key = 'openstreetmap_api_url';
+UPDATE app_conf SET value = '"https://www.openstreetmap.org"'::jsonb WHERE key = 'openstreetmap_auth_url';
diff --git a/sql/schema.sql b/sql/schema.sql
index 513325e11..f26d2257a 100644
--- a/sql/schema.sql
+++ b/sql/schema.sql
@@ -14,7 +14,7 @@ COMMENT ON EXTENSION pg_stat_statements IS 'track execution statistics of all SQ
 
 -- database metadata
 CREATE TABLE db_meta (key text PRIMARY KEY, value jsonb);
-INSERT INTO db_meta (key, value) VALUES ('schema_version', '170'::jsonb);
+INSERT INTO db_meta (key, value) VALUES ('schema_version', '171'::jsonb);
 
 
 -- app configuration