diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0946c32..39569f2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        pg: [17, 16, 15, 14, 13, 12, 11, 10, 9.6, 9.5, 9.4, 9.3, 9.2]
+        pg: [18, 17, 16, 15, 14, 13, 12, 11, 10, 9.6, 9.5, 9.4, 9.3, 9.2]
     name: 🐘 PostgreSQL ${{ matrix.pg }}
     runs-on: ubuntu-latest
     container: pgxn/pgxn-tools
@@ -13,5 +13,7 @@ jobs:
         run: pg-start ${{ matrix.pg }}
       - name: Check out the repo
         uses: actions/checkout@v4
+      - name: Install rsync
+        run: apt-get install -y rsync
       - name: Test on PostgreSQL ${{ matrix.pg }}
-        run: pg-build-test
+        run: make test PGUSER=postgres
diff --git a/.gitignore b/.gitignore
index 2c07299..6fc6141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ test/install/schedule
 # Misc
 tmp/
 .DS_Store
+.claude/worktrees/
 
 # pg_tle generated files
 /pg_tle/
diff --git a/CLAUDE.md b/CLAUDE.md
index 6ede600..b809770 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -5,3 +5,17 @@
 **Never delete a branch without explicit user approval.** This includes `git push origin --delete`, `git branch -d`, and `git branch -D`. Always ask first.
 
 **Always open PRs against the main repo** (`Postgres-Extensions/cat_tools`), not a fork.
+
+## Code Style
+
+### Comments
+Always use block comment format for multi-line comments in SQL files:
+
+```sql
+/*
+ * First line of comment.
+ * Second line of comment.
+ */
+```
+
+Never use `--` line comments for multi-line explanations.
diff --git a/META.in.json b/META.in.json
index cb35668..6f07609 100644
--- a/META.in.json
+++ b/META.in.json
@@ -14,7 +14,7 @@
     "name": "cat_tools",
 
     "X_comment": "REQUIRED. Version of the distribution. http://pgxn.org/spec/#version",
-    "version": "0.2.1",
+    "version": "0.2.2",
 
     "X_comment": "REQUIRED. Short description of distribution.",
     "abstract": "Tools for interfacing with the Postgres catalog",
@@ -37,7 +37,7 @@
             "file": "sql/cat_tools.sql",
 
             "X_comment": "REQUIRED. Version the extension is at.",
-            "version": "0.2.1",
+            "version": "0.2.2",
 
             "X_comment": "Optional: \"abstract\": Description of the extension.",
             "abstract": "Tools for interfacing with the catalog",
diff --git a/META.json b/META.json
index ad50c0f..2bd6367 100644
--- a/META.json
+++ b/META.json
@@ -14,7 +14,7 @@
     "name": "cat_tools",
 
     "X_comment": "REQUIRED. Version of the distribution. http://pgxn.org/spec/#version",
-    "version": "0.2.1",
+    "version": "0.2.2",
 
     "X_comment": "REQUIRED. Short description of distribution.",
     "abstract": "Tools for interfacing with the Postgres catalog",
@@ -37,7 +37,7 @@
             "file": "sql/cat_tools.sql",
 
             "X_comment": "REQUIRED. Version the extension is at.",
-            "version": "0.2.1",
+            "version": "0.2.2",
 
             "X_comment": "Optional: \"abstract\": Description of the extension.",
             "abstract": "Tools for interfacing with the catalog",
diff --git a/Makefile b/Makefile
index 6fe257a..33d24d2 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,8 @@ include pgxntool/base.mk
 
 LT95		 = $(call test, $(MAJORVER), -lt, 95)
 LT93		 = $(call test, $(MAJORVER), -lt, 93)
+LT12		 = $(call test, $(MAJORVER), -lt, 120)
+LT11		 = $(call test, $(MAJORVER), -lt, 110)
 
 $B:
 	@mkdir -p $@
@@ -44,6 +46,16 @@ ifeq ($(LT93),yes)
 	pgxntool/safesed $@.tmp -E -e 's/(.*)-- SED: REQUIRES 9.3!/-- Requires 9.3: \1/'
 else
 	pgxntool/safesed $@.tmp -E -e 's/(.*)-- SED: PRIOR TO 9.3!/-- Not used prior to 9.3: \1/'
+endif
+ifeq ($(LT12),yes)
+	pgxntool/safesed $@.tmp -E -e 's/(.*)-- SED: REQUIRES 12!/-- Requires 12: \1/'
+else
+	pgxntool/safesed $@.tmp -E -e 's/(.*)-- SED: PRIOR TO 12!/-- Not used prior to 12: \1/'
+endif
+ifeq ($(LT11),yes)
+	pgxntool/safesed $@.tmp -E -e 's/(.*)-- SED: REQUIRES 11!/-- Requires 11: \1/'
+else
+	pgxntool/safesed $@.tmp -E -e 's/(.*)-- SED: PRIOR TO 11!/-- Not used prior to 11: \1/'
 endif
 	mv $@.tmp $@
 
diff --git a/cat_tools.control b/cat_tools.control
index 5248506..6a6297a 100644
--- a/cat_tools.control
+++ b/cat_tools.control
@@ -1,4 +1,4 @@
 comment = 'Tools for intorfacing with the catalog'
-default_version = '0.2.1'
+default_version = '0.2.2'
 relocatable = false
 schema = 'cat_tools'
diff --git a/control.mk b/control.mk
new file mode 100644
index 0000000..7882eb8
--- /dev/null
+++ b/control.mk
@@ -0,0 +1,5 @@
+EXTENSION_cat_tools_VERSION := 0.2.2
+$(EXTENSION_cat_tools_VERSION_FILE): sql/cat_tools.sql cat_tools.control
+	@echo '/* DO NOT EDIT - AUTO-GENERATED FILE */' > $(EXTENSION_cat_tools_VERSION_FILE)
+	@cat sql/cat_tools.sql >> $(EXTENSION_cat_tools_VERSION_FILE)
+
diff --git a/sql/.gitignore b/sql/.gitignore
index 55e43ad..1ffbd4b 100644
--- a/sql/.gitignore
+++ b/sql/.gitignore
@@ -1,6 +1,10 @@
+# cat_tools.sql is generated from cat_tools.sql.in by `make` and should not be committed.
+# Version-specific install/upgrade scripts (cat_tools--X.Y.Z.sql, cat_tools--X--Y.sql)
+# ARE committed and tracked in git — see the parent .gitignore for details.
 cat_tools.sql
 # The following are generated by make from their .sql.in counterparts.
 # Versions 0.1.0-0.1.5 have no .sql.in (pre-dates the conditional SED system
 # or only pre-built SQL was published to PGXN), so they are committed as-is.
 cat_tools--0.2.0.sql
 cat_tools--0.2.1.sql
