Multi version ext/pg cron

ansible/vars.yml

@@ -9,9 +9,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.5.1.023-orioledb"
-  postgres17: "17.6.1.002"
-  postgres15: "15.14.1.002"
+  postgresorioledb-17: "17.5.1.023-orioledb-pgcron-1"
+  postgres17: "17.6.1.002-pgcron-1"
+  postgres15: "15.14.1.002-pgcron-1"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"

nix/checks.nix

@@ -308,16 +308,14 @@
             postgresql_17_src
             ;
         }
-        // pkgs.lib.optionalAttrs (system == "x86_64-linux") {
-          pg_net = import ./ext/tests/pg_net.nix {
+        // pkgs.lib.optionalAttrs (system == "x86_64-linux") (
+          {
+            devShell = self'.devShells.default;
+          }
+          // (import ./ext/tests {
             inherit self;
             inherit pkgs;
-          };
-          wrappers = import ./ext/tests/wrappers.nix {
-            inherit self;
-            inherit pkgs;
-          };
-          devShell = self'.devShells.default;
-        };
+          })
+        );
     };
 }

nix/ext/index_advisor.nix

@@ -4,6 +4,7 @@
   stdenv,
   fetchFromGitHub,
   postgresql,
+  callPackage,
 }:
 
 let
@@ -69,7 +70,8 @@ let
 in
 pkgs.buildEnv {
   name = pname;
-  paths = packages;
+  # Add dependency on hypopg for the extension to work
+  paths = packages ++ [ (callPackage ./hypopg.nix { inherit postgresql; }) ];
   pathsToLink = [
     "/lib"
     "/share/postgresql/extension"

nix/ext/pg_cron/default.nix

@@ -0,0 +1,122 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  postgresql,
+  buildEnv,
+  makeWrapper,
+  switch-ext-version,
+}:
+let
+  pname = "pg_cron";
+  allVersions = (builtins.fromJSON (builtins.readFile ../versions.json)).${pname};
+  supportedVersions = lib.filterAttrs (
+    _: value: builtins.elem (lib.versions.major postgresql.version) value.postgresql
+  ) allVersions;
+  versions = lib.naturalSort (lib.attrNames supportedVersions);
+  latestVersion = lib.last versions;
+  numberOfVersions = builtins.length versions;
+  build =
+    version: versionData:
+    stdenv.mkDerivation rec {
+      inherit pname version;
+
+      buildInputs = [ postgresql ];
+
+      src = fetchFromGitHub {
+        owner = "citusdata";
+        repo = pname;
+        rev = versionData.rev or "v${version}";
+        hash = versionData.hash;
+      };
+
+      patches = map (p: ./. + "/${p}") (versionData.patches or [ ]);
+
+      buildPhase = ''
+        make PG_CONFIG=${postgresql}/bin/pg_config
+      '';
+
+      installPhase = ''
+        mkdir -p $out/{lib,share/postgresql/extension}
+
+        # Install versioned library
+        install -Dm755 ${pname}${postgresql.dlSuffix} $out/lib/${pname}-${version}${postgresql.dlSuffix}
+
+
+        if [[ "${version}" == "${latestVersion}" ]]; then
+          cp ${pname}.sql $out/share/postgresql/extension/${pname}--1.0.0.sql
+          # Install upgrade scripts
+          find . -name 'pg_cron--*--*.sql' -exec install -Dm644 {} $out/share/postgresql/extension/ \;
+          mv $out/share/postgresql/extension/pg_cron--1.0--1.1.sql $out/share/postgresql/extension/pg_cron--1.0.0--1.1.0.sql
+          mv $out/share/postgresql/extension/pg_cron--1.1--1.2.sql $out/share/postgresql/extension/pg_cron--1.1.0--1.2.0.sql
+          mv $out/share/postgresql/extension/pg_cron--1.2--1.3.sql $out/share/postgresql/extension/pg_cron--1.2.0--1.3.1.sql
+          mv $out/share/postgresql/extension/pg_cron--1.3--1.4.sql $out/share/postgresql/extension/pg_cron--1.3.1--1.4.2.sql
+          mv $out/share/postgresql/extension/pg_cron--1.4--1.4-1.sql $out/share/postgresql/extension/pg_cron--1.4.0--1.4.1.sql
+          mv $out/share/postgresql/extension/pg_cron--1.4-1--1.5.sql $out/share/postgresql/extension/pg_cron--1.4.2--1.5.2.sql
+          mv $out/share/postgresql/extension/pg_cron--1.5--1.6.sql $out/share/postgresql/extension/pg_cron--1.5.2--1.6.4.sql
+        fi
+
+        # Create versioned control file with modified module path
+        sed -e "/^default_version =/d" \
+            -e "/^schema =/d" \
+            -e "s|^module_pathname = .*|module_pathname = '\$libdir/${pname}'|" \
+          ${pname}.control > $out/share/postgresql/extension/${pname}--${version}.control
+      '';
+
+      meta = with lib; {
+        description = "Run Cron jobs through PostgreSQL";
+        homepage = "https://github.com/citusdata/pg_cron";
+        changelog = "https://github.com/citusdata/pg_cron/raw/v${version}/CHANGELOG.md";
+        platforms = postgresql.meta.platforms;
+        license = licenses.postgresql;
+      };
+    };
+  packages = builtins.attrValues (lib.mapAttrs (name: value: build name value) supportedVersions);
+in
+buildEnv {
+  name = pname;
+  paths = packages;
+  nativeBuildInputs = [ makeWrapper ];
+
+  pathsToLink = [
+    "/lib"
+    "/share/postgresql/extension"
+  ];
+
+  postBuild = ''
+    {
+      echo "default_version = '${latestVersion}'"
+      cat $out/share/postgresql/extension/${pname}--${latestVersion}.control
+    } > $out/share/postgresql/extension/${pname}.control
+    ln -sfn ${pname}-${latestVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
+
+    # checks
+    (set -x
+       test "$(ls -A $out/lib/${pname}*${postgresql.dlSuffix} | wc -l)" = "${
+         toString (numberOfVersions + 1)
+       }"
+    )
+
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_pg_cron_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
+  '';
+
+  meta = with lib; {
+    description = "Run Cron jobs through PostgreSQL (multi-version compatible)";
+    homepage = "https://github.com/citusdata/pg_cron";
+    platforms = postgresql.meta.platforms;
+    license = licenses.postgresql;
+  };
+
+  passthru = {
+    inherit versions numberOfVersions switch-ext-version;
+    pname = "${pname}-all";
+    hasBackgroundWorker = true;
+    defaultSettings = {
+      shared_preload_libraries = [ "pg_cron" ];
+      "cron.database_name" = "postgres";
+    };
+    version =
+      "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
+  };
+}

nix/ext/pg_cron/pg_cron-1.3.1-pg15.patch

@@ -0,0 +1,31 @@
+diff --git a/src/pg_cron.c b/src/pg_cron.c
+index e0ca973..4d51b2c 100644
+--- a/src/pg_cron.c
++++ b/src/pg_cron.c
+@@ -14,6 +14,8 @@
+ #include <sys/resource.h>
+
+ #include "postgres.h"
++#include "commands/async.h"
++#include "miscadmin.h"
+ #include "fmgr.h"
+
+ /* these are always necessary for a bgworker */
+@@ -1908,7 +1910,7 @@ CronBackgroundWorker(Datum main_arg)
+ 	/* Post-execution cleanup. */
+ 	disable_timeout(STATEMENT_TIMEOUT, false);
+ 	CommitTransactionCommand();
+-	ProcessCompletedNotifies();
++	/* ProcessCompletedNotifies removed */
+ 	pgstat_report_activity(STATE_IDLE, command);
+ 	pgstat_report_stat(true);
+
+@@ -2025,7 +2027,7 @@ ExecuteSqlString(const char *sql)
+ 		 */
+ 		oldcontext = MemoryContextSwitchTo(parsecontext);
+ 		#if PG_VERSION_NUM >= 100000
+-			querytree_list = pg_analyze_and_rewrite(parsetree, sql, NULL, 0,NULL);
++			querytree_list = pg_analyze_and_rewrite_fixedparams(parsetree, sql, NULL, 0, NULL);
+ 		#else
+ 			querytree_list = pg_analyze_and_rewrite(parsetree, sql, NULL, 0);
+ 		#endif

nix/ext/pg_net.nix

@@ -6,111 +6,11 @@
   curl,
   postgresql,
   libuv,
-  writeShellApplication,
   makeWrapper,
+  switch-ext-version,
 }:
 
 let
