postgresql: use structuredAttrs instead of passAsFile in tests (#515386)

This commit is contained in:
Maximilian Bosch
2026-05-01 13:11:49 +00:00
committed by GitHub
3 changed files with 9 additions and 3 deletions
+3 -1
View File
@@ -10,7 +10,6 @@ stdenv.mkDerivation {
nativeCheckInputs = [ postgresql ];
dontUnpack = true;
doCheck = true;
passAsFile = [ "sql" ];
sql = ''
CREATE TABLE hello (
message text
@@ -23,6 +22,8 @@ stdenv.mkDerivation {
'';
checkPhase = ''
runHook preCheck
sqlPath=$TMPDIR/test.sql
printf "%s" "$sql" > $sqlPath
psql <$sqlPath | grep 'it worked'
TEST_RAN=1
runHook postCheck
@@ -31,4 +32,5 @@ stdenv.mkDerivation {
[[ $TEST_RAN == 1 && $TEST_POST_HOOK_RAN == 1 ]]
touch $out
'';
__structuredAttrs = true;
}
+3 -1
View File
@@ -35,7 +35,6 @@ postgresqlBuildExtension (finalAttrs: {
postgresqlTestHook
(postgresql.withPackages (_: [ finalAttrs.finalPackage ]))
];
passAsFile = [ "sql" ];
sql = ''
CREATE EXTENSION pgtap;
@@ -47,10 +46,13 @@ postgresqlBuildExtension (finalAttrs: {
'';
checkPhase = ''
runHook preCheck
sqlPath=$TMPDIR/test.sql
printf "%s" "$sql" > $sqlPath
psql -a -v ON_ERROR_STOP=1 -f $sqlPath
runHook postCheck
'';
installPhase = "touch $out";
__structuredAttrs = true;
};
meta = {
@@ -22,7 +22,6 @@ stdenvNoCC.mkDerivation (
(postgresql.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages)))
];
postgresqlTestUserOptions = "LOGIN SUPERUSER";
passAsFile = [ "sql" ];
sql =
sql
+ lib.concatMapStrings (
@@ -39,10 +38,13 @@ stdenvNoCC.mkDerivation (
) asserts;
checkPhase = ''
runHook preCheck
sqlPath=$TMPDIR/test.sql
printf "%s" "$sql" > $sqlPath
psql -a -v ON_ERROR_STOP=1 -f "$sqlPath"
runHook postCheck
'';
installPhase = "touch $out";
__structuredAttrs = true;
}
// lib.removeAttrs extraArgs [
"asserts"