feat: support multiple versions of the pg_repack extension

ansible/vars.yml

@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.5.1.047-orioledb"
-  postgres17: "17.6.1.026"
-  postgres15: "15.14.1.026"
+  postgresorioledb-17: "17.5.1.048-orioledb"
+  postgres17: "17.6.1.027"
+  postgres15: "15.14.1.027"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.19.0

nix/ext/pg_repack.nix

@@ -5,57 +5,133 @@
   postgresql,
   postgresqlTestHook,
   testers,
+  buildEnv,
 }:
-
-stdenv.mkDerivation (finalAttrs: {
+let
   pname = "pg_repack";
-  version = "1.5.2";
 
-  buildInputs = postgresql.buildInputs ++ [ postgresql ];
+  # Load version configuration from external file
+  allVersions = (builtins.fromJSON (builtins.readFile ./versions.json)).${pname};
 
-  src = fetchFromGitHub {
-    owner = "reorg";
-    repo = "pg_repack";
-    rev = "ver_${finalAttrs.version}";
-    hash = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA=";
-  };
+  # Filter versions compatible with current PostgreSQL version
+  supportedVersions = lib.filterAttrs (
+    _: value: builtins.elem (lib.versions.major postgresql.version) value.postgresql
+  ) allVersions;
 
-  installPhase = ''
-    install -D bin/pg_repack -t $out/bin/
-    install -D lib/pg_repack${postgresql.dlSuffix} -t $out/lib/
-    install -D lib/{pg_repack--${finalAttrs.version}.sql,pg_repack.control} -t $out/share/postgresql/extension
-  '';
+  # Derived version information
+  versions = lib.naturalSort (lib.attrNames supportedVersions);
+  latestVersion = lib.last versions;
+  numberOfVersions = builtins.length versions;
+  packages = builtins.attrValues (
+    lib.mapAttrs (name: value: build name value.hash) supportedVersions
+  );
+
+  # Build function for individual versions
+  build =
+    version: hash:
+    stdenv.mkDerivation (finalAttrs: {
+      inherit pname version;
+
+      buildInputs = postgresql.buildInputs ++ [ postgresql ];
+
+      src = fetchFromGitHub {
+        owner = "reorg";
+        repo = "pg_repack";
+        rev = "ver_${finalAttrs.version}";
+        inherit hash;
+      };
+
+      installPhase = ''
+        mkdir -p $out/{lib,share/postgresql/extension,bin}
+
+        mv bin/${pname} $out/bin/${pname}-${version}
+
+        # Install shared library with version suffix
+        mv lib/${pname}${postgresql.dlSuffix} $out/lib/${pname}-${version}${postgresql.dlSuffix}
 
-  passthru.tests = {
-    version = testers.testVersion { package = finalAttrs.finalPackage; };
-    extension = stdenv.mkDerivation {
-      name = "plpgsql-check-test";
-      dontUnpack = true;
-      doCheck = true;
-      buildInputs = [ postgresqlTestHook ];
-      nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.pg_repack ])) ];
-      postgresqlTestUserOptions = "LOGIN SUPERUSER";
-      failureHook = "postgresqlStop";
-      checkPhase = ''
-        runHook preCheck
-        psql -a -v ON_ERROR_STOP=1 -c "CREATE EXTENSION pg_repack;"
-        runHook postCheck
+        # Create version-specific control file
+        sed -e "/^default_version =/d" \
+            -e "s|^module_pathname = .*|module_pathname = '\$libdir/${pname}-${version}'|" \
+          lib/${pname}.control > $out/share/postgresql/extension/${pname}--${version}.control
+
+        # Copy SQL install script
+        cp lib/${pname}--${version}.sql $out/share/postgresql/extension
+
+        # For the latest version, create default control file and symlink and copy SQL upgrade scripts
+        if [[ "${version}" == "${latestVersion}" ]]; then
+          {
+            echo "default_version = '${version}'"
+            cat $out/share/postgresql/extension/${pname}--${version}.control
+          } > $out/share/postgresql/extension/${pname}.control
+          ln -sfn ${pname}-${latestVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
+          ln -sfn $out/bin/${pname}-${latestVersion} $out/bin/${pname}
+        fi
+        #install -D bin/pg_repack -t $out/bin/
+        #install -D lib/pg_repack${postgresql.dlSuffix} -t $out/lib/
+        #install -D lib/{pg_repack--${finalAttrs.version}.sql,pg_repack.control} -t $out/share/postgresql/extension
       '';
-      installPhase = "touch $out";
-    };
-  };
 
-  meta = with lib; {
-    description = "Reorganize tables in PostgreSQL databases with minimal locks";
-    longDescription = ''
-      pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore
-      the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an
-      exclusive lock on the processed tables during processing. pg_repack is efficient to boot,
-      with performance comparable to using CLUSTER directly.
-    '';
-    homepage = "https://github.com/reorg/pg_repack";
-    license = licenses.bsd3;
-    inherit (postgresql.meta) platforms;
-    mainProgram = "pg_repack";
+      passthru.tests = {
+        version = testers.testVersion { package = finalAttrs.finalPackage; };
+        extension = stdenv.mkDerivation {
+          name = "plpgsql-check-test";
+          dontUnpack = true;
+          doCheck = true;
+          buildInputs = [ postgresqlTestHook ];
+          nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.pg_repack ])) ];
+          postgresqlTestUserOptions = "LOGIN SUPERUSER";
+          failureHook = "postgresqlStop";
+          checkPhase = ''
+            runHook preCheck
+            psql -a -v ON_ERROR_STOP=1 -c "CREATE EXTENSION pg_repack;"
+            runHook postCheck
+          '';
+          installPhase = "touch $out";
+        };
+      };
+
+      meta = with lib; {
+        description = "Reorganize tables in PostgreSQL databases with minimal locks";
+        longDescription = ''
+          pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore
+          the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an
+          exclusive lock on the processed tables during processing. pg_repack is efficient to boot,
+          with performance comparable to using CLUSTER directly.
+        '';
+        homepage = "https://github.com/reorg/pg_repack";
+        license = licenses.bsd3;
+        inherit (postgresql.meta) platforms;
+        mainProgram = "pg_repack";
+      };
+    });
+in
+buildEnv {
+  name = pname;
+  paths = packages;
+
+  pathsToLink = [
+    "/bin"
+    "/lib"
+    "/share/postgresql/extension"
+  ];
+
+  postBuild = ''
+    # Verify all expected library files are present
+    expectedFiles=${toString (numberOfVersions + 1)}
+    actualFiles=$(ls -l $out/lib/${pname}*${postgresql.dlSuffix} | wc -l)
+
+    if [[ "$actualFiles" != "$expectedFiles" ]]; then
+      echo "Error: Expected $expectedFiles library files, found $actualFiles"
+      echo "Files found:"
+      ls -la $out/lib/*${postgresql.dlSuffix} || true
+      exit 1
+    fi
+  '';
+
+  passthru = {
+    inherit versions numberOfVersions;
+    pname = "${pname}-all";
+    version =
+      "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
-})
+}

nix/ext/tests/pg_repack.nix

@@ -0,0 +1,154 @@
+{ self, pkgs }:
+let
+  pname = "pg_repack";
+  inherit (pkgs) lib;
+  installedExtension =
+    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+  versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
+  postgresqlWithExtension =
+    postgresql:
+    let
+      majorVersion = lib.versions.major postgresql.version;
+      pkg = pkgs.buildEnv {
+        name = "postgresql-${majorVersion}-${pname}";
+        paths = [
+          postgresql
+          postgresql.lib
+          (installedExtension majorVersion)
+        ];
+        passthru = {
+          inherit (postgresql) version psqlSchema;
+          lib = pkg;
+          withPackages = _: pkg;
+        };
+        nativeBuildInputs = [ pkgs.makeWrapper ];
+        pathsToLink = [
+          "/"
+          "/bin"
+          "/lib"
+        ];
+        postBuild = ''
+          wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib
+          wrapProgram $out/bin/pg_ctl --set NIX_PGLIBDIR $out/lib
+          wrapProgram $out/bin/pg_upgrade --set NIX_PGLIBDIR $out/lib
+        '';
+      };
+    in
+    pkg;
+in
+self.inputs.nixpkgs.lib.nixos.runTest {
+  name = pname;
+  hostPkgs = pkgs;
+  nodes.server =
+    { config, ... }:
+    {
+      virtualisation = {
+        forwardPorts = [
+          {
+            from = "host";
+            host.port = 13022;
+            guest.port = 22;
+          }
+        ];
+      };
+      services.openssh = {
+        enable = true;
+      };
+
+      services.postgresql = {
+        enable = true;
+        package = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15;
+        enableTCPIP = true;
+        initialScript = pkgs.writeText "init-postgres-with-password" ''
+          CREATE USER test WITH PASSWORD 'secret';
+        '';
+        authentication = ''
+          host test postgres samenet scram-sha-256
+        '';
+      };
+
+      networking.firewall.allowedTCPPorts = [ config.services.postgresql.settings.port ];
+
+      specialisation.postgresql17.configuration = {
+        services.postgresql = {
+          package = lib.mkForce (postgresqlWithExtension self.packages.${pkgs.system}.postgresql_17);
+        };
+
+        systemd.services.postgresql-migrate = {
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+            User = "postgres";
+            Group = "postgres";
+            StateDirectory = "postgresql";
+            WorkingDirectory = "${builtins.dirOf config.services.postgresql.dataDir}";
+          };
+          script =
+            let
+              oldPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15;
+              newPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_17;
+              oldDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${oldPostgresql.psqlSchema}";
+              newDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${newPostgresql.psqlSchema}";
+            in
+            ''
+              if [[ ! -d ${newDataDir} ]]; then
+                install -d -m 0700 -o postgres -g postgres "${newDataDir}"
+                ${newPostgresql}/bin/initdb -D "${newDataDir}"
+                ${newPostgresql}/bin/pg_upgrade --old-datadir "${oldDataDir}" --new-datadir "${newDataDir}" \
+                  --old-bindir "${oldPostgresql}/bin" --new-bindir "${newPostgresql}/bin"
+              else
+                echo "${newDataDir} already exists"
+              fi
+            '';
+        };
+
+        systemd.services.postgresql = {
+          after = [ "postgresql-migrate.service" ];
+          requires = [ "postgresql-migrate.service" ];
+        };
+      };
+    };
+  testScript =
+    { nodes, ... }:
+    let
+      pg17-configuration = "${nodes.server.system.build.toplevel}/specialisation/postgresql17";
+    in
+    ''
+      from pathlib import Path
+      versions = {
+        "15": [${lib.concatStringsSep ", " (map (s: ''"${s}"'') (versions "15"))}],
+        "17": [${lib.concatStringsSep ", " (map (s: ''"${s}"'') (versions "17"))}],
+      }
+      extension_name = "${pname}"
+      support_upgrade = False
+      pg17_configuration = "${pg17-configuration}"
+      sql_test_directory = Path("${../../tests}")
+
+      ${builtins.readFile ./lib.py}
+
+      start_all()
+
+      server.wait_for_unit("multi-user.target")
+      server.wait_for_unit("postgresql.service")
+
+      test = PostgresExtensionTest(server, extension_name, versions, sql_test_directory, support_upgrade)
+
+      with subtest("Check upgrade path with postgresql 15"):
+        test.check_upgrade_path("15")
+
+      last_version = None
+      with subtest("Check the install of the last version of the extension"):
+        last_version = test.check_install_last_version("15")
+
+      with subtest("switch to postgresql 17"):
+        server.succeed(
+          f"{pg17_configuration}/bin/switch-to-configuration test >&2"
+        )
+
+      with subtest("Check last version of the extension after upgrade"):
+        test.assert_version_matches(last_version)
+
+      with subtest("Check upgrade path with postgresql 17"):
+        test.check_upgrade_path("17")
+    '';
+}

nix/ext/versions.json

@@ -576,5 +576,35 @@
       "pgrx": "0.16.0",
       "rust": "1.87.0"
     }
+  },
+  "pg_repack": {
+    "1.4.8": {
+      "postgresql": [
+        "15",
+        "17"
+      ],
+      "hash": "sha256-Et8aMRzG7ez0uy9wG6qsg57/kPPZdUhb+/gFxW86D08="
+    },
+    "1.5.0": {
+      "postgresql": [
+        "15",
+        "17"
+      ],
+      "hash": "sha256-do80phyMxwcRIkYyUt9z02z7byNQhK+pbSaCUmzG+4c="
+    },
+    "1.5.1": {
+      "postgresql": [
+        "15",
+        "17"
+      ],
+      "hash": "sha256-wJwy4qIt6/kgWqT6HbckUVqDayDkixqHpYiC1liLERw="
+    },
+    "1.5.2": {
+      "postgresql": [
+        "15",
+        "17"
+      ],
+      "hash": "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA="
+    }
   }
 }