|
27 | 27 | # deadnix: skip |
28 | 28 | makeCheckHarness = |
29 | 29 | pgpkg: |
30 | | - # legacyPkgName: the name used in legacyPackages (e.g., "psql_17" or "psql_17_slim") |
31 | 30 | { |
32 | 31 | isCliVariant ? false, |
33 | | - legacyPkgName ? null, |
| 32 | + isSlim ? false, |
34 | 33 | }: |
35 | 34 | let |
36 | 35 | pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP; |
|
75 | 74 | ''; |
76 | 75 | }; |
77 | 76 |
|
78 | | - # Get the major version for filtering |
79 | | - majorVersion = |
80 | | - let |
81 | | - version = builtins.trace "pgpkg.version is: ${pgpkg.version}" pgpkg.version; |
82 | | - isOrioledbMatch = builtins.match "^17_[0-9]+$" version != null; |
83 | | - isSeventeenMatch = builtins.match "^17[.][0-9]+$" version != null; |
84 | | - result = |
85 | | - if isOrioledbMatch then |
86 | | - "orioledb-17" |
87 | | - else if isSeventeenMatch then |
88 | | - "17" |
89 | | - else |
90 | | - "15"; |
91 | | - in |
92 | | - builtins.trace "Major version result: ${result}" result; |
93 | | - |
94 | | - # Determine the legacy package name for selecting extensions |
95 | | - effectiveLegacyPkgName = if legacyPkgName != null then legacyPkgName else "psql_${majorVersion}"; |
96 | | - |
97 | | - # Select the appropriate pgroonga package for this PostgreSQL version |
98 | | - pgroonga = self'.legacyPackages.${effectiveLegacyPkgName}.exts.pgroonga; |
| 77 | + pgroonga = self'.legacyPackages."psql_${pgpkg.version}".exts.pgroonga; |
| 78 | + supautils = self'.legacyPackages."psql_${pgpkg.version}".exts.supautils; |
99 | 79 |
|
100 | 80 | # Use different ports to allow parallel test runs |
101 | 81 | # slim packages get their own ports to avoid conflicts |
102 | | - isSlim = lib.hasSuffix "_slim" effectiveLegacyPkgName; |
103 | 82 | pgPort = |
104 | | - if (majorVersion == "17" && isSlim) then |
| 83 | + if (pgpkg.version == "17" && isSlim) then |
105 | 84 | "5538" |
106 | | - else if (majorVersion == "15" && isSlim) then |
| 85 | + else if (pgpkg.version == "15" && isSlim) then |
107 | 86 | "5539" |
108 | | - else if (majorVersion == "orioledb-17" && isSlim) then |
| 87 | + else if (pgpkg.version == "orioledb-17" && isSlim) then |
109 | 88 | "5540" |
110 | | - else if (majorVersion == "17" && isCliVariant) then |
| 89 | + else if (pgpkg.version == "17" && isCliVariant) then |
111 | 90 | "5541" |
112 | | - else if (majorVersion == "17") then |
| 91 | + else if (pgpkg.version == "17") then |
113 | 92 | "5535" |
114 | | - else if (majorVersion == "15") then |
| 93 | + else if (pgpkg.version == "15") then |
115 | 94 | "5536" |
116 | 95 | else |
117 | 96 | "5537"; |
|
134 | 113 | "pg_tle" |
135 | 114 | "plan_filter" |
136 | 115 | "supabase_vault" |
137 | | - "supautils" |
138 | 116 | ) |
139 | 117 |
|
140 | 118 | # Extract available extensions from receipt |
|
165 | 143 | }; |
166 | 144 | }; |
167 | 145 |
|
168 | | - getVersionArg = |
169 | | - pkg: |
170 | | - let |
171 | | - name = pkg.version; |
172 | | - in |
173 | | - # Check orioledb first since "17_15" would match "17.*" pattern |
174 | | - if builtins.match "17_[0-9]+" name != null then |
175 | | - "orioledb-17" |
176 | | - else if builtins.match "15.*" name != null then |
177 | | - "15" |
178 | | - else if builtins.match "17.*" name != null then |
179 | | - "17" |
180 | | - else |
181 | | - throw "Unsupported PostgreSQL version: ${name}"; |
182 | | - |
183 | 146 | # Tests to skip for OrioleDB (not compatible with OrioleDB storage) |
184 | 147 | orioledbSkipTests = [ |
185 | 148 | "index_advisor" # index_advisor doesn't support OrioleDB tables |
|
226 | 189 | pkgs.lib.filterAttrs (name: _: isValidFile name) files; |
227 | 190 |
|
228 | 191 | # Filter SQL test files |
229 | | - filteredSqlTests = filterTestFiles majorVersion ./tests/sql; |
| 192 | + filteredSqlTests = filterTestFiles pgpkg.version ./tests/sql; |
230 | 193 |
|
231 | 194 | # Tests to skip for CLI variants (require extensions not in CLI) |
232 | 195 | cliSkipTests = [ |
|
399 | 362 | substitute ${./tests/postgresql.conf.in} "$PGTAP_CLUSTER"/postgresql.conf \ |
400 | 363 | --subst-var-by PGSODIUM_GETKEY_SCRIPT "${getkey-script}/bin/pgsodium-getkey" \ |
401 | 364 | --subst-var-by PRELOAD_LIBRARIES "$PRELOAD_LIBRARIES" |
402 | | - echo "listen_addresses = '127.0.0.1'" >> "$PGTAP_CLUSTER"/postgresql.conf |
403 | | - echo "port = ${pgPort}" >> "$PGTAP_CLUSTER"/postgresql.conf |
| 365 | + { |
| 366 | + echo "listen_addresses = '127.0.0.1'" |
| 367 | + echo "port = ${pgPort}" |
| 368 | + echo "session_preload_libraries = 'supautils'" |
| 369 | + echo "dynamic_library_path = '${supautils}/lib:\$libdir'" |
| 370 | + } >> "$PGTAP_CLUSTER"/postgresql.conf |
404 | 371 | echo "host all all 127.0.0.1/32 trust" >> "$PGTAP_CLUSTER/pg_hba.conf" |
405 | 372 | log info "Checking shared_preload_libraries setting:" |
406 | 373 | log info "$(grep -rn "shared_preload_libraries" "$PGTAP_CLUSTER"/postgresql.conf)" |
|
497 | 464 |
|
498 | 465 | log info "Starting PostgreSQL server for pg_regress tests" |
499 | 466 | unset GRN_PLUGINS_DIR |
500 | | - if ! log_cmd ${start-postgres-server-bin}/bin/start-postgres-server ${getVersionArg pgpkg} --daemonize; then |
| 467 | + if ! log_cmd ${start-postgres-server-bin}/bin/start-postgres-server ${pgpkg.version} --daemonize; then |
501 | 468 | log error "Failed to start PostgreSQL server for pg_regress tests" |
502 | 469 | exit 1 |
503 | 470 | fi |
|
571 | 538 | # running server as pg_regress (--use-existing). These specs target |
572 | 539 | # core/heap + contrib concurrency behaviour. Skipped on: |
573 | 540 | # - CLI variants: portable build runs only a test subset. |
574 | | - # - orioledb ships its own isolation suite for its storage-engine |
| 541 | + # - orioledb ships its own isolation suite for its storage-engine |
575 | 542 | # concurrency semantics. |
576 | 543 | #shellcheck disable=SC2193 |
577 | 544 | if ${lib.boolToString isCliVariant}; then |
|
610 | 577 | in |
611 | 578 | { |
612 | 579 | psql_15 = pkgs.runCommand "run-check-harness-psql-15" { } ( |
613 | | - lib.getExe (makeCheckHarness self'.packages."psql_15/bin" { legacyPkgName = "psql_15"; }) |
| 580 | + lib.getExe (makeCheckHarness self'.packages."psql_15/bin" { }) |
614 | 581 | ); |
615 | 582 | psql_17 = pkgs.runCommand "run-check-harness-psql-17" { } ( |
616 | | - lib.getExe (makeCheckHarness self'.packages."psql_17/bin" { legacyPkgName = "psql_17"; }) |
| 583 | + lib.getExe (makeCheckHarness self'.packages."psql_17/bin" { }) |
617 | 584 | ); |
618 | 585 | psql_orioledb-17 = pkgs.runCommand "run-check-harness-psql-orioledb-17" { } ( |
619 | | - lib.getExe ( |
620 | | - makeCheckHarness self'.packages."psql_orioledb-17/bin" { legacyPkgName = "psql_orioledb-17"; } |
621 | | - ) |
| 586 | + lib.getExe (makeCheckHarness self'.packages."psql_orioledb-17/bin" { }) |
622 | 587 | ); |
623 | 588 | psql_15_slim = pkgs.runCommand "run-check-harness-psql-15-slim" { } ( |
624 | | - lib.getExe (makeCheckHarness self'.packages."psql_15_slim/bin" { legacyPkgName = "psql_15_slim"; }) |
| 589 | + lib.getExe (makeCheckHarness self'.packages."psql_15_slim/bin" { isSlim = true; }) |
625 | 590 | ); |
626 | 591 | psql_17_slim = pkgs.runCommand "run-check-harness-psql-17-slim" { } ( |
627 | | - lib.getExe (makeCheckHarness self'.packages."psql_17_slim/bin" { legacyPkgName = "psql_17_slim"; }) |
| 592 | + lib.getExe (makeCheckHarness self'.packages."psql_17_slim/bin" { isSlim = true; }) |
628 | 593 | ); |
629 | 594 | psql_orioledb-17_slim = pkgs.runCommand "run-check-harness-psql-orioledb-17-slim" { } ( |
630 | | - lib.getExe ( |
631 | | - makeCheckHarness self'.packages."psql_orioledb-17_slim/bin" { |
632 | | - legacyPkgName = "psql_orioledb-17_slim"; |
633 | | - } |
634 | | - ) |
| 595 | + lib.getExe (makeCheckHarness self'.packages."psql_orioledb-17_slim/bin" { isSlim = true; }) |
635 | 596 | ); |
636 | 597 | # CLI variant checks |
637 | 598 | psql_17_cli = pkgs.runCommand "run-check-harness-psql-17-cli" { } ( |
|
0 commit comments