-  enableOverlayOnPackage = writeShellApplication {
-    name = "enable_overlay_on_package";
-    runtimeInputs = [ pkgs.coreutils ];
-    text = ''
-      # This script enable overlayfs on a specific nix store path
-      set -euo pipefail
-
-      if [ $# -ne 1 ]; then
-        echo "Usage: $0 <path>"
-        exit 1
-      fi
-
-      PACKAGE_PATH="$1"
-      PACKAGE_NAME=$(basename "$1"|cut -c 34-)
-
-      # Nixos compatibility: use systemd mount unit
-      #shellcheck disable=SC1091
-      source /etc/os-release || true
-      if [[ "$ID" == "nixos" ]]; then
-        # This script is used in NixOS test only for the moment
-        SYSTEMD_DIR="/run/systemd/system"
-      else
-        SYSTEMD_DIR="/etc/systemd/system"
-      fi
-
-      # Create required directories for overlay
-      echo "$PACKAGE_NAME"
-      mkdir -p "/var/lib/overlay/$PACKAGE_NAME/"{upper,work}
-
-      PACKAGE_MOUNT_PATH=$(systemd-escape -p --suffix=mount "$PACKAGE_PATH")
-
-      cat > "$SYSTEMD_DIR/$PACKAGE_MOUNT_PATH" <<EOF
-      [Unit]
-      Description=Overlay mount for PostgreSQL extension $PACKAGE_NAME
-
-      [Mount]
-      What=overlay
-      Type=overlay
-      Options=lowerdir=$PACKAGE_PATH,upperdir=/var/lib/overlay/$PACKAGE_NAME/upper,workdir=/var/lib/overlay/$PACKAGE_NAME/work
-
-      [Install]
-      WantedBy=multi-user.target
-      EOF
-
-      systemctl daemon-reload
-      systemctl start "$PACKAGE_MOUNT_PATH"
-    '';
-  };
-  switchPgNetVersion = writeShellApplication {
-    name = "switch_pg_net_version";
-    runtimeInputs = [ pkgs.coreutils ];
-    text = ''
-      # Create version switcher script
-      set -euo pipefail
-
-      # Check if the required environment variables are set
-      if [ -z "''${EXT_WRAPPER:-}" ]; then
-        echo "Error: EXT_WRAPPER environment variable is not set."
-        exit 1
-      fi
-
-      if [ $# -ne 1 ]; then
-        echo "Usage: $0 <version>"
-        echo "Example: $0 0.10.0"
-        echo ""
-        echo "Optional environment variables:"
-        echo "  NIX_PROFILE - Path to nix profile (default: /var/lib/postgresql/.nix-profile)"
-        echo "  LIB_DIR - Override library directory"
-        echo "  EXTENSION_DIR - Override extension directory"
-        exit 1
-      fi
-
-      VERSION="$1"
-      echo "$VERSION"
-
-      # Enable overlay on the wrapper package to be able to switch version
-      ${lib.getExe enableOverlayOnPackage} "$EXT_WRAPPER"
-
-      # Check if version exists
-      EXT_WRAPPER_LIB="$EXT_WRAPPER/lib"
-      PG_NET_LIB_TO_USE="$EXT_WRAPPER_LIB/pg_net-$VERSION${postgresql.dlSuffix}"
-      if [ ! -f "$PG_NET_LIB_TO_USE" ]; then
-        echo "Error: Version $VERSION not found in $EXT_WRAPPER_LIB"
-        echo "Available versions:"
-        #shellcheck disable=SC2012
-        ls "$EXT_WRAPPER_LIB"/pg_net-*${postgresql.dlSuffix} 2>/dev/null | sed 's/.*pg_net-/  /' | sed 's/${postgresql.dlSuffix}$//' || echo "  No versions found"
-        exit 1
-      fi
-
-      # Update library symlink
-      ln -sfnv "$PG_NET_LIB_TO_USE" "$EXT_WRAPPER_LIB/pg_net${postgresql.dlSuffix}"
-
-      # Update control file
-      EXT_WRAPPER_SHARE="$EXT_WRAPPER/share/postgresql/extension"
-      echo "default_version = '$VERSION'" > "$EXT_WRAPPER_SHARE/pg_net.control"
-      cat "$EXT_WRAPPER_SHARE/pg_net--$VERSION.control" >> "$EXT_WRAPPER_SHARE/pg_net.control"
-
-      echo "Successfully switched pg_net to version $VERSION"
-    '';
-  };
   pname = "pg_net";
   build =
     version: hash:
@@ -211,13 +111,17 @@ pkgs.buildEnv {
        }"
     )
 
-    makeWrapper ${lib.getExe switchPgNetVersion} $out/bin/switch_pg_net_version \
-      --prefix EXT_WRAPPER : "$out"
+    makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_pg_net_version \
+      --prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
   '';
 
   passthru = {
-    inherit versions numberOfVersions switchPgNetVersion;
+    inherit versions numberOfVersions;
     pname = "${pname}-all";
+    hasBackgroundWorker = true;
+    defaultSettings = {
+      shared_preload_libraries = [ "pg_net" ];
+    };
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };