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

diff --git a/db/structure.sql b/db/structure.sql
index f74d4d571e2f58c8d3ef65009af3345d6128ea7b..c30378c37e3bf86fc205cb09ed46a5209218ecf3 100644 (file)
--- 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 24b8f64e8f309c5a9b5496e3303fac066231a4f9..18ba81431c0a310eba5c96d15c8da2ec88aa560e 100644 (file)
--- 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 /