Postgres-Extensions · jnasbyupgrade · Nov 6, 2024 · Nov 6, 2024 · Nov 7, 2024 · Nov 7, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
   test:
     strategy:
       matrix:
-        pg: [18, 17, 16, 15, 14, 13, 12, 11, 10]
+        pg: [18, 17, 16, 15, 14, 13, 12]
     name: 🐘 PostgreSQL ${{ matrix.pg }}
     runs-on: ubuntu-latest
     container: pgxn/pgxn-tools
@@ -34,14 +34,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - old_pg: "10"
-            new_pg: "11"
-          - old_pg: "10"
-            new_pg: "18"
-          - old_pg: "11"
-            new_pg: "12"
-          - old_pg: "11"
-            new_pg: "18"
           - old_pg: "12"
             new_pg: "13"
           - old_pg: "12"
@@ -68,6 +60,9 @@ jobs:
           pg_isready -t 30
       - name: Check out the repo
         uses: actions/checkout@v6
+      - name: Set expected extension version
+        run: |
+          echo "EXPECTED_VERSION=$(sed -n "s/^default_version = '\(.*\)'$/\1/p" cat_tools.control)" >> $GITHUB_ENV
       - name: Install rsync
         run: apt-get install -y rsync
       - name: Install cat_tools into old cluster
@@ -104,7 +99,7 @@ jobs:
         run: |
           VERSION=$(psql -tAc "SELECT extversion FROM pg_extension WHERE extname = 'cat_tools'")
           echo "Extension version: ${VERSION:-<not found>}"
-          echo "$VERSION" | grep -q "0.2.2"
+          echo "$VERSION" | grep -qF "$EXPECTED_VERSION"
       - name: Run test suite on upgraded cluster
         run: make test
       # TODO: also test ALTER EXTENSION cat_tools UPDATE here, once the
@@ -115,17 +110,12 @@ jobs:
   extension-update-test:
     strategy:
       matrix:
-        # Restricted to PG10 only because the pre-0.2.2 install scripts use
-        # unqualified SELECT * in views over pg_attribute/pg_constraint:
-        #   - PG11 added attmissingval (pseudo-type anyarray) to pg_attribute,
-        #     so cat_tools--0.2.0.sql and cat_tools--0.2.1.sql fail on PG11+
-        #     with "column attmissingval has pseudo-type anyarray".
-        #   - PG12 made the `oid` system column visible in SELECT *, causing
-        #     "column oid specified more than once" on PG12+.
-        # PG10 is the only version where both old scripts install cleanly.
-        # TODO: when a future version's install script works on PG11+, expand
-        # this matrix and add tests for the upgrade path from 0.2.2 onwards.
-        pg: [10]
+        # PG12 is the oldest version where the 0.2.2→0.3.0 update works.
+        # PG11 (and PG10) cannot run `ALTER TYPE ... ADD VALUE` in extension
+        # update scripts; this restriction was lifted in PG12.
+        # (PG10 is dropped; the 0.2.0/0.2.1 update paths required PG10 and
+        # can no longer be tested.)
+        pg: [12]
     name: ⬆️ Extension update test on PostgreSQL ${{ matrix.pg }}
     runs-on: ubuntu-latest
     container: pgxn/pgxn-tools
@@ -136,23 +126,19 @@ jobs:
         uses: actions/checkout@v6
       - name: Install rsync
         run: apt-get install -y rsync
+      - name: Set expected extension version
+        run: |
+          echo "EXPECTED_VERSION=$(sed -n "s/^default_version = '\(.*\)'$/\1/p" cat_tools.control)" >> $GITHUB_ENV
       - name: Install cat_tools (all versions)
         run: make install
