From ef2e29d67fc2177493049f4ddae27719980df22b Mon Sep 17 00:00:00 2001
From: jnasbyupgrade <jnasby@upgrade.com>
Date: Wed, 5 Aug 2026 18:08:13 -0500
Subject: [PATCH] Makefile: cat_tools install override, default behavior
 unchanged

Redesign of the original fix: that version unconditionally replaced
the default pgxn install with a git-source build for every consumer of
this Makefile, not just CI. Reverted to that concern: the default
cat_tools recipe is exactly what it was before (plain
`pgxn install 'cat_tools>=0.2.1' --sudo`), gated on the same
prerequisite file it always was.

Two new, empty-by-default variables give CI an explicit opt-in without
touching that default:
- CAT_TOOLS_GIT_REF: when set, installs cat_tools from that git ref
  instead of PGXN (for when PGXN's published listing lags what's
  actually needed -- CI sets this, nothing else does).
- CAT_TOOLS_SKIP_INSTALL: when set, skips installing cat_tools at all
  (for pg_tle-mode CI, where cat_tools is already provided via pg_tle
  registration and a filesystem install as a side effect would defeat
  the point of the test).

No META/version-floor changes here -- that's a separate concern,
handled where it belongs (the version-pin PR).
---
 Makefile | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index faf7681..07a0f45 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,34 @@ $(DESTDIR)$datadir)/extension/extension_drop_test.control:
 deps: cat_tools
 install: deps
 
+# CAT_TOOLS_GIT_REF, if set, installs cat_tools from that git ref instead of
+# PGXN -- an explicit, opt-in override for a caller (CI) that needs a
+# cat_tools newer than what's published on PGXN, without changing the
+# default `pgxn install` behavior every other caller of this Makefile gets.
+# Empty (the default) means: behave exactly as before, plain `pgxn install`.
+#
+# CAT_TOOLS_SKIP_INSTALL, if non-empty, skips installing cat_tools at all --
+# for a caller (pg_tle-mode CI) where cat_tools is already provided some
+# other way (e.g. pg_tle registration) and a filesystem install as a side
+# effect would defeat the point of the test.
+CAT_TOOLS_GIT_REF ?=
+CAT_TOOLS_SKIP_INSTALL ?=
+CAT_TOOLS_BUILD_DIR = tmp/cat_tools-build
+
 .PHONY: cat_tools
 cat_tools: $(DESTDIR)$(datadir)/extension/cat_tools.control
 $(DESTDIR)$(datadir)/extension/cat_tools.control:
-	pgxn install 'cat_tools>=0.2.1' --sudo
+	if [ -n "$(CAT_TOOLS_SKIP_INSTALL)" ]; then \
+		: ; \
+	elif [ -n "$(CAT_TOOLS_GIT_REF)" ]; then \
+		rm -rf $(CAT_TOOLS_BUILD_DIR); \
+		git clone https://github.com/Postgres-Extensions/cat_tools.git $(CAT_TOOLS_BUILD_DIR); \
+		git -C $(CAT_TOOLS_BUILD_DIR) checkout $(CAT_TOOLS_GIT_REF); \
+		make -C $(CAT_TOOLS_BUILD_DIR) install PG_CONFIG=$(PG_CONFIG) DESTDIR=$(DESTDIR); \
+		rm -rf $(CAT_TOOLS_BUILD_DIR); \
+	else \
+		pgxn install 'cat_tools>=0.2.1' --sudo; \
+	fi
 
 # Style linter (see https://github.com/Postgres-Extensions/linter, vendored
 # at .vendor/linter -- lint.mk is the thin local hand-off, see its comment).