Skip to content

Commit b4dc629

Browse files
committed
chore: preserve plv8 upgrade path; fix wrappers upgrades
1 parent fd20ea8 commit b4dc629

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

nix/ext/plv8.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
104104
mv "$out/nix/store"/*/* "$out"
105105
rmdir "$out/nix/store"/* "$out/nix/store" "$out/nix"
106106
mv "$out/lib/plv8-${finalAttrs.version}.so" "$out/lib/plv8.so"
107+
ln -s "$out/lib/plv8.so" "$out/lib/plv8-${finalAttrs.version}.so"
107108
sed -i 's|module_pathname = '"'"'$libdir/plv8-[0-9.]*'"'"'|module_pathname = '"'"'$libdir/plv8'"'"'|' "$out/share/postgresql/extension/plv8.control"
108109
sed -i 's|module_pathname = '"'"'$libdir/plv8-[0-9.]*'"'"'|module_pathname = '"'"'$libdir/plv8'"'"'|' "$out/share/postgresql/extension/plcoffee.control"
109110
sed -i 's|module_pathname = '"'"'$libdir/plv8-[0-9.]*'"'"'|module_pathname = '"'"'$libdir/plv8'"'"'|' "$out/share/postgresql/extension/plls.control"

nix/ext/wrappers/default.nix

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,22 @@ postInstall = ''
9090
echo "Warning: $main_sql_file not found"
9191
fi
9292
93-
rm git_tags.txt
9493
mv $out/lib/wrappers-${version}.so $out/lib/wrappers.so
95-
94+
95+
echo "Creating wrappers.so symlinks to support pg_upgrade..."
96+
if [ -f "$out/lib/wrappers.so" ]; then
97+
while read -r previous_version; do
98+
if [ "$(printf '%s\n' "$previous_version" "$current_version" | sort -V | head -n1)" = "$previous_version" ] && [ "$previous_version" != "$current_version" ]; then
99+
new_file="$out/lib/wrappers-$previous_version.so"
100+
echo "Creating $new_file"
101+
ln -s "$out/lib/wrappers.so" "$new_file"
102+
fi
103+
done < git_tags.txt
104+
else
105+
echo "Warning: $out/lib/wrappers.so not found"
106+
fi
107+
rm git_tags.txt
108+
96109
echo "Contents of updated wrappers.control:"
97110
cat "$out/share/postgresql/extension/wrappers.control"
98111

0 commit comments

Comments
 (0)