From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Dec 2023 17:53:15 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4390'
X-Git-Tag: live~1397
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3c3a499e93a3b26d5affc9fe9ebc78d35c5571e0?hp=ddf6689e9e37b65cdc5739ebd3caf8c5a1fc30f5

Merge remote-tracking branch 'upstream/pull/4390'
---

diff --git a/db/structure.sql b/db/structure.sql
index f74d4d571..c30378c37 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -16,6 +16,13 @@ SET row_security = off;
 CREATE EXTENSION IF NOT EXISTS btree_gist WITH SCHEMA public;
 
 
+--
+-- Name: EXTENSION btree_gist; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION btree_gist IS 'support for indexing common datatypes in GiST';
+
+
 --
 -- Name: format_enum; Type: TYPE; Schema: public; Owner: -
 --
diff --git a/script/normalise-structure b/script/normalise-structure
index 24b8f64e8..18ba81431 100644
--- a/script/normalise-structure
+++ b/script/normalise-structure
@@ -1,13 +1,5 @@
 /^$/d
 /^--/d
-/^CREATE EXTENSION IF NOT EXISTS plpgsql /d
-/^COMMENT ON EXTENSION plpgsql /d
-/^COMMENT ON EXTENSION btree_gist /d
 /^SET default_with_oids /d
 /^SET default_table_access_method /d
 /^SET idle_in_transaction_session_timeout /d
-/^    AS integer$/d
-
-s/ IMMUTABLE / /
-
-s/ timestamp(6) / timestamp /