-      - name: Test upgrade from 0.2.0 (direct 0.2.0→0.2.2 path)
-        run: |
-          psql -c "CREATE EXTENSION cat_tools VERSION '0.2.0'"
-          psql -c "ALTER EXTENSION cat_tools UPDATE"
-          VERSION=$(psql -tAc "SELECT extversion FROM pg_extension WHERE extname = 'cat_tools'")
-          echo "Version after 0.2.0 upgrade: ${VERSION:-<not found>}"
-          echo "$VERSION" | grep -q "0.2.2"
-      - name: Test upgrade from 0.2.1 (0.2.1→0.2.2 path)
+      - name: Test update from 0.2.2 (0.2.2→current path)
         run: |
-          createdb cat_tools_from_021
-          psql -d cat_tools_from_021 -c "CREATE EXTENSION cat_tools VERSION '0.2.1'"
-          psql -d cat_tools_from_021 -c "ALTER EXTENSION cat_tools UPDATE"
-          VERSION=$(psql -d cat_tools_from_021 -tAc "SELECT extversion FROM pg_extension WHERE extname = 'cat_tools'")
-          echo "Version after 0.2.1 upgrade: ${VERSION:-<not found>}"
-          echo "$VERSION" | grep -q "0.2.2"
+          createdb cat_tools_from_022
+          psql -d cat_tools_from_022 -c "CREATE EXTENSION cat_tools VERSION '0.2.2'"
+          psql -d cat_tools_from_022 -c "ALTER EXTENSION cat_tools UPDATE"
+          VERSION=$(psql -d cat_tools_from_022 -tAc "SELECT extversion FROM pg_extension WHERE extname = 'cat_tools'")
+          echo "Version after 0.2.2 update: ${VERSION:-<not found>}"
+          echo "$VERSION" | grep -qF "$EXPECTED_VERSION"
       - name: Run test suite on updated extension
         run: make test
 

diff --git a/.gitignore b/.gitignore
@@ -19,9 +19,6 @@ control.mk
 # built targets
 # Note: Version-specific files (sql/*--*.sql) are now tracked in git and should be committed
 
-# test targets
-/test/.build/
-
 # Test artifacts
 results/
 regression.diffs

diff --git a/CLAUDE.md b/CLAUDE.md
@@ -14,33 +14,42 @@ When fixing a bug, add a comment at the fix site explaining what the bug was and
 
 **Always open PRs against the main repo** (`Postgres-Extensions/cat_tools`), not a fork.
 
+## Terminology
+
+- **Extension update**: moving from one cat_tools version to another (e.g. `ALTER EXTENSION cat_tools UPDATE`). Always say "update" for this.
+- **PostgreSQL upgrade**: upgrading a PostgreSQL cluster to a newer major version (e.g. `pg_upgrade`, `pg_upgradecluster`). Always say "upgrade" for this.
+
+Never use "upgrade" to describe an extension version change, and never use "update" to describe a PostgreSQL cluster version change.
+
 ## SQL file conventions
 
 Rules for what to track in git:
 
 0. If a `.sql.in` file exists, track the `.sql.in` and **not** the corresponding `.sql`.
 1. If no `.sql.in` exists, track the `.sql` directly (e.g. historical pre-0.2.0 files).
 2. Version-specific install scripts (e.g. `sql/cat_tools--0.2.2.sql.in`) MUST be tracked.