+cat_tools--0.2.1--0.2.2.sql
diff --git a/sql/cat_tools--0.2.1--0.2.2.sql.in b/sql/cat_tools--0.2.1--0.2.2.sql.in
new file mode 100644
index 0000000..c11d4b4
--- /dev/null
+++ b/sql/cat_tools--0.2.1--0.2.2.sql.in
@@ -0,0 +1,150 @@
+CREATE SCHEMA __cat_tools;
+
+CREATE FUNCTION __cat_tools.exec(
+  sql text
+) RETURNS void LANGUAGE plpgsql AS $body$
+BEGIN
+  RAISE DEBUG 'sql = %', sql;
+  EXECUTE sql;
+END
+$body$;
+
+CREATE FUNCTION __cat_tools.omit_column(
+  rel text
+  , omit name[] DEFAULT array['oid']
+) RETURNS text LANGUAGE sql IMMUTABLE AS $body$
+SELECT array_to_string(array(
+    SELECT attname
+      FROM pg_attribute a
+      WHERE attrelid = rel::regclass
+        AND NOT attisdropped
+        AND attnum >= 0
+        AND attname != ANY( omit )
+      ORDER BY attnum
+    )
+  , ', '
+)
+$body$;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA cat_tools GRANT USAGE ON TYPES TO cat_tools__usage;
+
+/*
+ * Recreate _cat_tools.pg_class_v with dynamic column list to handle PG12+ oid visibility.
+ * On PG < 12, oid was already hidden so the effective column list is unchanged;
+ * CREATE OR REPLACE VIEW works without disturbing dependent views.
+ */
+SELECT __cat_tools.exec(format($fmt$
+CREATE OR REPLACE VIEW _cat_tools.pg_class_v AS
+  SELECT c.oid AS reloid
+      , %s
+      , n.nspname AS relschema
+    FROM pg_class c
+      LEFT JOIN pg_namespace n ON( n.oid = c.relnamespace )
+;
+$fmt$
+  , __cat_tools.omit_column('pg_catalog.pg_class')
+));
+REVOKE ALL ON _cat_tools.pg_class_v FROM public;
+
+CREATE OR REPLACE VIEW cat_tools.pg_class_v AS
+  SELECT *
+    FROM _cat_tools.pg_class_v
+    WHERE NOT pg_is_other_temp_schema(relnamespace)
+      AND relkind IN( 'r', 'v', 'f' )
+;
+GRANT SELECT ON cat_tools.pg_class_v TO cat_tools__usage;
+
+/*
+ * Recreate _cat_tools.pg_attribute_v to handle PG11+ attmissingval.
+ * attmissingval is appended at the end so CREATE OR REPLACE VIEW can add it
+ * without invalidating dependent views — no DROP CASCADE needed.
+ * On PG < 11 (where attmissingval doesn't exist) it is exposed as NULL::text[].
+ */
+SELECT __cat_tools.exec(format($fmt$
+CREATE OR REPLACE VIEW _cat_tools.pg_attribute_v AS
+  SELECT %s
+      , c.*
+      , t.oid AS typoid
+      , %s
+      , a.attmissingval::text::text[] AS attmissingval -- SED: REQUIRES 11!
+      , NULL::text[] AS attmissingval -- SED: PRIOR TO 11!
+    FROM pg_attribute a
+      LEFT JOIN _cat_tools.pg_class_v c ON ( c.reloid = a.attrelid )
+      LEFT JOIN pg_type t ON ( t.oid = a.atttypid )
+;
+$fmt$
+  , __cat_tools.omit_column('pg_catalog.pg_attribute', array['attmissingval'])
+  , __cat_tools.omit_column('pg_catalog.pg_type')
+));
+REVOKE ALL ON _cat_tools.pg_attribute_v FROM public;
+
+-- Refresh _cat_tools.column and cat_tools.column to pick up the new attmissingval column.
+CREATE OR REPLACE VIEW _cat_tools.column AS
+  SELECT *
+    , pg_catalog.format_type(typoid, atttypmod) AS column_type
+    , CASE typtype
+        WHEN 'd' THEN pg_catalog.format_type(typbasetype, typtypmod)
+        WHEN 'e' THEN 'text'
+        ELSE pg_catalog.format_type(typoid, atttypmod)
+      END AS base_type
+    , pk.conkey AS pk_columns
+    , ARRAY[attnum] <@ pk.conkey AS is_pk_member
+    , (SELECT pg_catalog.pg_get_expr(d.adbin, d.adrelid)
+          FROM pg_catalog.pg_attrdef d
+          WHERE d.adrelid = a.attrelid
+            AND d.adnum = a.attnum
+            AND a.atthasdef
+        ) AS column_default
+    FROM _cat_tools.pg_attribute_v a
+      LEFT JOIN pg_constraint pk
+        ON ( reloid = pk.conrelid )
+          AND pk.contype = 'p'
+;
+REVOKE ALL ON _cat_tools.column FROM public;
+
+CREATE OR REPLACE VIEW cat_tools.column AS
+  SELECT *
+    FROM _cat_tools.column
+    WHERE NOT pg_is_other_temp_schema(relnamespace)
+      AND attnum > 0
+      AND NOT attisdropped
+      AND relkind IN( 'r', 'v', 'f' )
+      AND (
+        pg_has_role(SESSION_USER, relowner, 'USAGE'::text)
+        OR has_column_privilege(SESSION_USER, reloid, attnum, 'SELECT, INSERT, UPDATE, REFERENCES'::text)
+      )
+    ORDER BY relschema, relname, attnum
+;
+GRANT SELECT ON cat_tools.column TO cat_tools__usage;
+
+/*
+ * Fix cat_tools.pg_extension_v for PG12+ oid visibility.
+ * On PG < 12, oid was already hidden so the effective column list is unchanged;
+ * CREATE OR REPLACE VIEW works without disturbing pg_extension__get or other dependents.
+ */
+SELECT __cat_tools.exec(format($fmt$
+CREATE OR REPLACE VIEW cat_tools.pg_extension_v AS
+  SELECT e.oid
+      , %s
+
+      , extnamespace::regnamespace AS extschema -- SED: REQUIRES 9.5!
+      , nspname AS extschema -- SED: PRIOR TO 9.5!
+
+      , extconfig::pg_catalog.regclass[] AS ext_config_tables
+    FROM pg_catalog.pg_extension e
+      LEFT JOIN pg_catalog.pg_namespace n ON n.oid = e.extnamespace
+;
+$fmt$
+  , __cat_tools.omit_column('pg_catalog.pg_extension')
+));
+GRANT SELECT ON cat_tools.pg_extension_v TO cat_tools__usage;
+
+-- Drop temporary helper objects
+DROP FUNCTION __cat_tools.omit_column(
+  rel text
+  , omit name[]
+);
+DROP FUNCTION __cat_tools.exec(
+  sql text
+);
+DROP SCHEMA __cat_tools;
diff --git a/sql/cat_tools--0.2.1.sql b/sql/cat_tools--0.2.1.sql
new file mode 100644
index 0000000..d9f5772
--- /dev/null
+++ b/sql/cat_tools--0.2.1.sql
@@ -0,0 +1,1472 @@
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SET LOCAL client_min_messages = WARNING;
+
+DO $$
+BEGIN
+  CREATE ROLE cat_tools__usage NOLOGIN;
+EXCEPTION WHEN duplicate_object THEN
+  NULL;
+END
+$$;
+
+/*
+ * NOTE: All pg_temp objects must be dropped at the end of the script!
+ * Otherwise the eventual DROP CASCADE of pg_temp when the session ends will
+ * also drop the extension! Instead of risking problems, create our own
+ * "temporary" schema instead.
+ */
+CREATE SCHEMA __cat_tools;
+
+-- Schema already created via CREATE EXTENSION
+GRANT USAGE ON SCHEMA cat_tools TO cat_tools__usage;
+CREATE SCHEMA _cat_tools;
+
+-- No permissions checks
+CREATE OR REPLACE VIEW _cat_tools.pg_class_v AS
+  SELECT c.oid AS reloid, c.*, n.nspname AS relschema
+    FROM pg_class c
+      LEFT JOIN pg_namespace n ON( n.oid = c.relnamespace )
+;
+REVOKE ALL ON _cat_tools.pg_class_v FROM public;
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+CREATE FUNCTION __cat_tools.exec(
+  sql text
+) RETURNS void LANGUAGE plpgsql AS $body$
+BEGIN
+  RAISE DEBUG 'sql = %', sql;
+  EXECUTE sql;
+END
+$body$;
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+/*
+ * Temporary stub function. We do this so we can use the nice create_function
+ * function that we're about to create to create the real version of this
+ * function.
+ */
+CREATE FUNCTION cat_tools.function__arg_types_text(text
+) RETURNS text LANGUAGE sql AS 'SELECT $1';
+
+CREATE FUNCTION __cat_tools.create_function(
+  function_name text
+  , args text
+  , options text
+  , body text
+  , grants text DEFAULT NULL
+  , comment text DEFAULT NULL
+) RETURNS void LANGUAGE plpgsql AS $body$
+DECLARE
+  c_simple_args CONSTANT text := cat_tools.function__arg_types_text(args);
+
+  create_template CONSTANT text := $template$
+CREATE OR REPLACE FUNCTION %s(
+%s
+) RETURNS %s AS
+%L
+$template$
+  ;
+
+  revoke_template CONSTANT text := $template$
+REVOKE ALL ON FUNCTION %s(
+%s
+) FROM public;
+$template$
+  ;
+
+  grant_template CONSTANT text := $template$
+GRANT EXECUTE ON FUNCTION %s(
+%s
+) TO %s;
+$template$
+  ;
+
+  comment_template CONSTANT text := $template$
+COMMENT ON FUNCTION %s(
+%s
+) IS %L;
+$template$
+  ;
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+BEGIN
+  PERFORM __cat_tools.exec( format(
+      create_template
+      , function_name
+      , args
+      , options -- TODO: Force search_path if options ~* 'definer'
+      , body
+    ) )
+  ;
+  PERFORM __cat_tools.exec( format(
+      revoke_template
+      , function_name
+      , c_simple_args
+    ) )
+  ;
+
+  IF grants IS NOT NULL THEN
+    PERFORM __cat_tools.exec( format(
+        grant_template
+        , function_name
+        , c_simple_args
+        , grants
+      ) )
+    ;
+  END IF;
+
+  IF comment IS NOT NULL THEN
+    PERFORM __cat_tools.exec( format(
+        comment_template
+        , function_name
+        , c_simple_args
+        , comment
+      ) )
+    ;
+  END IF;
+END
+$body$;
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.function__arg_types'
+  , $$arguments text$$
+  , $$pg_catalog.regtype[] LANGUAGE plpgsql$$
+  , $body$
+DECLARE
+  input_arg_types pg_catalog.regtype[];
+
+  c_template CONSTANT text := $fmt$CREATE FUNCTION pg_temp.cat_tools__function__arg_types__temp_function(
+    %s
+  ) RETURNS %s LANGUAGE plpgsql AS 'BEGIN NULL; END'
+  $fmt$;
+
+  temp_proc pg_catalog.regprocedure;
+  sql text;
+BEGIN
+  sql := format(
+    c_template
+    , arguments
+    , 'void'
+  );
+  --RAISE DEBUG 'Executing SQL %', sql;
+  DECLARE
+    v_type pg_catalog.regtype;
+  BEGIN
+    EXECUTE sql;
+  EXCEPTION WHEN invalid_function_definition THEN
+    v_type := (regexp_matches( SQLERRM, 'function result type must be ([^ ]+) because of' ))[1];
+    sql := format(
+      c_template
+      , arguments
+      , v_type
+    );
+    EXECUTE sql;
+  END;
+
+  /*
+   * Get new OID. *This must be done dynamically!* Otherwise we get stuck
+   * with a CONST oid after first compilation. The regproc cast ensures there's
+   * only one function with this name. The cast to regprocedure is for the sake
+   * of the DROP down below.
+   */
+  EXECUTE $$SELECT 'pg_temp.cat_tools__function__arg_types__temp_function'::pg_catalog.regproc::pg_catalog.regprocedure$$ INTO temp_proc;
+  SELECT INTO STRICT input_arg_types
+      -- This is here to re-cast the array as 1-based instead of 0 based (better solutions welcome!)
+      string_to_array(proargtypes::text,' ')::pg_catalog.regtype[]
+    FROM pg_proc
+    WHERE oid = temp_proc
+  ;
+  -- NOTE: DROP may not accept all the argument options that CREATE does, so use temp_proc
+  EXECUTE format(
+    $fmt$DROP FUNCTION %s$fmt$
+    , temp_proc
+  );
+
+  RETURN input_arg_types;
+END
+$body$
+  , 'cat_tools__usage'
+  , 'Returns argument types for a function argument body as an array. Unlike a
+  normal regprocedure cast, this function accepts anything that is valid when
+  defining a function.'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.function__arg_types_text'
+  , $$arguments text$$
+  , $$text LANGUAGE sql$$
+  , $body$
+SELECT array_to_string(cat_tools.function__arg_types($1), ', ')
+$body$
+  , 'cat_tools__usage'
+  , 'Returns argument types for a function argument body as text. Unlike a
+  normal regprocedure cast, this function accepts anything that is valid when
+  defining a function.'
+
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.regprocedure'
+  , $$
+  function_name text
+  , arguments text$$
+  , $$pg_catalog.regprocedure LANGUAGE sql$$
+  , $body$
+SELECT format(
+  '%s(%s)'
+  , $1
+  , cat_tools.function__arg_types_text($2)
+)::pg_catalog.regprocedure
+$body$
+  , 'cat_tools__usage'
+  , 'Returns a regprocedure for a given function name and arguments. Unlike a
+  normal regprocedure cast, arguments can contain anything that is valid when
+  defining a function.'
+);
+
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+CREATE TYPE cat_tools.constraint_type AS ENUM(
+  'domain constraint', 'table constraint'
+);
+COMMENT ON TYPE cat_tools.constraint_type IS $$Descriptive names for every type of Postgres object (table, operator, rule, etc)$$;
+CREATE TYPE cat_tools.procedure_type AS ENUM(
+  'aggregate', 'function'
+);
+COMMENT ON TYPE cat_tools.procedure_type IS $$Types of constraints (`domain constraint` or `table_constraint`)$$;
+
+CREATE TYPE cat_tools.relation_type AS ENUM(
+  'table'
+  , 'index'
+  , 'sequence'
+  , 'toast table'
+  , 'view'
+  , 'materialized view'
+  , 'composite type'
+  , 'foreign table'
+);
+COMMENT ON TYPE cat_tools.relation_type IS $$Types of objects stored in `pg_class`$$;
+
+CREATE TYPE cat_tools.relation_relkind AS ENUM(
+  'r'
+  , 'i'
+  , 'S'
+  , 't'
+  , 'v'
+  , 'c'
+  , 'f'
+  , 'm'
+);
+COMMENT ON TYPE cat_tools.relation_relkind IS $$Valid values for `pg_class.relkind`$$;
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+CREATE TYPE cat_tools.object_type AS ENUM(
+  -- pg_class
+  'table'
+  , 'index'
+  , 'sequence'
+  , 'toast table'
+  , 'view'
+  , 'materialized view'
+  , 'composite type'
+  , 'foreign table'
+  /*
+   * NOTE! These are a bit weird because columns live in pg_attribute, but
+   * address stuff recognizes columns as part of pg_class with a subobjid <> 0!
+   */
+  , 'table column'
+  , 'index column'
+  , 'sequence column'
+  , 'toast table column'
+  , 'view column'
+  , 'materialized view column'
+  , 'composite type column'
+  , 'foreign table column'
+  -- pg_constraint
+  -- NOTE: a domain itself is considered to be a type
+  , 'domain constraint', 'table constraint'
+  -- pg_proc
+  , 'aggregate', 'function'
+  -- This is taken from getObjectTypeDescription() in objectaddress.c in the Postgres source code
+  , 'type'
+  , 'cast'
+  , 'collation'
+  , 'conversion'
+  , 'default value' -- pg_attrdef
+  , 'language'
+  , 'large object' -- pg_largeobject
+  , 'operator'
+  , 'operator class' -- pg_opclass
+  , 'operator family' -- pg_opfamily
+  , 'operator of access method' -- pg_amop
+  , 'function of access method' -- pg_amproc
+  , 'rule' -- pg_rewrite
+  , 'trigger'
+  , 'schema' -- pg_namespace
+  , 'text search parser' -- pg_ts_parser
+  , 'text search dictionary' -- pg_ts_dict
+  , 'text search template' -- pg_ts_template
+  , 'text search configuration' -- pg_ts_config
+  , 'role' -- pg_authid
+  , 'database'
+  , 'tablespace'
+  , 'foreign-data wrapper' -- pg_foreign_data_wrapper
+  , 'server' -- pg_foreign_server
+  , 'user mapping' -- pg_user_mapping
+  , 'default acl' -- pg_default_acl
+  , 'extension'
+  , 'event trigger' -- pg_event_trigger -- SED: REQUIRES 9.3!
+  , 'policy' -- SED: REQUIRES 9.5!
+  , 'transform' -- SED: REQUIRES 9.5!
+  , 'access method' -- pg_am
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.objects__shared'
+  , ''
+  , 'cat_tools.object_type[] LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT '{role,database,tablespace}'::cat_tools.object_type[]
+$body$
+  , 'cat_tools__usage'
+  , 'Returns array of object types for shared objects.'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.objects__shared_srf'
+  , ''
+  , 'SETOF cat_tools.object_type LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT * FROM pg_catalog.unnest(cat_tools.objects__shared())
+$body$
+  , 'cat_tools__usage'
+  , 'Returns set of object types for shared objects.'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.object__is_shared'
+  , 'object_type cat_tools.object_type'
+  , 'boolean LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT object_type = ANY(cat_tools.objects__shared())
+$body$
+  , 'cat_tools__usage'
+  , 'Returns true if object_type is a shared object.'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.object__is_shared'
+  , 'object_type text'
+  , 'boolean LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT cat_tools.object__is_shared(object_type::cat_tools.object_type)
+$body$
+  , 'cat_tools__usage'
+  , 'Returns true if object_type is a shared object.'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.objects__address_unsupported'
+  , ''
+  , 'cat_tools.object_type[] LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT array[
+  'toast table'::cat_tools.object_type, 'composite type'
+  , 'index column' , 'sequence column', 'toast table column', 'view column'
+  , 'materialized view column', 'composite type column'
+]
+$body$
+  , 'cat_tools__usage'
+  , 'Returns array of object types not supported by pg_get_object_address().'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.objects__address_unsupported_srf'
+  , ''
+  , 'SETOF cat_tools.object_type LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT * FROM pg_catalog.unnest(cat_tools.objects__address_unsupported())
+$body$
+  , 'cat_tools__usage'
+  , 'Returns set of object types not supported by pg_get_object_address().'
+);
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+SELECT __cat_tools.create_function(
+  'cat_tools.object__is_address_unsupported'
+  , 'object_type cat_tools.object_type'
+  , 'boolean LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT object_type = ANY(cat_tools.objects__address_unsupported())
+$body$
+  , 'cat_tools__usage'
+  , 'Returns true if object type is not supported by pg_get_object_address().'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.object__is_address_unsupported'
+  , 'object_type text'
+  , 'boolean LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT cat_tools.object__is_address_unsupported(object_type::cat_tools.object_type)
+$body$
+  , 'cat_tools__usage'
+  , 'Returns true if object type is not supported by pg_get_object_address().'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.object__catalog'
+  , 'object_type cat_tools.object_type'
+  , 'pg_catalog.regclass LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT (
+  'pg_catalog.'
+  || CASE
+    WHEN object_type = ANY( array[
+    'table'
+    , 'index'
+    , 'sequence'
+    , 'toast table'
+    , 'view'
+    , 'materialized view'
+    , 'composite type'
+    , 'foreign table'
+      ]::cat_tools.object_type[] )
+    THEN 'pg_class'
+    WHEN object_type = ANY( '{domain constraint,table constraint}'::cat_tools.object_type[] )
+      THEN 'pg_constraint'
+    WHEN object_type = ANY( '{aggregate,function}'::cat_tools.object_type[] )
+      THEN 'pg_proc'
+    WHEN object_type::text LIKE '% column'
+      THEN 'pg_attribute'
+    ELSE CASE object_type
+      -- Unusual cases
+      -- s/, \(.\{-}\) -- \(.*\)/  WHEN \1 THEN '\2'/
+      WHEN 'default value' THEN 'pg_attrdef'
+      WHEN 'large object' THEN 'pg_largeobject'
+      WHEN 'operator class' THEN 'pg_opclass'
+      WHEN 'operator family' THEN 'pg_opfamily'
+      WHEN 'operator of access method' THEN 'pg_amop'
+      WHEN 'function of access method' THEN 'pg_amproc'
+      WHEN 'rule' THEN 'pg_rewrite'
+      WHEN 'schema' THEN 'pg_namespace'
+      WHEN 'text search parser' THEN 'pg_ts_parser'
+      WHEN 'text search dictionary' THEN 'pg_ts_dict'
+      WHEN 'text search template' THEN 'pg_ts_template'
+      WHEN 'text search configuration' THEN 'pg_ts_config'
+      WHEN 'role' THEN 'pg_authid'
+      WHEN 'foreign-data wrapper' THEN 'pg_foreign_data_wrapper'
+      WHEN 'server' THEN 'pg_foreign_server'
+      WHEN 'user mapping' THEN 'pg_user_mapping'
+      WHEN 'default acl' THEN 'pg_default_acl'
+      WHEN 'event trigger' THEN 'pg_event_trigger' -- SED: REQUIRES 9.3!
+      WHEN 'access method' THEN 'pg_am'
+      ELSE 'pg_' || object_type::text
+      END
+    END
+  )::pg_catalog.regclass
+$body$
+  , 'cat_tools__usage'
+  , 'Returns catalog table that is used to store <object_type> objects'
+);
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+SELECT __cat_tools.create_function(
+  'cat_tools.object__catalog'
+  , 'object_type text'
+  , 'pg_catalog.regclass LANGUAGE sql STRICT IMMUTABLE'
+  , $body$SELECT cat_tools.object__catalog(object_type::cat_tools.object_type)$body$
+  , 'cat_tools__usage'
+  , 'Returns catalog table that is used to store <object_type> objects'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.object__address_classid'
+  , 'object_type cat_tools.object_type'
+  , 'pg_catalog.regclass LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT CASE
+  WHEN c = 'pg_catalog.pg_attribute'::regclass THEN 'pg_catalog.pg_class'::regclass
+  ELSE c
+  END
+  FROM cat_tools.object__catalog(object_type::cat_tools.object_type) c
+$body$
+  , 'cat_tools__usage'
+  , 'Returns the classid used by the pg_*_object*() functions for an object_type'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.object__address_classid'
+  , 'object_type text'
+  , 'pg_catalog.regclass LANGUAGE sql STRICT IMMUTABLE'
+  , $body$SELECT cat_tools.object__address_classid(object_type::cat_tools.object_type)$body$
+  , 'cat_tools__usage'
+  , 'Returns the classid used by the pg_*_object*() functions for an object_type'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+CREATE TABLE _cat_tools.catalog_metadata(
+  object_catalog    pg_catalog.regclass
+    CONSTRAINT catalog_metadata__pk_object_catalog PRIMARY KEY
+  , namespace_field name
+  , reg_type        pg_catalog.regtype
+  , simple_reg_type pg_catalog.regtype
+);
+-- Table is populated later, after enum_range_srf is created
+SELECT __cat_tools.create_function(
+  '_cat_tools.catalog_metadata__get'
+  , 'object_catalog _cat_tools.catalog_metadata.object_catalog%TYPE'
+  , '_cat_tools.catalog_metadata LANGUAGE plpgsql IMMUTABLE' -- Technically should be STABLE
+  , $body$
+DECLARE
+  o _cat_tools.catalog_metadata;
+BEGIN
+  SELECT INTO STRICT o
+      *
+    FROM _cat_tools.catalog_metadata m
+    WHERE m.object_catalog = catalog_metadata__get.object_catalog
+  ;
+  RETURN o;
+END
+$body$
+  , 'cat_tools__usage'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.object__reg_type'
+  , 'object_catalog pg_catalog.regclass'
+  , 'pg_catalog.regtype LANGUAGE sql SECURITY DEFINER STRICT IMMUTABLE'
+  , $body$
+SELECT (_cat_tools.catalog_metadata__get(object_catalog)).reg_type
+$body$
+  , 'cat_tools__usage'
+  , 'Returns the object identifier type (ie: regclass) associated with a system catalog (ie: pg_class).'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.object__reg_type'
+  , 'object_type cat_tools.object_type'
+  , 'pg_catalog.regtype LANGUAGE sql STRICT IMMUTABLE'
+  , $body$SELECT cat_tools.object__reg_type(cat_tools.object__catalog(object_type))$body$
+  , 'cat_tools__usage'
+  , 'Returns the object identifier type (ie: regclass) associated with a system catalog (ie: pg_class).'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.object__reg_type'
+  , 'object_type text'
+  , 'pg_catalog.regtype LANGUAGE sql STRICT IMMUTABLE'
+  , $body$SELECT cat_tools.object__reg_type(object_type::cat_tools.object_type)$body$
+  , 'cat_tools__usage'
+  , 'Returns the object identifier type (ie: regclass) associated with a system catalog (ie: pg_class).'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.object__reg_type_catalog'
+  , 'object_identifier_type regtype'
+  , 'pg_catalog.regclass LANGUAGE plpgsql SECURITY DEFINER STRICT IMMUTABLE'
+  , $body$
+DECLARE
+  cat pg_catalog.regclass;
+BEGIN
+  SELECT INTO STRICT cat
+      object_catalog
+    FROM _cat_tools.catalog_metadata m
+    WHERE m.reg_type = object_identifier_type
+      OR m.simple_reg_type = object_identifier_type
+  ;
+  RETURN cat;
+EXCEPTION WHEN no_data_found THEN
+  IF object_identifier_type::text LIKE 'reg%' THEN
+    RAISE 'object identifier type % is not supported', object_identifier_type
+      USING
+        HINT = format( 'If %I is a valid object identifier type please open an issue at https://github.com/decibel/cat_tools/issues.', object_identifier_type )
+        , ERRCODE = 'feature_not_supported'
+    ;
+  ELSE
+    RAISE '% is not a object identifier type', object_identifier_type
+      USING
+        HINT = 'See https://www.postgresql.org/docs/current/static/datatype-oid.html'
+        , ERRCODE = 'wrong_object_type'
+    ;
+  END IF;
+END
+$body$
+  , 'cat_tools__usage'
+  , 'Returns the system catalog that stores a particular object identifier type.'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.relation__kind'
+  , 'relkind cat_tools.relation_relkind'
+  , 'cat_tools.relation_type LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT CASE relkind
+  WHEN 'r' THEN 'table'
+  WHEN 'i' THEN 'index'
+  WHEN 'S' THEN 'sequence'
+  WHEN 't' THEN 'toast table'
+  WHEN 'v' THEN 'view'
+  WHEN 'c' THEN 'materialized view'
+  WHEN 'f' THEN 'composite type'
+  WHEN 'm' THEN 'foreign table'
+END::cat_tools.relation_type
+$body$
+  , 'cat_tools__usage'
+  , 'Mapping from <pg_class.relkind> to a <cat_tools.relation_type>'
+);
+
+SELECT __cat_tools.create_function(
+  'cat_tools.relation__relkind'
+  , 'kind cat_tools.relation_type'
+  , 'cat_tools.relation_relkind LANGUAGE sql STRICT IMMUTABLE'
+  , $body$
+SELECT CASE kind
+  WHEN 'table' THEN 'r'
+  WHEN 'index' THEN 'i'
+  WHEN 'sequence' THEN 'S'
+  WHEN 'toast table' THEN 't'
+  WHEN 'view' THEN 'v'
+  WHEN 'materialized view' THEN 'c'
+  WHEN 'composite type' THEN 'f'
+  WHEN 'foreign table' THEN 'm'
+END::cat_tools.relation_relkind
+$body$
+  , 'cat_tools__usage'
+  , 'Mapping from <cat_tools.relation_type> to a <pg_class.relkind> value'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.relation__relkind'
+  , 'kind text'
+  , 'cat_tools.relation_relkind LANGUAGE sql STRICT IMMUTABLE'
+  , $body$SELECT cat_tools.relation__relkind(kind::cat_tools.relation_type)$body$
+  , 'cat_tools__usage'
+  , 'Mapping from <cat_tools.relation_type> to a <pg_class.relkind> value'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.relation__kind'
+  , 'relkind text'
+  , 'cat_tools.relation_type LANGUAGE sql STRICT IMMUTABLE'
+  , $body$SELECT cat_tools.relation__kind(relkind::cat_tools.relation_relkind)$body$
+  , 'cat_tools__usage'
+  , 'Mapping from <cat_tools.relation_type> to a <pg_class.relkind> value'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+CREATE OR REPLACE VIEW _cat_tools.pg_depend_identity_v AS -- SED: REQUIRES 9.3!
+  SELECT o.type AS object_type -- SED: REQUIRES 9.3!
+      , o.schema AS object_schema -- SED: REQUIRES 9.3!
+      , o.name AS object_name -- SED: REQUIRES 9.3!
+      , o.identity AS object_identity -- SED: REQUIRES 9.3!
+      , r.type AS reference_type -- SED: REQUIRES 9.3!
+      , r.schema AS reference_schema -- SED: REQUIRES 9.3!
+      , r.name AS reference_name -- SED: REQUIRES 9.3!
+      , r.identity AS reference_identity -- SED: REQUIRES 9.3!
+      , d.* -- SED: REQUIRES 9.3!
+    FROM pg_catalog.pg_depend d -- SED: REQUIRES 9.3!
+      , pg_catalog.pg_identify_object(classid, objid, objsubid) o -- SED: REQUIRES 9.3!
+      , pg_catalog.pg_identify_object(refclassid, refobjid, refobjsubid) r -- SED: REQUIRES 9.3!
+    WHERE classid <> 0 -- SED: REQUIRES 9.3!
+  UNION ALL -- SED: REQUIRES 9.3!
+  SELECT NULL, NULL, NULL, NULL -- SED: REQUIRES 9.3!
+      , r.type AS reference_type -- SED: REQUIRES 9.3!
+      , r.schema AS reference_schema -- SED: REQUIRES 9.3!
+      , r.name AS reference_name -- SED: REQUIRES 9.3!
+      , r.identity AS reference_identity -- SED: REQUIRES 9.3!
+      , d.* -- SED: REQUIRES 9.3!
+    FROM pg_catalog.pg_depend d -- SED: REQUIRES 9.3!
+      , pg_catalog.pg_identify_object(refclassid, refobjid, refobjsubid) r -- SED: REQUIRES 9.3!
+    WHERE classid = 0 -- SED: REQUIRES 9.3!
+; -- SED: REQUIRES 9.3!
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+CREATE OR REPLACE VIEW cat_tools.pg_class_v AS
+  SELECT *
+    FROM _cat_tools.pg_class_v
+
+    /*
+     * Oddly, there's no security associated with schema or table visibility.
+     * Be a bit paranoid though.
+     */
+    WHERE NOT pg_is_other_temp_schema(relnamespace)
+      AND relkind IN( 'r', 'v', 'f' )
+;
+GRANT SELECT ON cat_tools.pg_class_v TO cat_tools__usage;
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+CREATE OR REPLACE VIEW _cat_tools.pg_attribute_v AS
+  SELECT a.*
+      , c.*
+      , t.oid AS typoid
+      , t.*
+    FROM pg_attribute a
+      LEFT JOIN _cat_tools.pg_class_v c ON ( c.reloid = a.attrelid )
+      LEFT JOIN pg_type t ON ( t.oid = a.atttypid )
+;
+REVOKE ALL ON _cat_tools.pg_attribute_v FROM public;
+
+CREATE OR REPLACE VIEW _cat_tools.column AS
+  SELECT *
+    , pg_catalog.format_type(typoid, atttypmod) AS column_type
+    , CASE typtype
+        -- domain
+        WHEN 'd' THEN pg_catalog.format_type(typbasetype, typtypmod)
+        -- enum
+        WHEN 'e' THEN 'text'
+        ELSE pg_catalog.format_type(typoid, atttypmod)
+      END AS base_type
+    , pk.conkey AS pk_columns
+    , ARRAY[attnum] <@ pk.conkey AS is_pk_member
+    , (SELECT pg_catalog.pg_get_expr(d.adbin, d.adrelid)
+          FROM pg_catalog.pg_attrdef d
+          WHERE d.adrelid = a.attrelid
+            AND d.adnum = a.attnum
+            AND a.atthasdef
+        ) AS column_default
+    FROM _cat_tools.pg_attribute_v a
+      LEFT JOIN pg_constraint pk
+        ON ( reloid = pk.conrelid )
+          AND pk.contype = 'p'
+;
+REVOKE ALL ON _cat_tools.column FROM public;
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+-- No perms on extension visibility
+CREATE OR REPLACE VIEW cat_tools.pg_extension_v AS
+  SELECT e.oid, e.*
+
+      , extnamespace::regnamespace AS extschema -- SED: REQUIRES 9.5!
+-- Not used prior to 9.5:       , nspname AS extschema 
+
+      , extconfig::pg_catalog.regclass[] AS ext_config_tables
+    FROM pg_catalog.pg_extension e
+      LEFT JOIN pg_catalog.pg_namespace n ON n.oid = e.extnamespace
+;
+GRANT SELECT ON cat_tools.pg_extension_v TO cat_tools__usage;
+
+CREATE OR REPLACE VIEW cat_tools.column AS
+  SELECT *
+    FROM _cat_tools.column
+    -- SECURITY
+    WHERE NOT pg_is_other_temp_schema(relnamespace)
+      AND attnum > 0
+      AND NOT attisdropped
+      AND relkind IN( 'r', 'v', 'f' )
+      AND (
+        pg_has_role(SESSION_USER, relowner, 'USAGE'::text)
+        OR has_column_privilege(SESSION_USER, reloid, attnum, 'SELECT, INSERT, UPDATE, REFERENCES'::text)
+      )
+    ORDER BY relschema, relname, attnum
+;
+GRANT SELECT ON cat_tools.column TO cat_tools__usage;
+
+-- Borrowed from newsysviews: http://pgfoundry.org/projects/newsysviews/
+SELECT __cat_tools.create_function(
+  '_cat_tools._pg_sv_column_array'
+  , 'OID, SMALLINT[]'
+  , 'NAME[] LANGUAGE sql STABLE'
+  , $$
+    SELECT ARRAY(
+        SELECT a.attname
+          FROM pg_catalog.pg_attribute a
+          JOIN generate_series(1, array_upper($2, 1)) s(i) ON a.attnum = $2[i]
+         WHERE attrelid = $1
+         ORDER BY i
+    )
+$$
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+-- Borrowed from newsysviews: http://pgfoundry.org/projects/newsysviews/
+SELECT __cat_tools.create_function(
+  '_cat_tools._pg_sv_table_accessible'
+  , 'OID, OID'
+  , 'boolean LANGUAGE sql STABLE'
+  , $$
+    SELECT CASE WHEN has_schema_privilege($1, 'USAGE') THEN (
+                  has_table_privilege($2, 'SELECT')
+               OR has_table_privilege($2, 'INSERT')
+               or has_table_privilege($2, 'UPDATE')
+               OR has_table_privilege($2, 'DELETE')
+               OR has_table_privilege($2, 'RULE')
+               OR has_table_privilege($2, 'REFERENCES')
+               OR has_table_privilege($2, 'TRIGGER')
+           ) ELSE FALSE
+    END;
+$$
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+-- Borrowed from newsysviews: http://pgfoundry.org/projects/newsysviews/
+CREATE OR REPLACE VIEW cat_tools.pg_all_foreign_keys
+AS
+  SELECT n1.nspname                                   AS fk_schema_name,
+         c1.relname                                   AS fk_table_name,
+         k1.conname                                   AS fk_constraint_name,
+         c1.oid                                       AS fk_table_oid,
+         _cat_tools._pg_sv_column_array(k1.conrelid,k1.conkey)   AS fk_columns,
+         n2.nspname                                   AS pk_schema_name,
+         c2.relname                                   AS pk_table_name,
+         k2.conname                                   AS pk_constraint_name,
+         c2.oid                                       AS pk_table_oid,
+         ci.relname                                   AS pk_index_name,
+         _cat_tools._pg_sv_column_array(k1.confrelid,k1.confkey) AS pk_columns,
+         CASE k1.confmatchtype WHEN 'f' THEN 'FULL'
+                               WHEN 'p' THEN 'PARTIAL'
+                               WHEN 'u' THEN 'NONE'
+                               else null
+         END AS match_type,
+         CASE k1.confdeltype WHEN 'a' THEN 'NO ACTION'  -- -- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+                             WHEN 'c' THEN 'CASCADE'
+                             WHEN 'd' THEN 'SET DEFAULT'
+                             WHEN 'n' THEN 'SET NULL'
+                             WHEN 'r' THEN 'RESTRICT'
+                             else null
+         END AS on_delete,
+         CASE k1.confupdtype WHEN 'a' THEN 'NO ACTION'
+                             WHEN 'c' THEN 'CASCADE'
+                             WHEN 'd' THEN 'SET DEFAULT'
+                             WHEN 'n' THEN 'SET NULL'
+                             WHEN 'r' THEN 'RESTRICT'
+                             ELSE NULL
+         END AS on_update,
+         k1.condeferrable AS is_deferrable,             -- -- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+         k1.condeferred   AS is_deferred
+    FROM pg_catalog.pg_constraint k1
+    JOIN pg_catalog.pg_namespace n1 ON (n1.oid = k1.connamespace)
+    JOIN pg_catalog.pg_class c1     ON (c1.oid = k1.conrelid)
+    JOIN pg_catalog.pg_class c2     ON (c2.oid = k1.confrelid)
+    JOIN pg_catalog.pg_namespace n2 ON (n2.oid = c2.relnamespace)
+    JOIN pg_catalog.pg_depend d     ON (
+                 d.classid = 'pg_constraint'::pg_catalog.regclass  -- -- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+             AND d.objid = k1.oid
+             AND d.objsubid = 0
+             AND d.deptype = 'n'
+             AND d.refclassid = 'pg_class'::pg_catalog.regclass
+             AND d.refobjsubid=0
+         )
+    JOIN pg_catalog.pg_class ci ON (ci.oid = d.refobjid AND ci.relkind = 'i')
+    LEFT JOIN pg_depend d2      ON (
+                 d2.classid = 'pg_class'::pg_catalog.regclass      -- -- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+             AND d2.objid = ci.oid
+             AND d2.objsubid = 0
+             AND d2.deptype = 'i'
+             AND d2.refclassid = 'pg_constraint'::pg_catalog.regclass
+             AND d2.refobjsubid = 0
+         )
+    LEFT JOIN pg_catalog.pg_constraint k2 ON (          -- -- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+                 k2.oid = d2.refobjid
+             AND k2.contype IN ('p', 'u')
+         )
+   WHERE k1.conrelid != 0
+     AND k1.confrelid != 0
+     AND k1.contype = 'f'
+     AND _cat_tools._pg_sv_table_accessible(n1.oid, c1.oid)
+;
+GRANT SELECT ON cat_tools.pg_all_foreign_keys TO cat_tools__usage;
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.pg_attribute__get'
+  , $$
+  relation pg_catalog.regclass
+  , column_name name
+$$
+  , $$pg_catalog.pg_attribute LANGUAGE plpgsql$$
+  , $body$
+DECLARE
+  r pg_catalog.pg_attribute;
+BEGIN
+  SELECT INTO STRICT r
+      *
+    FROM pg_catalog.pg_attribute
+    WHERE attrelid = relation
+      AND attname = column_name
+  ;
+  RETURN r;
+EXCEPTION WHEN no_data_found THEN
+  RAISE 'column "%" of relation "%" does not exist', column_name, relation
+    USING ERRCODE = 'undefined_column'
+  ;
+END
+$body$
+  , 'cat_tools__usage'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.pg_extension__get'
+  , 'extension_name name'
+  , $$cat_tools.pg_extension_v LANGUAGE plpgsql$$
+  , $body$
+DECLARE
+  r cat_tools.pg_extension_v;
+BEGIN
+  SELECT INTO STRICT r
+      *
+    FROM cat_tools.pg_extension_v
+    WHERE extname = extension_name
+  ;
+  RETURN r;
+EXCEPTION WHEN no_data_found THEN
+  RAISE 'extension "%" does not exist', extension_name
+    USING ERRCODE = 'undefined_object'
+  ;
+END
+$body$
+  , 'cat_tools__usage'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.extension__schemas'
+  , 'extension_names name[]'
+  , $$pg_catalog.regnamespace[] LANGUAGE sql$$ -- SED: REQUIRES 9.5!
+-- Not used prior to 9.5:   , $$pg_catalog.name[] LANGUAGE sql$$ 
+  , $body$
+SELECT array(
+  SELECT (cat_tools.pg_extension__get(en)).extschema
+    FROM unnest(extension_names) en
+)
+$body$
+  , 'cat_tools__usage'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.extension__schemas_unique'
+  , 'extension_names name[]'
+  , $$pg_catalog.regnamespace[] LANGUAGE sql$$ -- SED: REQUIRES 9.5!
+-- Not used prior to 9.5:   , $$pg_catalog.name[] LANGUAGE sql$$ 
+  , $body$
+SELECT array(
+  SELECT DISTINCT (cat_tools.pg_extension__get(en)).extschema
+    FROM unnest(extension_names) en
+)
+$body$
+  , 'cat_tools__usage'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+-- Text versions
+SELECT __cat_tools.create_function(
+  'cat_tools.extension__schemas'
+  , 'extension_names text'
+  , $$pg_catalog.regnamespace[] LANGUAGE sql$$ -- SED: REQUIRES 9.5!
+-- Not used prior to 9.5:   , $$pg_catalog.name[] LANGUAGE sql$$ 
+  , $body$
+SELECT cat_tools.extension__schemas(
+  CASE WHEN extension_names LIKE '{%}' THEN extension_names
+  ELSE '{' || extension_names || '}'
+  END::name[]
+)
+$body$
+  , 'cat_tools__usage'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.extension__schemas_unique'
+  , 'extension_names text'
+  , $$pg_catalog.regnamespace[] LANGUAGE sql$$ -- SED: REQUIRES 9.5!
+-- Not used prior to 9.5:   , $$pg_catalog.name[] LANGUAGE sql$$ 
+  , $body$
+SELECT cat_tools.extension__schemas_unique(
+  CASE WHEN extension_names LIKE '{%}' THEN extension_names
+  ELSE '{' || extension_names || '}'
+  END::name[]
+)
+$body$
+  , 'cat_tools__usage'
+);
+
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.get_serial_sequence'
+  , $$
+  table_name text
+  , column_name text
+$$
+  , $$pg_catalog.regclass LANGUAGE plpgsql$$
+  , $body$
+DECLARE
+  seq pg_catalog.regclass;
+BEGIN
+  -- Note: the function will throw an error if table or column doesn't exist
+  seq := pg_get_serial_sequence( table_name, column_name );
+
+  IF seq IS NULL THEN
+    RAISE EXCEPTION '"%" is not a serial column', column_name
+      USING ERRCODE = 'wrong_object_type'
+        -- TODO: SCHEMA and COLUMN
+        , COLUMN = column_name -- SED: REQUIRES 9.3!
+    ;
+  END IF;
+
+  RETURN seq;
+END
+$body$
+  , 'cat_tools__usage'
+  , 'Return sequence that is associated with a column. Unlike the pg_get_serial_sequence, throw an exception if there is no sequence associated with the column.'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.sequence__last'
+  , $$
+  table_name text
+  , column_name text
+$$
+  , $$bigint LANGUAGE sql$$
+  , 'SELECT pg_catalog.currval(cat_tools.get_serial_sequence($1,$2))'
+  , 'cat_tools__usage'
+  , 'Return the last value assigned to a column with an associated sequence.'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.currval'
+  , $$
+  table_name text
+  , column_name text
+$$
+  , $$bigint LANGUAGE sql$$
+  , 'SELECT cat_tools.sequence__last($1,$2)'
+  , 'cat_tools__usage'
+  , 'Return the last value assigned to a column with an associated sequence.'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.sequence__next'
+  , $$
+  table_name text
+  , column_name text
+$$
+  , $$bigint LANGUAGE sql$$
+  , 'SELECT pg_catalog.nextval(cat_tools.get_serial_sequence($1,$2))'
+  , 'cat_tools__usage'
+  , 'Return the next value to assign to a column with an associated sequence. THIS ADVANCES THE SEQUENCE.'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.nextval'
+  , $$
+  table_name text
+  , column_name text
+$$
+  , $$bigint LANGUAGE sql$$
+  , 'SELECT cat_tools.sequence__next($1,$2)'
+  , 'cat_tools__usage'
+  , 'Return the next value to assign to a column with an associated sequence. THIS ADVANCES THE SEQUENCE.'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.setval'
+  , $$
+  table_name text
+  , column_name text
+  , new_value bigint
+  , has_been_used boolean DEFAULT true
+$$
+  , $$bigint LANGUAGE sql$$
+  , 'SELECT pg_catalog.setval(cat_tools.get_serial_sequence($1,$2), $3, $4)'
+  , 'cat_tools__usage'
+  , 'Changes the value for a sequence associated with a column. If has_been_used is true, the sequence will be set to new_value + 1. Returns new_value. See also sequence__set_last() and sequence__set_next().'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.sequence__set_last'
+  , $$
+  table_name text
+  , column_name text
+  , last_value bigint
+$$
+  , $$bigint LANGUAGE sql$$
+  , 'SELECT cat_tools.setval($1,$2,$3,true)'
+  , 'cat_tools__usage'
+  , 'Changes the value for a sequence associated with a column. last_value is the last value used, so sequence is set to last_value+1. See also sequence__set_next().'
+);
+SELECT __cat_tools.create_function(
+  'cat_tools.sequence__set_next'
+  , $$
+  table_name text
+  , column_name text
+  , next_value bigint
+$$
+  , $$bigint LANGUAGE sql$$
+  , 'SELECT cat_tools.setval($1,$2,$3,false)'
+  , 'cat_tools__usage'
+  , 'Changes the value for a sequence associated with a column. next_value is the next value the sequence will assign. See also sequence__last_value.'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.enum_range'
+  , 'enum pg_catalog.regtype'
+  , $$text[] LANGUAGE plpgsql STABLE$$
+  , $body$
+DECLARE
+  ret text[];
+BEGIN
+  EXECUTE format('SELECT pg_catalog.enum_range( NULL::%s )', enum) INTO ret;
+  RETURN ret;
+END
+$body$
+  , 'cat_tools__usage'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.enum_range_srf'
+  , 'enum pg_catalog.regtype'
+  , $$SETOF text LANGUAGE sql$$
+  , $body$
+SELECT * FROM unnest( cat_tools.enum_range($1) ) AS r(enum_label)
+$body$
+  , 'cat_tools__usage'
+);
+
+SELECT __cat_tools.create_function(
+  'cat_tools.pg_class'
+  , 'rel pg_catalog.regclass'
+  , $$cat_tools.pg_class_v LANGUAGE sql STABLE$$
+  , $body$
+SELECT * FROM cat_tools.pg_class_v WHERE reloid = $1
+$body$
+  , 'cat_tools__usage'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.name__check'
+  , 'name_to_check text'
+  , $$void LANGUAGE plpgsql$$
+  , $body$
+BEGIN
+  IF name_to_check IS DISTINCT FROM name_to_check::name THEN
+    RAISE '"%" becomes "%" when cast to name', name_to_check, name_to_check::name;
+  END IF;
+END
+$body$
+  , 'cat_tools__usage'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+/*
+ * Trigger functions
+ */
+SELECT __cat_tools.create_function(
+  'cat_tools.trigger__get_oid__loose'
+  , $$
+  trigger_table pg_catalog.regclass
+  , trigger_name text
+$$
+  , $$oid LANGUAGE sql$$
+  , $body$
+  SELECT oid
+    FROM pg_trigger
+    WHERE tgrelid = $1 --trigger_table
+      AND tgname = CASE
+        /*
+         * tgname isn't quoted, so strip quotes, but only if the string both
+         * starts and ends with quotes
+         */
+        WHEN $2 LIKE '"%"' THEN btrim($2, '"')
+        ELSE $2
+        END --trigger_name
+  ;
+$body$
+  , 'cat_tools__usage'
+  , 'Return the OID for a trigger. Returns NULL if trigger does not exist.'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.trigger__get_oid'
+  , $$
+  trigger_table pg_catalog.regclass
+  , trigger_name text
+$$
+  , $$oid LANGUAGE plpgsql$$
+  , $body$
+DECLARE
+  v_oid oid;
+BEGIN
+  -- Note that because __loose isn't an SRF it'll always return a value
+  v_oid := cat_tools.trigger__get_oid__loose( trigger_table, trigger_name ) ;
+
+  IF v_oid IS NULL THEN
+    RAISE EXCEPTION 'trigger % on table % does not exist', trigger_name, trigger_table
+      USING errcode = 'undefined_object' -- 42704
+    ;
+  END IF;
+
+  RETURN v_oid;
+END
+$body$
+  , 'cat_tools__usage'
+  , 'Return the OID for a trigger. Throws an undefined_object error if the trigger does not exist.'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.trigger__parse'
+  , $$
+  trigger_oid oid
+  , OUT trigger_table regclass
+  , OUT timing text
+  , OUT events text[]
+  , OUT defer text
+  , OUT row_statement text
+  , OUT when_clause text
+  , OUT trigger_function regprocedure
+  , OUT function_arguments text[]
+$$
+  , $$record STABLE LANGUAGE plpgsql$$
+  , $body$
+DECLARE
+  r_trigger pg_catalog.pg_trigger;
+  v_triggerdef text;
+  v_create_stanza text;
+  v_on_clause text;
+  v_execute_clause text;
+
+  v_work text;
+  v_array text[];
+BEGIN
+  /*
+   * Do this first to make sure trigger exists.
+   *
+   * TODO: After we no longer support < 9.6, test v_triggerdef for NULL instead
+   * using the extra block here.
+   */
+  BEGIN
+    SELECT * INTO STRICT r_trigger FROM pg_catalog.pg_trigger WHERE oid = trigger_oid;
+  EXCEPTION WHEN no_data_found THEN
+    RAISE EXCEPTION 'trigger with OID % does not exist', trigger_oid
+      USING errcode = 'undefined_object' -- 42704
+    ;
+  END;
+  trigger_table := r_trigger.tgrelid;
+  trigger_function := r_trigger.tgfoid;
+
+  v_triggerdef := pg_catalog.pg_get_triggerdef(trigger_oid, true);
+
+  v_create_stanza := format(
+    'CREATE %sTRIGGER %I '
+    , CASE WHEN r_trigger.tgconstraint=0 THEN '' ELSE 'CONSTRAINT ' END
+    , r_trigger.tgname
+  );
+  -- Strip CREATE [CONSTRAINT] TRIGGER ... off
+  v_work := replace( v_triggerdef, v_create_stanza, '' );
+
+  -- Get BEFORE | AFTER | INSTEAD OF
+  timing := split_part( v_work, ' ', 1 );
+  timing := timing || CASE timing WHEN 'INSTEAD' THEN ' OF' ELSE '' END;
+
+  -- Strip off timing clause
+  v_work := replace( v_work, timing || ' ', '' );
+
+  -- Get array of events (INSERT, UPDATE [OF column, column], DELETE, TRUNCATE)
+  v_on_clause := ' ON ' || r_trigger.tgrelid::pg_catalog.regclass || ' ';
+  v_array := regexp_split_to_array( v_work, v_on_clause );
+  events := string_to_array( v_array[1], ' OR ' );
+  -- Get everything after ON table_name
+  v_work := v_array[2];
+  RAISE DEBUG 'v_work "%"', v_work;
+
+  -- Strip off FROM referenced_table if we have it
+  IF r_trigger.tgconstrrelid<>0 THEN
+    v_work := replace(
+      v_work
+      , 'FROM ' || r_trigger.tgconstrrelid::pg_catalog.regclass || ' '
+      , ''
+    );
+  END IF;
+  RAISE DEBUG 'v_work "%"', v_work;
+
+  -- Get function arguments
+  v_execute_clause := ' EXECUTE PROCEDURE ' || r_trigger.tgfoid::pg_catalog.regproc || E'\\(';
+  v_array := regexp_split_to_array( v_work, v_execute_clause );
+  EXECUTE format(
+      'SELECT array[ %s ]'
+      , rtrim( v_array[2], ')' ) -- Yank trailing )
+    )
+    INTO function_arguments
+  ;
+  RAISE DEBUG 'v_array[2] "%"', v_array[2];
+  -- Get everything prior to EXECUTE PROCEDURE ...
+  v_work := v_array[1];
+  RAISE DEBUG 'v_work "%"', v_work;
+
+  row_statement := (regexp_matches( v_work, 'FOR EACH (ROW|STATEMENT)' ))[1];
+
+  -- Get [ NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY DEFERRED } ]
+  v_array := regexp_split_to_array( v_work, 'FOR EACH (ROW|STATEMENT)' );
+  RAISE DEBUG 'v_work = "%", v_array = "%"', v_work, v_array;
+  defer := rtrim(v_array[1]);
+
+  IF r_trigger.tgqual IS NOT NULL THEN
+    when_clause := rtrim(
+      (regexp_split_to_array( v_array[2], E' WHEN \\(' ))[2]
+      , ')'
+    );
+  END IF;
+
+  RAISE DEBUG
+$$v_create_stanza = "%"
+  v_on_clause = "%"
+  v_execute_clause = "%"$$
+    , v_create_stanza
+    , v_on_clause
+    , v_execute_clause
+  ;
+
+  RETURN;
+END
+$body$
+  , 'cat_tools__usage'
+  , 'Provide details about a trigger.'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.trigger__parse'
+  , $$
+  trigger_table pg_catalog.regclass
+  , trigger_name text
+  , OUT timing text
+  , OUT events text[]
+  , OUT defer text
+  , OUT row_statement text
+  , OUT when_clause text
+  , OUT trigger_function regprocedure
+  , OUT function_arguments text[]
+$$
+  , $$record STABLE LANGUAGE sql$$
+  -- s/, OUT \(\w*\).*/  , \1/
+  , $body$
+SELECT
+    timing
+    , events
+    , "defer"
+    , row_statement
+    , when_clause
+    , trigger_function
+    , function_arguments
+  FROM cat_tools.trigger__parse(
+    cat_tools.trigger__get_oid(trigger_table, trigger_name)
+  )
+$body$
+  , 'cat_tools__usage'
+  , 'Provide details about a trigger.'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+SELECT __cat_tools.create_function(
+  'cat_tools.trigger__args_as_text'
+  , $$function_arguments text[]$$
+  , $$text IMMUTABLE STRICT LANGUAGE sql$$
+  , $body$
+  SELECT format(
+    $$'%s'$$
+    , array_to_string(
+      function_arguments
+      , $$', '$$
+    )
+  )
+$body$
+  , 'cat_tools__usage'
+  , 'Convert function_arguments as returned by trigger__parse() to text (for backwards compatibility).'
+);
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+INSERT INTO _cat_tools.catalog_metadata(object_catalog, reg_type, namespace_field)
+SELECT object__catalog
+    , CASE object__catalog
+      WHEN 'pg_catalog.pg_class'::pg_catalog.regclass THEN 'pg_catalog.regclass'
+      WHEN 'pg_catalog.pg_ts_config'::pg_catalog.regclass THEN 'pg_catalog.regconfig'
+      WHEN 'pg_catalog.pg_ts_dict'::pg_catalog.regclass THEN 'pg_catalog.regdictionary'
+      WHEN 'pg_catalog.pg_namespace'::pg_catalog.regclass THEN 'pg_catalog.regnamespace' -- SED: REQUIRES 9.5!
+      WHEN 'pg_catalog.pg_operator'::pg_catalog.regclass THEN 'pg_catalog.regoperator'
+      WHEN 'pg_catalog.pg_proc'::pg_catalog.regclass THEN 'pg_catalog.regprocedure'
+      WHEN 'pg_catalog.pg_authid'::pg_catalog.regclass THEN 'pg_catalog.regrole' -- SED: REQUIRES 9.5!
+      WHEN 'pg_catalog.pg_type'::pg_catalog.regclass THEN 'pg_catalog.regtype'
+    END::pg_catalog.regtype
+    , n.attname
+  FROM (
+    SELECT DISTINCT cat_tools.object__catalog(object_type)
+      FROM cat_tools.enum_range_srf('cat_tools.object_type') r(object_type)
+    ) d
+    LEFT JOIN cat_tools.column n
+      ON n.attrelid = object__catalog
+      AND n.attname ~ 'namespace$'
+      AND atttypid = 'oid'::pg_catalog.regtype
+;
+UPDATE _cat_tools.catalog_metadata
+  SET simple_reg_type = 'pg_catalog.regproc'
+  WHERE object_catalog = 'pg_catalog.pg_proc'::pg_catalog.regclass
+;
+UPDATE _cat_tools.catalog_metadata
+  SET simple_reg_type = 'pg_catalog.regoper'
+  WHERE object_catalog = 'pg_catalog.pg_operator'::pg_catalog.regclass
+;
+-- Cluster to get rid of dead rows
+CLUSTER _cat_tools.catalog_metadata USING catalog_metadata__pk_object_catalog;
+
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
+
+/*
+ * Drop "temporary" objects
+ */
+DROP FUNCTION __cat_tools.exec(
+  sql text
+);
+DROP FUNCTION __cat_tools.create_function(
+  function_name text
+  , args text
+  , options text
+  , body text
+  , grants text
+  , comment text
+);
+DROP SCHEMA __cat_tools;
+
+-- vi: expandtab ts=2 sw=2
+-- GENERATED FILE! DO NOT EDIT! See sql/cat_tools.sql.in
diff --git a/sql/cat_tools.sql.in b/sql/cat_tools.sql.in
index 6d43fd8..0db7d14 100644
--- a/sql/cat_tools.sql.in
+++ b/sql/cat_tools.sql.in
@@ -20,6 +20,7 @@ CREATE SCHEMA __cat_tools;
 
 -- Schema already created via CREATE EXTENSION
 GRANT USAGE ON SCHEMA cat_tools TO cat_tools__usage;
+ALTER DEFAULT PRIVILEGES IN SCHEMA cat_tools GRANT USAGE ON TYPES TO cat_tools__usage;
 CREATE SCHEMA _cat_tools;
 
 @generated@
@@ -54,7 +55,7 @@ $body$;
 @generated@
 
 /*
- * Starting in 12 oid columns in catalog tables are no longer hidden, so we
+ * Starting in PG12 oid columns in catalog tables are no longer hidden, so we
  * need a way to include all the fields in a table *except* for the OID column.
  */
 SELECT __cat_tools.exec(format($fmt$
@@ -70,7 +71,6 @@ $fmt$
 ));
 REVOKE ALL ON _cat_tools.pg_class_v FROM public;
 
-
 /*
  * Temporary stub function. We do this so we can use the nice create_function
  * function that we're about to create to create the real version of this
@@ -745,12 +745,18 @@ GRANT SELECT ON cat_tools.pg_class_v TO cat_tools__usage;
 
 @generated@
 
+/*
+ * On PG11+, pg_attribute gained attmissingval (pseudo-type anyarray, not usable in views).
+ * Include it cast to text[] on PG11+; expose as NULL::text[] on older versions.
+ */
 SELECT __cat_tools.exec(format($fmt$
 CREATE OR REPLACE VIEW _cat_tools.pg_attribute_v AS
   SELECT %s
       , c.*
       , t.oid AS typoid
       , %s
+      , a.attmissingval::text::text[] AS attmissingval -- SED: REQUIRES 11!
+      , NULL::text[] AS attmissingval -- SED: PRIOR TO 11!
     FROM pg_attribute a
       LEFT JOIN _cat_tools.pg_class_v c ON ( c.reloid = a.attrelid )
       LEFT JOIN pg_type t ON ( t.oid = a.atttypid )
@@ -788,7 +794,10 @@ REVOKE ALL ON _cat_tools.column FROM public;
 
 @generated@
 
--- No perms on extension visibility
+/*
+ * Starting in PG12, oid became a visible column in system catalogs.
+ * Use omit_column to avoid duplicate oid columns.
+ */
 SELECT __cat_tools.exec(format($fmt$
 CREATE OR REPLACE VIEW cat_tools.pg_extension_v AS
   SELECT e.oid
@@ -1498,7 +1507,7 @@ CLUSTER _cat_tools.catalog_metadata USING catalog_metadata__pk_object_catalog;
  */
 DROP FUNCTION __cat_tools.omit_column(
   rel text
-  , omit name[] -- DEFAULT array['oid']
+  , omit name[]
 );
 DROP FUNCTION __cat_tools.exec(
   sql text
diff --git a/test/sql/attribute.sql b/test/sql/attribute.sql
index 59c9486..60ca586 100644
--- a/test/sql/attribute.sql
+++ b/test/sql/attribute.sql
@@ -39,9 +39,20 @@ SET LOCAL ROLE :use_role;
  * pg_attribute__get()
  */
 
+-- pg_attribute.attmissingval (PG11+) is anyarray pseudo-type, which has no equality
+-- operator and can't be compared by pgTAP's results_eq. Build a column list that
+-- excludes it so the comparison works on all PG versions.
+CREATE FUNCTION pg_temp.attr_test_cols() RETURNS text LANGUAGE sql AS $$
+  SELECT string_agg(attname::text, ', ' ORDER BY attnum)
+    FROM pg_attribute
+    WHERE attrelid = 'pg_catalog.pg_attribute'::regclass
+      AND attnum > 0
+      AND NOT attisdropped
+      AND attname != 'attmissingval'
+$$;
+
 \set call 'SELECT * FROM %I.%I( %L, %L )'
 \set n pg_attribute__get
-
 SELECT throws_ok(
   format(
     :'call', :'s', :'n'
@@ -63,32 +74,32 @@ SELECT throws_ok(
   , 'Non-existent column throws error'
 );
 
-/*
- * pg_attributes.attmissingval is type anyarray, which doesn't have an equality
- * operator. That breaks results_eq(), so we have to omit it from the column
- * list.
- */
-SELECT pg_temp.omit_column('pg_catalog.pg_attribute', array['attmissingval']) AS atts
-\gset
-\set get_attributes 'SELECT ' :atts ' FROM pg_attribute '
-\set call 'SELECT ' :atts ' FROM %I.%I( %L, %L )'
-
 SELECT results_eq(
   format(
-    :'call', :'s', :'n'
+    $$SELECT %s FROM %I.%I(%L, %L)$$
+    , pg_temp.attr_test_cols()
+    , :'s', :'n'
     , 'pg_catalog.pg_class'
     , 'relname'
   )
-  , :'get_attributes' || $$WHERE attrelid = 'pg_class'::regclass AND attname='relname'$$
+  , format(
+    $$SELECT %s FROM pg_attribute WHERE attrelid = 'pg_class'::regclass AND attname='relname'$$
+    , pg_temp.attr_test_cols()
+  )
   , 'Verify details of pg_class.relname'
 );
 SELECT results_eq(
   format(
-    :'call', :'s', :'n'
+    $$SELECT %s FROM %I.%I(%L, %L)$$
+    , pg_temp.attr_test_cols()
+    , :'s', :'n'
     , 'pg_catalog.pg_tables'
     , 'tablename'
   )
-  , :'get_attributes' || $$WHERE attrelid = 'pg_tables'::regclass AND attname='tablename'$$
+  , format(
+    $$SELECT %s FROM pg_attribute WHERE attrelid = 'pg_tables'::regclass AND attname='tablename'$$
+    , pg_temp.attr_test_cols()
+  )
   , 'Verify details of pg_tables.tablename'
 );
 
diff --git a/test/sql/extension.sql b/test/sql/extension.sql
index 39cf7f7..c6032a5 100644
--- a/test/sql/extension.sql
+++ b/test/sql/extension.sql
@@ -32,12 +32,14 @@ SELECT isnt_empty(
 SELECT bag_eq(
   $$SELECT * FROM cat_tools.pg_extension__get('cat_tools')$$
   , format(
-    $$SELECT e.*, %s, extconfig::regclass[] AS ext_config_table
+    $$SELECT %s, %s, extconfig::regclass[] AS ext_config_table
       FROM pg_extension e
         JOIN pg_namespace n ON n.oid = extnamespace
       WHERE extname = 'cat_tools'
     $$
-    , CASE WHEN pg_temp.major() < '905' THEN 'nspname AS extschema'
+    -- PG12+ includes oid in SELECT *; older versions need explicit e.oid
+    , CASE WHEN pg_temp.major() >= 1200 THEN 'e.*' ELSE 'e.oid, e.*' END
+    , CASE WHEN pg_temp.major() < 905 THEN 'nspname AS extschema'
       ELSE 'extnamespace::regnamespace AS extschema'
       END
   )