-3. Upgrade scripts (e.g. `sql/cat_tools--0.2.1--0.2.2.sql.in`) MUST be tracked.
+3. Update scripts (e.g. `sql/cat_tools--0.2.1--0.2.2.sql.in`) MUST be tracked.
 4. The current version'''s install script (e.g. `sql/cat_tools--0.2.2.sql.in`) is generated
    by `make` from `sql/cat_tools.sql.in`, but MUST still be tracked (rule 2 applies).
 5. Version-specific files MUST NEVER be edited manually — always edit `sql/cat_tools.sql.in`
    and regenerate.
 
-## CI: extension-update-test matrix
+## CI: PostgreSQL version support
+
+**Policy:** Never support a fresh install on any PostgreSQL version where the extension
+update path is known to be broken — a version that cannot be updated to is not truly
+supported.
 
-The `extension-update-test` job in `.github/workflows/ci.yml` is currently restricted to
-`pg: [10]` because that is the only PostgreSQL version where the pre-0.2.2 install scripts
-install cleanly:
-- PG 11 added `attmissingval` (pseudo-type `anyarray`) to `pg_attribute`; the old `SELECT *`
-  in `0.2.0`/`0.2.1` tries to include it directly, failing with "column attmissingval has
-  pseudo-type anyarray".
-- PG 12+ exposed the `oid` system column in `SELECT *`, breaking `0.2.0`/`0.2.1` with
-  "column oid specified more than once".
+Both PG10 and PG11 are dropped as of 0.3.0. The `ALTER TYPE ... ADD VALUE` statements in
+the update script cannot run inside an extension update script on PG11 or earlier
+(PROCESS_UTILITY_QUERY context); this restriction was lifted in PG12. Because a version
+that cannot be updated to is not truly supported, PG10 and PG11 support is dropped
+entirely. cat_tools 0.3.0 supports PG12+.
 
-**When working on a new version:** review and expand this matrix. The new version's install
-script may support more PG versions, enabling testing of the upgrade path from older
-cat_tools versions on newer PostgreSQL.
+The `extension-update-test` job tests `pg: [12]` — PG12 is the oldest version where the
+0.2.2→0.3.0 update works. PG11 (and PG10) cannot run `ALTER TYPE ... ADD VALUE` in
+extension update scripts; this restriction was lifted in PG12. The 0.2.0/0.2.1 update
+paths required PG10 and can no longer be tested.
 
 ## Code Style
 

diff --git a/HISTORY.asc b/HISTORY.asc
@@ -1,7 +1,25 @@
+0.3.0
+-----
+New functions and types for working with routines and partitioned relations.
+
+### PostgreSQL Version Support
+
+**PostgreSQL 10 and 11 are no longer supported** as of this release. The 0.2.2→0.3.0
+update script adds values to existing enum types (`ALTER TYPE ... ADD VALUE`), which
+cannot run inside an extension update script on PG11 or earlier (a restriction lifted
+in PG12). Because a version that cannot be updated to is not truly supported, PG10 and
+PG11 support is dropped entirely.
+
+cat_tools 0.3.0 supports **PostgreSQL 12 through 18+**.
+
+### Changes
+
+// TODO
+
 0.2.2
 -----
 Compatibility release: fixes broken installs on PostgreSQL 11 and 12+, and
-provides an upgrade path from 0.2.0 and 0.2.1.
+provides an update path from 0.2.0 and 0.2.1.
 
 
 ### PostgreSQL Version Support
@@ -15,24 +33,24 @@ It fails on newer versions due to catalog schema changes:
 * **PG 12**: System catalog `oid` columns became visible as regular columns. Views
   using `SELECT c.*` alongside an explicit `c.oid` alias produce duplicate column names.
 
-cat_tools 0.2.2 installs and upgrades correctly on **PostgreSQL 9.2 through 18+**
+cat_tools 0.2.2 installs and updates correctly on **PostgreSQL 9.2 through 18+**
 (all currently supported versions).
 
-### Upgrade Path
+### Update Path
 
-**You must upgrade cat_tools to 0.2.2 before upgrading PostgreSQL to version 11 or
-later.** Upgrade via `ALTER EXTENSION cat_tools UPDATE`.
+**You must update cat_tools to 0.2.2 before upgrading PostgreSQL to version 11 or
+later.** Update via `ALTER EXTENSION cat_tools UPDATE`.
 
-### Upgrade Warning: Objects Depending on `cat_tools.column`
+### Update Warning: Objects Depending on `cat_tools.column`
 
 `cat_tools.column` in 0.2.0 and 0.2.1 had extra columns: an unqualified `SELECT *`
 across a `LEFT JOIN pg_constraint` accidentally pulled in all `pg_constraint` columns
-(`conname`, `contype`, etc.). The 0.2.2 upgrade fixes the column list by dropping and
+(`conname`, `contype`, etc.). The 0.2.2 update fixes the column list by dropping and
 recreating `cat_tools.column` (and its underlying `_cat_tools.column`).
 
 **If you have created any views, functions, or other objects that depend on
-`cat_tools.column`, you must drop them before upgrading and recreate them
-afterward.** The upgrade will fail with an error if any such dependent objects
+`cat_tools.column`, you must drop them before updating and recreate them
+afterward.** The update will fail with an error if any such dependent objects
 exist — this is intentional, to avoid silently breaking user-defined objects.
 After dropping your dependent objects, run `ALTER EXTENSION cat_tools UPDATE` again.
 
@@ -56,25 +74,25 @@ to PostgreSQL 12 or later.**
 
 ### Changes
 
-* `sql/cat_tools--0.1.4--0.1.5.sql` was empty; added `-- empty upgrade` placeholder so
-  PostgreSQL accepts it as a valid (no-op) upgrade script.
+* `sql/cat_tools--0.1.4--0.1.5.sql` was empty; added `-- empty update` placeholder so
+  PostgreSQL accepts it as a valid (no-op) update script.
 * `cat_tools.column` now exposes `attmissingval` as `text[]` (cast from `anyarray` on
   PG 11+, or `NULL::text[]` on older versions). Any `SELECT *` on `cat_tools.column`
   will now include this column.
 * Views rebuilt using `omit_column()` to enumerate columns explicitly, avoiding both the
   `anyarray` and duplicate-`oid` problems.
-* A direct `0.2.0 → 0.2.2` upgrade path is provided (`cat_tools--0.2.0--0.2.2.sql`),
+* A direct `0.2.0 → 0.2.2` update path is provided (`cat_tools--0.2.0--0.2.2.sql`),
   which also applies all 0.2.1 function additions in a single step.
 * `GRANT SELECT ON cat_tools.pg_extension_v TO cat_tools__usage` is now applied on the
-  upgrade path from 0.2.0 (it was absent in 0.2.0 and only added via the 0.2.1 upgrade).
+  update path from 0.2.0 (it was absent in 0.2.0 and only added via the 0.2.1 update).
 * (Re-release) `_cat_tools.pg_class_v` now explicitly omits `relhasoids` (removed in PG12)
   and `relhaspkey` (removed in PG17) to prevent `pg_upgrade` failures.
 * (Re-release) `_cat_tools.pg_attribute_v` now explicitly omits `attcacheoff` (removed in
   PG17) to prevent `pg_upgrade` failures.
 
 0.2.1
 -----
-Fix significant problems with a previous upgrade script.
+Fix significant problems with a previous update script.
 
 Add pg_extension_v and related functions.
 
@@ -114,7 +132,7 @@ objects would cascede to the extension itself.
 
 0.1.2
 -----
-=## BUGFIX: Install upgrade script
+=## BUGFIX: Install update script
 
 0.1.1
 -----

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Jim Nasby
+Copyright (c) 2016-2026 Jim Nasby
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git 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.2",
+    "version": "0.3.0",
 
     "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.2",
+            "version": "0.3.0",
 
             "X_comment": "Optional: \"abstract\": Description of the extension.",
             "abstract": "Tools for interfacing with the catalog",

diff --git 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.2",
+    "version": "0.3.0",
 
     "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.2",
+            "version": "0.3.0",
 
             "X_comment": "Optional: \"abstract\": Description of the extension.",
             "abstract": "Tools for interfacing with the catalog",

diff --git a/Makefile b/Makefile
@@ -17,16 +17,14 @@ upgrade_scripts_out = $(subst sql/,$B/,$(subst .sql.in,.sql,$(wildcard sql/*--*-
 
 # Pre-built historical install scripts (no .sql.in source available)
 DATA += sql/cat_tools--0.1.0.sql sql/cat_tools--0.1.3.sql sql/cat_tools--0.1.4.sql sql/cat_tools--0.1.5.sql
-# Generated historical install scripts (built from .sql.in source).
+# Generated install scripts (built from .sql.in source).
 # Exclude EXTENSION_VERSION_FILES (managed by control.mk) and upgrade scripts
 # ($(upgrade_scripts_out), already handled by base.mk) to avoid duplicates.
 DATA += $(filter-out $(EXTENSION_VERSION_FILES) $(upgrade_scripts_out), $(versioned_out))
 
 all: $B/cat_tools.sql $(versioned_out)
 installcheck: $B/cat_tools.sql $(versioned_out)
-EXTRA_CLEAN += $B/cat_tools.sql $(filter-out $(EXTENSION_VERSION_FILES), $(versioned_out))
-# Also clean the generated .sql.in for the current version
-EXTRA_CLEAN += $(EXTENSION_VERSION_FILES:.sql=.sql.in)
+EXTRA_CLEAN += $B/cat_tools.sql $(versioned_out)
 
 # Temporary ugly hack for 9.x — remove these two blocks when 9.x support is dropped.
 # $@ is deferred via = and expands to the target name at recipe time.
@@ -57,6 +55,7 @@ define _apply_version_seds
 		{print}' $@.tmp > $@.tmp2 && mv $@.tmp2 $@.tmp
 endef
 
+
 # TODO: refactor the version stuff into a function
 #
 # This initially creates $@.tmp before moving it into place atomically. That's
@@ -88,42 +87,6 @@ $(EXTENSION_VERSION_FILES): $(EXTENSION_VERSION_FILES:.sql=.sql.in) pgxntool/saf
 	$(_apply_version_seds)
 	mv $@.tmp $@
 
-# Support for upgrade test
-#
-# TODO: Instead of all of this stuff figure out how to pass something to
-# pg_regress that will alter the behavior of the test instead.
-TEST_BUILD_DIR = test/.build
-testdeps: $(TEST_BUILD_DIR)/dep.mk $(TEST_BUILD_DIR)/active.sql
--include $(TEST_BUILD_DIR)/dep.mk
-
-# Ensure dep.mk exists.
-$(TEST_BUILD_DIR)/dep.mk: $(TEST_BUILD_DIR)
-	echo 'TEST_LOAD_SOURCE = new' > $(TEST_BUILD_DIR)/dep.mk
-
-.PHONY: set-test-new
-set-test-new: $(TEST_BUILD_DIR)
-	echo 'TEST_LOAD_SOURCE = new' > $(TEST_BUILD_DIR)/dep.mk
-
-.PHONY: test-upgrade
-set-test-upgrade: $(TEST_BUILD_DIR)
-	echo 'TEST_LOAD_SOURCE = upgrade' > $(TEST_BUILD_DIR)/dep.mk
-
-
-$(TEST_BUILD_DIR)/active.sql: $(TEST_BUILD_DIR)/dep.mk $(TEST_BUILD_DIR)/$(TEST_LOAD_SOURCE).sql 
-	ln -sf $(TEST_LOAD_SOURCE).sql $@
-
-$(TEST_BUILD_DIR)/upgrade.sql: test/load_upgrade.sql $(TEST_BUILD_DIR) old_version
-	(echo @generated@ && cat $< && echo @generated@) | sed -e 's#@generated@#-- GENERATED FILE! DO NOT EDIT! See $<#' > $@.tmp
-	mv $@.tmp $@
-
-$(TEST_BUILD_DIR)/new.sql: test/load_new.sql $(TEST_BUILD_DIR)
-	(echo @generated@ && cat $< && echo @generated@) | sed -e 's#@generated@#-- GENERATED FILE! DO NOT EDIT! See $<#' > $@.tmp
-	mv $@.tmp $@
-
-# TODO: figure out vpath
-EXTRA_CLEAN += $(TEST_BUILD_DIR)/
-$(TEST_BUILD_DIR):
-	[ -d $@ ] || mkdir -p $@
 
 .PHONY: old_version
 old_version: $(DESTDIR)$(datadir)/extension/cat_tools--0.2.0.sql