bump version to 13.0.1

The repository has been moved from a dedicated organisation to my personal profile, so this old link will no longer work after 90 days.

.cirrus.yml

@@ -1,5 +1,5 @@
 freebsd_instance:
-  image_family: freebsd-14-3
+  image_family: freebsd-14-2
 
 build_task:
   # Don't change this name without adjusting .github/workflows/build.yaml
@@ -35,7 +35,7 @@ build_task:
       - find main src -type f -iname '*.hs' -exec md5sum "{}" +
 
   build_script: |
-    stack build -j 1 --local-bin-path . --copy-bins
+    stack build -j 1 --local-bin-path . --copy-bins --stack-yaml stack-21.7.yaml
     strip postgrest
 
   bin_artifacts:

.github/CONTRIBUTING.md

@@ -21,7 +21,7 @@ For questions on how to use PostgREST, please use
 ### Reporting an Issue
 
 * Make sure you test against the latest [stable release](https://github.com/PostgREST/postgrest/releases/latest)
-  and also against the latest [devel release](https://github.com/PostgREST/postgrest/releases/tag/devel).
+  and also against the latest [nightly release](https://github.com/PostgREST/postgrest/releases/tag/nightly).
   It is possible we already fixed the bug you're experiencing.
 
 * Provide steps to reproduce the issue, including your OS version and

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,18 +4,17 @@ When submitting a new feature or fix:
 - Add a new entry to the CHANGELOG - https://github.com/PostgREST/postgrest/blob/main/CHANGELOG.md#unreleased
 - If relevant, update the docs
 - Use a prefix for the PR title or commits, e.g. "fix: description of the fix".
-  + `add`, Add a new feature
+  + `fix`, bug fixes
-  + `amend`, To amend an unrealease commit
+  + `feat`, new features added
-  + `change`, Breaking changes
+  + `perf`, performance improvements
-  + `chore`, Maintenance, update sponsors, changelog, readme etc
+  + `docs`, updating the documentation
-  + `ci`, CI configuration files and scripts
+  + `nix`, related to the Nix development environment
-  + `docs`, Documentation
+  + `ci`, related to the Continuous Integration modules
-  + `fix`, Bug fix
+  + `test`, related to the testing modules
-  + `nix`, Related to Nix
+  + `refactor`, refactoring code
-  + `perf`, Performance improvements
+  + `deprecate`, deprecating a feature
-  + `refactor`, Refactoring code
+  + `changelog`, updating the CHANGELOG
-  + `remove`, Remove a feature or fix
+  + `chore`, maintenance (build process, updating sponsors, etc.)
-  + `test`, Adding tests
   + Other prefixes may be used if necessary
 - If there's a breaking change, add `BREAKING CHANGE` and an explanation to your commit message
 -->

.github/actions/artifact-from-cirrus/action.yaml

@@ -112,7 +112,7 @@ runs:
         echo "artifacts=${artifacts}" >> "$GITHUB_OUTPUT"
     - name: Save artifact to GitHub Actions
       if: steps.find-task.outputs.task_found
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: ${{ inputs.upload }}
         path: ${{ steps.download.outputs.artifacts }}

.github/actions/cache-on-main/action.yaml

@@ -19,14 +19,14 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       if: ${{ startsWith(github.ref, 'refs/heads/') || (inputs.save-prs && startsWith(github.ref, 'refs/pull/')) }}
       with:
         path: ${{ inputs.path }}
         key: ${{ runner.os }}-${{ inputs.prefix }}-${{ inputs.suffix }}
         restore-keys: |
           ${{ runner.os }}-${{ inputs.prefix }}-
-    - uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+    - uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       if: ${{ !startsWith(github.ref, 'refs/heads/') && !(inputs.save-prs && startsWith(github.ref, 'refs/pull/'))  }}
       with:
         path: ${{ inputs.path }}

.github/actions/setup-nix/action.yaml

@@ -11,7 +11,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: nixbuild/nix-quick-install-action@2c9db80fb984ceb1bcaa77cdda3fdf8cfba92035 # v34
+    - uses: nixbuild/nix-quick-install-action@5bb6a3b3abe66fd09bbf250dce8ada94f856a703 # v30
       with:
         nix_conf: |-
           always-allow-substitutes = true

.github/renovate.json

@@ -3,7 +3,7 @@
   "extends": [
     "config:best-practices"
   ],
-  "baseBranchPatterns": [
+  "baseBranches": [
     "main",
     "/^v[0-9]+/"
   ],
@@ -13,56 +13,27 @@
   },
   "packageRules": [
     {
-      "matchBaseBranches": [
+      "matchBaseBranches": [ "/^v[0-9]+/" ],
-        "/^v[0-9]+/"
+      "matchManagers": ["haskell-cabal"],
-      ],
-      "matchManagers": [
-        "haskell-cabal"
-      ],
       "enabled": false
     },
     {
-      "matchBaseBranches": [
+      "matchBaseBranches": [ "/^v[0-9]+/" ],
-        "/^v[0-9]+/"
-      ],
       "groupName": "all dependencies"
     },
     {
-      "matchManagers": [
+      "matchManagers": ["haskell-cabal"],
-        "haskell-cabal"
+      "matchPackageNames": ["base", "bytestring", "containers", "directory", "mtl", "parsec", "process", "text"],
-      ],
-      "matchPackageNames": [
-        "base",
-        "bytestring",
-        "containers",
-        "directory",
-        "mtl",
-        "parsec",
-        "process",
-        "text"
-      ],
       "groupName": "GHC dependencies"
     },
     {
-      "matchManagers": [
+      "matchManagers": ["haskell-cabal"],
-        "haskell-cabal"
+      "matchPackageNames": ["hasql", "hasql-dynamic-statements", "hasql-notifications", "hasql-transaction", "hasql-pool"],
-      ],
-      "matchPackageNames": [
-        "hasql",
-        "hasql-dynamic-statements",
-        "hasql-notifications",
-        "hasql-transaction",
-        "hasql-pool"
-      ],
       "groupName": "hasql"
     },
     {
-      "matchManagers": [
+      "matchManagers": ["haskell-cabal"],
-        "haskell-cabal"
+      "matchPackageNames": ["fuzzyset"],
-      ],
-      "matchPackageNames": [
-        "fuzzyset"
-      ],
       "allowedVersions": "<0.3"
     }
   ]

.github/workflows/backport.yaml

@@ -1,52 +0,0 @@
-name: Backport
-
-on:
-  pull_request_target:
-    types:
-      - closed
-      - labeled
-
-jobs:
-  backport:
-    name: Backport
-    runs-on: ubuntu-24.04
-    # It triggers only when PR is already merged on either:
-    #
-    # - The merge event itself (action != labeled) or
-    # - A label event with the right label (backport ...).
-    #
-    # The result will be that we can add the label before or after merge,
-    # but the workflow will only run once the PR had been merged.
-    if: >
-      github.event.pull_request.merged &&
-      (
-        github.event.action != 'labeled' ||
-        startsWith(github.event.label.name, 'backport')
-      )
-    steps:
-
-      # This actions creates the github token using the postgrest app secrets
-      - name: Create Github App Token
-        id: app-token
-        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
-        with:
-          app-id: ${{ vars.POSTGREST_CI_APP_ID }}
-          private-key: ${{ secrets.POSTGREST_CI_PRIVATE_KEY }}
-          permission-contents: write
-          permission-pull-requests: write
-          permission-workflows: write # required when backporting CI changes
-
-      # This is required for backport action to cherry-pick the PR
-      - name: Fetch PR ref
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          token: ${{ steps.app-token.outputs.token }}
-
-      # Backport action that creates the PR with given settings
-      - name: Create backport PR
-        uses: korthout/backport-action@c656f5d5851037b2b38fb5db2691a03fa229e3b2 # v4.0.1
-        with:
-          github_token: ${{ steps.app-token.outputs.token }}
-          pull_description: 'Backport for #${pull_number}.'
-          pull_title: '${target_branch}: ${pull_title}'

.github/workflows/build.yaml

@@ -33,16 +33,16 @@ jobs:
     name: Nix - Linux x86-64 static
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup Nix Environment
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
       - name: Build static executable
-        run: nix-build -A postgrestStatic -A postgrestStatic.tests
+        run: nix-build -A postgrestStatic
       - name: Save built executable as artifact
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: postgrest-linux-static-x86-64
           path: result/bin/postgrest
@@ -51,7 +51,7 @@ jobs:
       - name: Build Docker image
         run: nix-build -A docker.image --out-link postgrest-docker.tar.gz
       - name: Save built Docker image as artifact
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: postgrest-docker-x86-64
           path: postgrest-docker.tar.gz
@@ -60,9 +60,9 @@ jobs:
 
   macos:
     name: Nix - MacOS
-    runs-on: macos-15
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup Nix Environment
         uses: ./.github/actions/setup-nix
         with:
@@ -105,6 +105,15 @@ jobs:
             artifact: postgrest-macos-aarch64
             deps: brew link --force libpq
 
+          - name: MacOS x86-64
+            runs-on: macos-13
+            cache: |
+              ~/.stack/pantry
+              ~/.stack/snapshots
+              ~/.stack/stack.sqlite3
+            artifact: postgrest-macos-x86-64
+            deps: brew link --force libpq
+
           - name: Windows
             runs-on: windows-2022
             cache: |
@@ -117,11 +126,11 @@ jobs:
     name: Stack - ${{ matrix.name }}
     runs-on: ${{ matrix.runs-on }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: haskell-actions/setup@0512451d82f3ca8c147db62e30464e7c4ca63d30 # v2.9.1
+      - uses: haskell-actions/setup@64445b6b5dd545faf5f8e2acee8253eb5c2b29aa # v2.7.11
         with:
           # This must match the version in stack.yaml's resolver
-          ghc-version: 9.6.7
+          ghc-version: 9.6.6
           enable-stack: true
           stack-no-global: true
           stack-setup-ghc: true
@@ -146,7 +155,7 @@ jobs:
       - name: Strip Executable
         run: strip result/postgrest*
       - name: Save built executable as artifact
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ matrix.artifact }}
           path: |
@@ -159,7 +168,7 @@ jobs:
     name: Stack - FreeBSD from CirrusCI
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/artifact-from-cirrus
         with:
           token: ${{ github.token }}
@@ -171,13 +180,13 @@ jobs:
   cabal:
     strategy:
       matrix:
-        ghc: ['9.6.7', '9.8.4']
+        ghc: ['9.6.6', '9.8.2']
       fail-fast: false
     name: Cabal - Linux x86-64 - GHC ${{ matrix.ghc }}
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: haskell-actions/setup@0512451d82f3ca8c147db62e30464e7c4ca63d30 # v2.9.1
+      - uses: haskell-actions/setup@64445b6b5dd545faf5f8e2acee8253eb5c2b29aa # v2.7.11
         with:
           ghc-version: ${{ matrix.ghc }}
       - name: Cache .cabal

.github/workflows/check.yaml

@@ -20,7 +20,7 @@ jobs:
     name: Lint & Style
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup Nix Environment
         uses: ./.github/actions/setup-nix
         with:
@@ -30,24 +30,3 @@ jobs:
         run: postgrest-lint
       - name: Run style check (auto-format with `nix-shell --run postgrest-style`)
         run: postgrest-style-check
-
-  commit:
-    if: github.event_name != 'push'  # we don't run this on a push, a failure on push disrupts the release workflow
-    name: Commit
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-        with:
-          fetch-depth: 100  # fetch history (last 100 commits) instead of default shallow clone history, this is deemed enough for a PR history
-      - name: Setup Nix Environment
-        uses: ./.github/actions/setup-nix
-        with:
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: gitTools.commitCheck.bin
-      - name: Run commitlint (check locally with `nix-shell --run postgrest-commitlint`)
-        run: |
-          # Fetch target branch explicitly
-          git fetch origin ${{ github.base_ref }}
-
-          # Run commitlint
-          postgrest-commitlint --from origin/${{ github.base_ref }} --to HEAD

.github/workflows/ci.yaml

@@ -50,14 +50,14 @@ jobs:
       - test
       - build
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ssh-key: ${{ secrets.POSTGREST_SSH_KEY }}
       - name: Tag latest commit
         run: |
           cabal_version="$(grep -oP '^version:\s*\K.*' postgrest.cabal)"
 
-          if [[ "$cabal_version" == *.* ]]; then
+          if [[ "$cabal_version" == *.*.* ]]; then
             git fetch --tags
 
             if [ -z "$(git tag --list "v$cabal_version")" ]; then

.github/workflows/docs.yaml

@@ -27,7 +27,7 @@ jobs:
     name: Build
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Setup Nix Environment
       uses: ./.github/actions/setup-nix
       with:
@@ -41,7 +41,7 @@ jobs:
     name: Spellcheck
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Setup Nix Environment
       uses: ./.github/actions/setup-nix
       with:

.github/workflows/linkcheck.yaml

@@ -3,13 +3,12 @@ name: Linkcheck
 on:
   schedule:
     - cron: '1 2 * * 3'
-  workflow_dispatch:
 
 jobs:
   linkcheck:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Setup Nix Environment
       uses: ./.github/actions/setup-nix
       with:

.github/workflows/release.yaml

@@ -26,7 +26,7 @@ jobs:
     needs:
       - build
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Check the version to be released
         run: |
           cabal_version="$(grep -oP '^version:\s*\K.*' postgrest.cabal)"
@@ -49,7 +49,7 @@ jobs:
           echo "Relevant extract from CHANGELOG.md:"
           cat CHANGES.md
       - name: Save CHANGES.md as artifact
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: release-changes
           path: CHANGES.md
@@ -64,9 +64,9 @@ jobs:
     needs:
       - prepare
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Download all artifacts
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           path: artifacts
       - name: Create release bundle with archives for all builds
@@ -81,6 +81,9 @@ jobs:
           tar cJvf "release-bundle/postgrest-${GITHUB_REF_NAME}-macos-aarch64.tar.xz" \
             -C artifacts/postgrest-macos-aarch64 postgrest
 
+          tar cJvf "release-bundle/postgrest-${GITHUB_REF_NAME}-macos-x86-64.tar.xz" \
+            -C artifacts/postgrest-macos-x86-64 postgrest
+
           tar cJvf "release-bundle/postgrest-${GITHUB_REF_NAME}-freebsd-x86-64.tar.xz" \
             -C artifacts/postgrest-freebsd-x86-64 postgrest
 
@@ -91,7 +94,7 @@ jobs:
             artifacts/postgrest-windows-x86-64/postgrest.exe
 
       - name: Save release bundle
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: release-bundle
           path: release-bundle
@@ -135,17 +138,17 @@ jobs:
     env:
       DOCKER_REPO: ${{ vars.DOCKER_REPO }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Download x86-64 Docker image
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: postgrest-docker-x86-64
       - name: Download aarch64 binary
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: postgrest-ubuntu-aarch64
-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+      - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           username: ${{ vars.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
@@ -191,8 +194,8 @@ jobs:
       vars.DOCKER_REPO && vars.DOCKER_USER &&
       github.ref == 'refs/tags/devel'
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5.0.0
+      - uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4.0.2
         with:
           username: ${{ vars.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}

.github/workflows/test.yaml

@@ -39,19 +39,17 @@ jobs:
         # https://github.com/actions/runner/issues/241#issuecomment-842566950
         shell: script -qec "bash --noprofile --norc -eo pipefail {0}"
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup Nix Environment
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: tests.coverage.bin tests.testDoctests.bin tests.testSpecIdempotence.bin cabalTools.update.bin
+          tools: tests.coverage.bin tests.testDoctests.bin tests.testSpecIdempotence.bin
-
-      - run: postgrest-cabal-update
 
       - name: Run coverage (IO tests and Spec tests against PostgreSQL 15)
         run: postgrest-coverage
       - name: Upload coverage to codecov
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
         with:
           files: ./coverage/codecov.json
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -69,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pgVersion: [13, 14, 15, 16, 17]
+        pgVersion: [12, 13, 14, 15, 16, 17]
     name: PG ${{ matrix.pgVersion }}
     runs-on: ubuntu-24.04
     defaults:
@@ -78,41 +76,36 @@ jobs:
         # https://github.com/actions/runner/issues/241#issuecomment-842566950
         shell: script -qec "bash --noprofile --norc -eo pipefail {0}"
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup Nix Environment
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: tests.testSpec.bin tests.testIO.bin tests.testBigSchema.bin withTools.pg-${{ matrix.pgVersion }}.bin cabalTools.update.bin
+          tools: tests.testSpec.bin tests.testIO.bin tests.testBigSchema.bin withTools.postgresql-${{ matrix.pgVersion }}.bin
-
-      - run: postgrest-cabal-update
 
       - name: Run spec tests
         if: always()
-        run: postgrest-with-pg-${{ matrix.pgVersion }} postgrest-test-spec
+        run: postgrest-with-postgresql-${{ matrix.pgVersion }} postgrest-test-spec
 
       - name: Run IO tests
         if: always()
-        run: postgrest-with-pg-${{ matrix.pgVersion }} postgrest-test-io -vv
+        run: postgrest-with-postgresql-${{ matrix.pgVersion }} postgrest-test-io -vv
 
       - name: Run IO tests on a big schema
         if: always()
-        run: postgrest-with-pg-${{ matrix.pgVersion }} postgrest-test-big-schema -vv
+        run: postgrest-with-postgresql-${{ matrix.pgVersion }} postgrest-test-big-schema -vv
 
 
   memory:
     name: Memory
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup Nix Environment
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: tests.testMemory.bin cabalTools.update.bin
+          tools: tests.testMemory.bin
-
-      - run: postgrest-cabal-update
-
       - name: Run memory tests
         run: postgrest-test-memory
 
@@ -120,45 +113,40 @@ jobs:
   loadtest:
     strategy:
       matrix:
-        kind: ['mixed', 'jwt-hs', 'jwt-hs-cache', 'jwt-hs-cache-worst', 'jwt-rsa', 'jwt-rsa-cache', 'jwt-rsa-cache-worst']
+        kind: ['mixed', 'jwt']
     name: Loadtest
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
       - name: Setup Nix Environment
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: loadtest.loadtestAgainst.bin loadtest.report.bin cabalTools.update.bin
+          tools: loadtest.loadtestAgainst.bin loadtest.report.bin
-
+      - uses: WyriHaximus/github-action-get-previous-tag@04e8485ecb6487243907e330d522ff60f02283ce # v1.4.0
-      - run: postgrest-cabal-update
+        id: get-latest-tag
-
+        with:
+          prefix: v
       - name: Run loadtest
-        env:
-          TARGET_BRANCH: ${{ github.base_ref || github.ref_name }}
         run: |
-          if [ "$TARGET_BRANCH" = "main" ]; then
+          postgrest-loadtest-against -k ${{ matrix.kind }} main ${{ steps.get-latest-tag.outputs.tag }}
-            latest_tag=$(git tag --sort=-creatordate --list "v*" | head -n1)
+          postgrest-loadtest-report >> "$GITHUB_STEP_SUMMARY"
-          else
-            latest_tag=$(git tag --merged HEAD --sort=-creatordate "v*" | head -n1)
-          fi
-          postgrest-loadtest-against -k ${{ matrix.kind }} "$TARGET_BRANCH" "$latest_tag"
-          postgrest-loadtest-report -g ${{ matrix.kind }} >> "$GITHUB_STEP_SUMMARY"
 
   flake:
     strategy:
       fail-fast: false
       matrix:
         runs-on:
+          - macos-13 # x86_64-darwin
           - macos-14 # aarch64-darwin
           - ubuntu-24.04 # x86_64-linux
           - ubuntu-24.04-arm # aarch64-linux
     name: Flake Check
     runs-on: ${{ matrix.runs-on }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
       - name: Setup Nix Environment

.gitignore

@@ -25,4 +25,3 @@ loadtest
 .history
 .docs-build
 gen_targets.http
-gen_jwk.json

BACKERS.md

@@ -18,16 +18,16 @@ PostgREST ongoing development is only possible thanks to our Sponsors and Backer
         </a>
       </td>
       <td align="center" valign="middle">
-        <a href="https://tembo.io/?utm_source=sponsor&utm_campaign=postgrest" target="_blank">
+        <a href="https://code.build/?utm_source=sponsor&utm_campaign=postgrest" target="_blank">
-          <img width="296px" src="static/tembo.png">
+          <img width="296px" src="static/code-build.png">
         </a>
       </td>
     </tr>
     <tr></tr>
     <tr>
       <td align="center" valign="middle">
-        <a href="https://www.euronodes.com/postgrest" target="_blank">
+        <a href="https://tembo.io/?utm_source=sponsor&utm_campaign=postgrest" target="_blank">
-          <img width="296px" src="static/euronodes.svg">
+          <img width="296px" src="static/tembo.png">
         </a>
       </td>
       <td align="center" valign="middle">
@@ -89,8 +89,8 @@ PostgREST ongoing development is only possible thanks to our Sponsors and Backer
         </a>
       </td>
       <td align="center" valign="middle">
-        <a href="https://code.build/?utm_source=sponsor&utm_campaign=postgrest" target="_blank">
+        <a href="https://gnuhost.eu/?utm_source=sponsor&utm_campaign=postgrest" target="_blank">
-          <img width="222px" src="static/code-build.png">
+          <img width="222px" src="static/gnuhost.png">
         </a>
       </td>
     </tr>

CHANGELOG.md

@@ -1,105 +1,10 @@
 # Change Log
 
-All notable changes to this project will be documented in this file. From version `14.0` onwards PostgREST follows a `MAJOR.PATCH` two-part versioning. Only even-numbered MAJOR versions will be released, reserving odd-numbered MAJOR versions for development.
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
-## [14.2] - 2025-12-18
-
-### Fixed
-
-- Fix `hasSingleUnnamedParam` incorrectly matching functions with named parameters by @joelonsql in #4553
-  + Functions with a single named parameter (e.g., `foo(data json)`) no longer incorrectly match the single-param fallback, returning a clean `PGRST202` error instead of a confusing PostgreSQL `42883` error.
-- Fix misleading logs on unsupported PostgreSQL versions by @taimoorzaeem in #4519
-- Fix regression where the `PGRST103` error response was truncated by @laurenceisla in #4455
-  + Happened when an `offset` was greater than the rows requested and `Prefer: count=exact` was sent.
-- Fix not returning `Content-Length` on empty HTTP `201` responses by @laurenceisla in #4518
-- Fix inaccurate Server-Timing header durations by @steve-chavez in #4522
-- Fix inaccurate "Schema cache queried" logs by @steve-chavez in #4522
-
-## [14.1] - 2025-11-05
-
-## Fixed
-
-- Fix `db-pre-config` function failing when function names are pg reserved words by @taimoorzaeem in #4380
-- Fix `server-host=!6` incorrectly binds to IPv4 address by @taimoorzaeem in #3202
-
-## [14.0] - 2025-10-24
-
-### Added
-
-- Bounded JWT cache using the SIEVE algorithm by @mkleczek in #4084
-  + It now uses a fixed size cache instead of arbitrary sized cache.
-- Add `--ready` flag for postgrest healthcheck by @taimoorzaeem in #4239
-
-### Fixed
-
-- Fix not logging OpenAPI queries when `log-query=main-query` is enabled by @steve-chavez in #4226
-- Fix not logging explain query when `log-query=main-query` is enabled by @steve-chavez in #4319
-- Fix not logging transaction variables and db-pre-request function when `log-query=main-query` is enabled by @steve-chavez in #3934
-- Fix not logging the JSON message to stderr on a `PGRST002` error by @laurenceisla in #4129
-- Fix reloading the Schema Cache unnecessarily on a `PGRST002` error by @laurenceisla in #4367
-- Fix schema cache loading taking a long time for large schemas by @mkleczek in #4360, #3704
-
-### Changed
-
-- Drop support for PostgreSQL EOL version 12 by @wolfgangwalther in #3865
-- From now on PostgREST will follow a `MAJOR.PATCH` two-part versioning. Only even-numbered MAJOR versions will be released, reserving odd-numbered MAJOR versions for development.
-- Replaced `jwt-cache-max-lifetime` config with `jwt-cache-max-entries` by @mkleczek in #4084
-- `log-query` config now takes a boolean instead of a string value by @steve-chavez in #3934
-
-## [13.0.8] - 2025-10-24
-
-### Fixed
-
-- Fix loading utf-8 config files with `ASCII` locale set by @taimoorzaeem in #4386
-
-## [13.0.7] - 2025-09-14
-
-### Added
-
-- Improve the `PGRST106` error when the requested schema is invalid by @laurenceisla in #4089
-  + It now shows the invalid schema in the `message` field.
-  + The exposed schemas are now listed in the `hint` instead of the `message` field.
-- Improve error details of `PGRST301` error by @taimoorzaeem in #4051
-
-## [13.0.6] - 2025-08-30
-
-### Fixed
-
-- Fix logging the Haskell type instead of the listener error message directly by @laurenceisla in #3588
-- Fix format of `IPv6` address logged at PostgREST startup by @taimoorzaeem in #4291
-- Fix empty enum in `preferParams` OpenAPI parameter by @laurenceisla in #4292
-
-## [13.0.5] - 2025-08-24
-
-### Fixed
-
-- Fix OpenAPI broken docs link by @taimoorzaeem in #4080
-- Fix OpenAPI specification incorrectly exposing GET methods for volatile functions by @joelonsql in #4174
-- Fix empty spread embeddings return unexpected SQL error by @taimoorzaeem in #3887
-- Fix `/metrics` endpoint not responding with `Content-Type` header by @taimoorzaeem in #4271
-
-## [13.0.4] - 2025-06-17
-
-### Fixed
-
-- Fix regression that makes full-text search not work on domain types based on `tsvector` by @laurenceisla in #4135
-- Fix `jwt-aud` config not failing when set to an invalid URI by @taimoorzaeem in #4132
-
-## [13.0.3] - 2025-06-16
-
-- Fix `max-affected` preference not failing with RPC when `handling=strict` by @taimoorzaeem in #4100
-- Fix a property definition's type in OpenAPI not showing the correct base type of a recursive domain by @laurenceisla in #4136
-
-### Fixed
-
-## [13.0.2] - 2025-06-02
-
-### Fixed
-
-- Fix regression that makes `ORDER BY` with nulls-order not work alongside limits by @laurenceisla in #4109
-
 ## [13.0.1] - 2025-06-01
 
 ### Fixed
@@ -161,9 +66,6 @@ All notable changes to this project will be documented in this file. From versio
  - #3956, Drop `/config` endpoint of admin server - @steve-chavez
    + The endpoint was at risk of being left unprotected when exposing it.
    + The accompanying `admin-server-config-enabled` config was also dropped.
- - #3598, PostgREST now validates the `kid` parameter of the JWT - @wolfgangwalther
-   + If the JWT contains a ``kid`` parameter, then PostgREST will look for the JSON Web Key in the `jwt-secret`.
-   + If the JWT doesn't contain a `kid`, the behavior should be backwards compatible. PostgREST  will try each key in the `jwt-secret` one by one until it finds one that works.
  - #3697, #3602, Querying non-existent table now returns `PGRST205` error instead of empty json - @taimoorzaeem
  - #3600, #3926, Improve JWT errors - @taimoorzaeem
    + Return `PGRST301` error when `Bearer` in auth header is sent empty

Dockerfile

@@ -2,7 +2,7 @@
 # The x86-64 is a single-static-binary image built via Nix, see:
 # nix/tools/docker/README.md
 
-FROM ubuntu:noble@sha256:c35e29c9450151419d9448b0fd75374fec4fff364a27f176fb458d472dfc9e54 AS postgrest
+FROM ubuntu:noble@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233 AS postgrest
 
 RUN apt-get update -y \
     && apt install -y --no-install-recommends libpq-dev zlib1g-dev jq gcc libnuma-dev \

README.md

@@ -27,16 +27,16 @@ API than you are likely to write from scratch.
         </a>
       </td>
       <td align="center" valign="middle">
-        <a href="https://tembo.io/?utm_source=sponsor&utm_campaign=postgrest" target="_blank">
+        <a href="https://code.build/?utm_source=sponsor&utm_campaign=postgrest" target="_blank">
-          <img width="296px" src="static/tembo.png">
+          <img width="296px" src="static/code-build.png">
         </a>
       </td>
     </tr>
     <tr></tr>
     <tr>
       <td align="center" valign="middle">
-        <a href="https://www.euronodes.com/postgrest" target="_blank">
+        <a href="https://tembo.io/?utm_source=sponsor&utm_campaign=postgrest" target="_blank">
-          <img width="296px" src="static/euronodes.svg">
+          <img width="296px" src="static/tembo.png">
         </a>
       </td>
       <td align="center" valign="middle">
@@ -52,8 +52,8 @@ Big thanks to our sponsors! You can join them by supporting PostgREST on [Patreo
 
 ## Usage
 
-1. See the docs for [how to install PostgREST on your platform](https://docs.postgrest.org/en/stable/explanations/install.html). You can also [use Docker](https://docs.postgrest.org/en/stable/explanations/install.html#docker).
+1. Download the binary ([latest release](https://github.com/PostgREST/postgrest/releases/latest))
-
+   for your platform.
 2. Invoke for help:
 
     ```bash
@@ -142,10 +142,6 @@ You can help PostgREST ongoing maintenance and development by making a regular d
 
 Every donation will be spent on making PostgREST better for the whole community.
 
-## Contributing
-
-Contributions are always welcome and appreciated. Please see the [Contributing guidelines](https://github.com/PostgREST/postgrest/blob/main/CONTRIBUTING.md).
-
 ## Thanks
 
 The PostgREST organization is grateful to:

cabal.project

@@ -1,2 +1,4 @@
 packages: postgrest.cabal
 tests: true
+package *
+  ghc-options: -split-sections

cabal.project.freeze

@@ -1 +1 @@
-index-state: hackage.haskell.org 2025-10-29T04:02:18Z
+index-state: hackage.haskell.org 2025-02-01T14:59:33Z

default.nix

@@ -43,6 +43,7 @@ let
       allOverlays.build-toolbox
       allOverlays.checked-shell-script
       allOverlays.gitignore
+      allOverlays.postgresql-libpq
       (allOverlays.haskell-packages { inherit compiler; })
       allOverlays.slocat
     ];
@@ -53,17 +54,16 @@ let
 
   postgresqlVersions =
     [
-      { name = "pg-17"; postgresql = pkgs.postgresql_17.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
+      { name = "postgresql-17"; postgresql = pkgs.postgresql_17.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
-      { name = "pg-16"; postgresql = pkgs.postgresql_16.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
+      { name = "postgresql-16"; postgresql = pkgs.postgresql_16.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
-      { name = "pg-15"; postgresql = pkgs.postgresql_15.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
+      { name = "postgresql-15"; postgresql = pkgs.postgresql_15.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
-      { name = "pg-14"; postgresql = pkgs.postgresql_14.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
+      { name = "postgresql-14"; postgresql = pkgs.postgresql_14.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
-      { name = "pg-13"; postgresql = pkgs.postgresql_13.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
+      { name = "postgresql-13"; postgresql = pkgs.postgresql_13.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
+      { name = "postgresql-12"; postgresql = pkgs.postgresql_12.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
     ];
 
-  haskellPackages = pkgs.haskell.packages."${compiler}";
-
   # Dynamic derivation for PostgREST
-  postgrest = pkgs.lib.pipe (haskellPackages.callCabal2nix name src { }) [
+  postgrest = pkgs.lib.pipe (pkgs.haskell.packages."${compiler}".callCabal2nix name src { }) [
     # To allow ghc-datasize to be used.
     lib.disableLibraryProfiling
     # We are never going to use dynamic haskell libraries anyway. "Dynamic" refers to how
@@ -75,7 +75,7 @@ let
 
   # Options passed to cabal in dev tools and tests
   devCabalOptions =
-    "-f dev --test-show-detail=direct";
+    "-f dev --test-show-detail=direct --disable-shared";
 
   inherit (pkgs.haskell) lib;
 in
@@ -84,14 +84,9 @@ rec {
 
   # Derivation for the PostgREST Haskell package, including the executable,
   # libraries and documentation. We disable running the test suite on Nix
-  # builds, as they require a database to be set up. We split the binary
+  # builds, as they require a database to be set up.
-  # into a separate output, so that the default distribution via flake.nix
+  postgrestPackage =
-  # has a much smaller closure size.
+    lib.dontCheck postgrest;
-  postgrestPackage = pkgs.lib.pipe postgrest [
-    lib.dontCheck
-    lib.enableSeparateBinOutput
-    (haskellPackages.generateOptparseApplicativeCompletions [ "postgrest" ])
-  ];
 
   # Profiled dynamic executable.
   postgrestProfiled = pkgs.lib.pipe postgrestPackage [
@@ -124,18 +119,10 @@ rec {
   docs =
     pkgs.callPackage nix/tools/docs.nix { };
 
-  # Git tools.
-  gitTools =
-    pkgs.callPackage nix/tools/gitTools.nix { };
-
   # Load testing tools.
   loadtest =
     pkgs.callPackage nix/tools/loadtest.nix { inherit withTools; };
 
-  # Utility for updating the pinned version of Nixpkgs.
-  nixpkgsTools =
-    pkgs.callPackage nix/tools/nixpkgsTools.nix { };
-
   # Scripts for publishing new releases.
   release =
     pkgs.callPackage nix/tools/release.nix { };

docker-hub-readme.md

@@ -24,16 +24,16 @@ write from scratch.
         </a>
       </td>
       <td align="center" valign="middle">
-        <a href="https://tembo.io/?utm_source=sponsor&utm_campaign=postgrest" target="_blank">
+        <a href="https://code.build/?utm_source=sponsor&utm_campaign=postgrest" target="_blank">
-          <img width="296px" src="https://raw.githubusercontent.com/PostgREST/postgrest/main/static/tembo.png">
+          <img width="296px" src="https://raw.githubusercontent.com/PostgREST/postgrest/main/static/code-build.png">
         </a>
       </td>
     </tr>
     <tr></tr>
     <tr>
       <td align="center" valign="middle">
-        <a href="https://www.euronodes.com/postgrest" target="_blank">
+        <a href="https://tembo.io/?utm_source=sponsor&utm_campaign=postgrest" target="_blank">
-          <img width="296px" src="https://raw.githubusercontent.com/PostgREST/postgrest/main/static/euronodes.svg">
+          <img width="296px" src="https://raw.githubusercontent.com/PostgREST/postgrest/main/static/tembo.png">
         </a>
       </td>
       <td align="center" valign="middle">

docs/_diagrams/uml/arch.uml

@@ -40,14 +40,9 @@ database "PostgreSQL" {
 
 :user:
 hexagon Proxy
-:user: .r-> Proxy : request with JWT
+:user: .r-> Proxy
 HTTPAPI <.l- Proxy
 
-hexagon ExternalAuth
-ExternalAuth -u[hidden]- Proxy
-:user: .r-> ExternalAuth : login
-:user: <.r- ExternalAuth : JWT
-
 :operator: .d-> HTTPADMIN
 :operator: .d-> CLI
 
@@ -56,8 +51,9 @@ PostgreSQL <.developer : "\t"
 Listener -r.> "PostgreSQL"
 "Connection Pool" -r.> "PostgreSQL" : "\t\t"
 
+
 note bottom of Auth
-  Validates the JWT
+  Authenticates the user request
 end note
 
 note bottom of ApiRequest
@@ -76,7 +72,6 @@ note top of Listener
   LISTEN session
 end note
 
-url of ExternalAuth is [[../explanations/external_auth.html]]
 url of Admin is [[../references/admin_server.html#admin-server]]
 url of API is [[../explanations/schema_isolation.html]]
 url of Auth is [[../references/auth.html#authn]]

docs/conf.py

@@ -12,6 +12,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+import sys
 import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -49,7 +50,7 @@ source_suffix = ".rst"
 master_doc = "index"
 
 # This is overriden by readthedocs with the version tag anyway
-version = "14"
+version = "13.0"
 # To avoid repetition in <title> we set this to an empty string.
 release = ""
 
@@ -299,7 +300,6 @@ linkcheck_ignore = [
     # 403 only in CI / GitHub Actions
     r"https://www.patreon.com/postgrest",
     r"https://blog.frankel.ch/poor-man-api",
-    r"https://www.cybertec-postgresql.com/.*",
     # Odd SSL error
     r"https://www.dripdepot.com",
     # New GitHub UI delays comment load, so anchor fails

docs/ecosystem.rst

@@ -34,7 +34,7 @@ Templates
 Example Apps
 ------------
 
-* `archtika <https://github.com/thiloho/archtika>`_ - self-hosted CMS
+* `archtika <https://github.com/thiloho/archtika>`_ - self‑hosted CMS
 * `delibrium-postgrest <https://gitlab.com/delibrium/delibrium-postgrest/>`_ - example school API and front-end in Vue.js
 * `ETH-transactions-storage <https://github.com/Adamant-im/ETH-transactions-storage>`_ - indexer for Ethereum to get transaction list by ETH address
 * `general <https://github.com/PierreRochard/general>`_ - example auth back-end

docs/explanations/db_authz.rst

@@ -13,7 +13,7 @@ A role can be thought of as either a database user, or a group of database users
 Roles for Each Web User
 -----------------------
 
-PostgREST can accommodate either viewpoint. If you treat a role as a single user then :ref:`user_impersonation` does most of what you need. When an authenticated user makes a request PostgREST will switch into the database role for that user, which in addition to restricting queries, is available to SQL through the :code:`current_user` variable.
+PostgREST can accommodate either viewpoint. If you treat a role as a single user then the :ref:`jwt_impersonation` does most of what you need. When an authenticated user makes a request PostgREST will switch into the database role for that user, which in addition to restricting queries, is available to SQL through the :code:`current_user` variable.
 
 You can use row-level security to flexibly restrict visibility and access for the current user. Here is an `example <https://www.enterprisedb.com:443/blog/application-users-vs-row-level-security>`_ from Tomas Vondra, a chat table storing messages sent between users. Users can insert rows into it to send messages to other users, and query it to see messages sent to them by other users.
 

docs/explanations/install.rst

@@ -75,12 +75,8 @@ You can get the `official PostgREST Docker image <https://hub.docker.com/r/postg
 
 .. code-block:: bash
 
-  # pull the latest version
   docker pull postgrest/postgrest
 
-  # to pull a particular version, use one of the versions on https://hub.docker.com/r/postgrest/postgrest/tags
-  docker pull postgrest/postgrest:<version>
-
 To configure the container image, use :ref:`env_variables_config`.
 
 There are two ways to run the PostgREST container: with an existing external database, or through docker-compose.
@@ -146,7 +142,6 @@ To avoid having to install the database at all, you can run both it and the serv
       ports:
         - "3000:3000"
       environment:
-        PGRST_SERVER_HOST: 0.0.0.0 # necessary for `postgrest --ready` flag to work
         PGRST_DB_URI: postgres://app_user:password@db:5432/app_db
         PGRST_OPENAPI_SERVER_PROXY_URI: http://127.0.0.1:3000
       depends_on:

docs/how-tos/sql-user-management-using-postgres-users-and-passwords.rst

@@ -43,7 +43,7 @@ As in :ref:`sql_user_management`, we create the :code:`pgcrypto` and :code:`pgjw
   CREATE EXTENSION pgcrypto WITH SCHEMA ext_pgcrypto;
 
 
-Concerning the `pgjwt extension <https://github.com/michelp/pgjwt>`_, please cf. to :ref:`jwt-from-sql`.
+Concerning the `pgjwt extension <https://github.com/michelp/pgjwt>`_, please cf. to :ref:`client_auth`.
 
 .. code-block:: postgres
 
@@ -157,7 +157,7 @@ Here we use the username instead of the email address to identify a user.
 Logins
 ~~~~~~
 
-As described in :ref:`jwt-from-sql`, we'll create a JWT token inside our login function. Note that you'll need to adjust the secret key which is hard-coded in this example to a secure (at least thirty-two character) secret of your choosing.
+As described in :ref:`client_auth`, we'll create a JWT token inside our login function. Note that you'll need to adjust the secret key which is hard-coded in this example to a secure (at least thirty-two character) secret of your choosing.
 
 
 .. code-block:: postgres

docs/how-tos/sql-user-management.rst

@@ -3,7 +3,7 @@
 SQL User Management
 ===================
 
-As mentioned on :ref:`jwt_generation`, an external service can provide user management and coordinate with the PostgREST server using JWT. It's also possible to support logins entirely through SQL. It's a fair bit of work, so get ready.
+As mentioned on :ref:`jwt_generation`, an external service can provide user management and coordinate with the PostgREST server using JWT. It’s also possible to support logins entirely through SQL. It’s a fair bit of work, so get ready.
 
 Storing Users and Passwords
 ---------------------------
@@ -110,8 +110,6 @@ Then, add ``db-anon-role`` to the configuration file to allow anonymous requests
 
   db-anon-role = "anon"
 
-.. _jwt-from-sql:
-
 JWT from SQL
 ~~~~~~~~~~~~
 

docs/index.rst

@@ -41,27 +41,27 @@ Sponsors
   .. container:: img-dark
 
     .. image:: ../static/neon-dark.jpg
-      :target: https://neon.com/?utm_source=sponsor&utm_campaign=postgrest
+      :target: https://neon.tech/?utm_source=sponsor&utm_campaign=postgrest
 
   .. container:: img-light
 
     .. image:: ../static/neon.jpg
-      :target: https://neon.com/?utm_source=sponsor&utm_campaign=postgrest
+      :target: https://neon.tech/?utm_source=sponsor&utm_campaign=postgrest
-
-  .. image:: ../static/tembo.png
-    :target: https://www.tembo.io/?utm_source=sponsor&utm_campaign=postgrest
-
-  |
 
   .. container:: img-dark
 
-    .. image:: ../static/euronodes.svg
+    .. image:: ../static/code-build-dark.png
-      :target: https://www.euronodes.com/postgrest
+      :target: https://code.build/?utm_source=sponsor&utm_campaign=postgrest
 
   .. container:: img-light
 
-    .. image:: ../static/euronodes.svg
+    .. image:: ../static/code-build.png
-      :target: https://www.euronodes.com/postgrest
+      :target: https://code.build/?utm_source=sponsor&utm_campaign=postgrest
+
+  |
+
+  .. image:: ../static/tembo.png
+    :target: https://www.tembo.io/?utm_source=sponsor&utm_campaign=postgrest
 
   .. container:: img-dark
 
@@ -73,11 +73,14 @@ Sponsors
     .. image:: ../static/supabase.png
       :target: https://supabase.com/?utm_source=postgrest%20backers&utm_medium=open%20source%20partner&utm_campaign=postgrest%20backers%20github&utm_term=homepage
 
+  .. image:: _static/empty.png
+       :target: #sponsors
+
   .. The static/empty.png(created with `convert -size 320x95 xc:#fcfcfc empty.png`) is an ugly workaround
      to create space and center the logos. It's not easy to layout with restructuredText.
 
-  .. image:: _static/empty.png
+  .. .. image:: _static/empty.png
-    :target: #sponsors
+       :target: #sponsors
 
 |
 
@@ -106,17 +109,10 @@ Getting Support
 
 The project has a friendly and growing community. For discussions, use the Github `discussions page <https://github.com/PostgREST/postgrest/discussions>`_. You can also report or search for bugs/features on the Github `issues <https://github.com/PostgREST/postgrest/issues>`_ page.
 
-Releases
+Release Notes
---------
+-------------
 
-PostgREST follows ``MAJOR.PATCH`` two-part versioning:
+The release notes are published on `PostgREST's GitHub release page <https://github.com/PostgREST/postgrest/releases>`_.
-
-- ``MAJOR``: feature release, may deprecate or remove things.
-- ``PATCH``: fix/security release only; no features, no behavior changes.
-
-Starting from ``v14.0``, only even-numbered MAJOR versions will be released, reserving odd-numbered MAJOR versions for development.
-
-All the releases are published on `PostgREST's GitHub release page <https://github.com/PostgREST/postgrest/releases>`_.
 
 Tutorials
 ---------
@@ -265,21 +261,4 @@ Testimonials
 Contributing
 ------------
 
-Please see the `Contributing guidelines <https://github.com/PostgREST/postgrest/blob/main/CONTRIBUTING.md>`_ in the main PostgREST repository.
+Please see the `Contributing guidelines <https://github.com/PostgREST/postgrest/blob/main/.github/CONTRIBUTING.md>`_ in the main PostgREST repository.
-
-.. raw:: html
-
-  <script type="text/javascript">
-    let hash = window.location.hash;
-
-    const redirects = {
-      // Tables and Views
-      '#release-notes': '#releases',
-    };
-
-    let willRedirectTo = redirects[hash];
-
-    if (willRedirectTo) {
-      window.location.href = willRedirectTo;
-    }
-  </script>

docs/postgrest.dict

@@ -174,7 +174,6 @@ unikernel
 unix
 updatable
 unfulfillable
-unselected
 Untyped
 UPSERT
 Upsert

docs/references/admin_server.rst

@@ -12,7 +12,7 @@ Health Check
 
 You can enable a health check to verify if PostgREST is available for client requests. Also to check the status of its internal state.
 
-Two endpoints ``live`` and ``ready`` will then be available. Both these endpoints reply with a status code and empty response body.
+Two endpoints ``live`` and ``ready`` will then be available.
 
 .. important::
 

docs/references/api/domain_representations.rst

@@ -173,4 +173,4 @@ Domain Representations avoid all the above drawbacks. Their only drawback is tha
 
   Why not create a `base type <https://www.postgresql.org/docs/current/sql-createtype.html#id-1.9.3.94.5.8>`_ instead? ``CREATE TYPE app_uuid (INTERNALLENGTH = 22, INPUT = app_uuid_parser, OUTPUT = app_uuid_formatter)``.
 
-  Creating base types need superuser, which is restricted on cloud hosted databases. Additionally this way lets "how the data is presented" dictate "how the data is stored" which would be backwards.
+  Creating base types need superuser, which is restricted on cloud hosted databases. Additionally this way lets “how the data is presented” dictate “how the data is stored” which would be backwards.

docs/references/api/functions.rst

@@ -294,23 +294,6 @@ Let's get its :ref:`explain_plan` when calling it with filters applied:
 
 Notice there's no "Function Scan" node in the plan, which tells us it has been inlined.
 
-Horizontal Filtering
-~~~~~~~~~~~~~~~~~~~~
-
-Table-valued functions support horizontal filtering on selected and unselected columns.
-
-For example, the following RPC with filter on unselected column returns:
-
-.. code-block:: bash
-
-  curl "http://localhost:3000/rpc/getallprojects?select=id,client_id&name=like.OSX"
-
-.. code-block:: json
-
-  [
-    { "id": 4, "client_id": 2 }
-  ]
-
 .. _scalar_functions:
 
 Scalar functions

docs/references/api/preferences.rst

@@ -292,7 +292,3 @@ With :ref:`RPC <functions>`, the preference is honored completely on the basis o
       "details": "The query affects 14 rows",
       "hint": null
   }
-
-.. note::
-
-  It is important for functions to return ``SETOF`` or ``TABLE`` when called with ``max-affected`` preference. A violation of this would cause a :ref:`PGRST128 <pgrst128>` error.

docs/references/api/resource_embedding.rst

@@ -143,7 +143,7 @@ Since the table name is plural, we can be more accurate by making it singular wi
 One-to-many relationships
 -------------------------
 
-The **foreign key reference** establishes the inverse one-to-many relationship. In this case, ``films`` returns as a JSON array because of the "to-many" end.
+The **foreign key reference** establishes the inverse one-to-many relationship. In this case, ``films`` returns as a JSON array because of the “to-many” end.
 
 .. code-block:: bash
 
@@ -251,12 +251,6 @@ Computed Relationships
 
 You can manually define relationships by using functions. This is useful for database objects that can't define foreign keys, like `Foreign Data Wrappers <https://wiki.postgresql.org/wiki/Foreign_data_wrappers>`_.
 
-Computed relationships have good performance as their intended design enable `function inlining <https://wiki.postgresql.org/wiki/Inlining_of_SQL_functions#Inlining_conditions_for_table_functions>`_.
-
-.. important::
-
-  - Always use ``SETOF`` when creating computed relationships. Functions can return a table without using ``SETOF``, but bear in mind that PostgreSQL will not inline them. e.g. ``RETURNS <table_name>`` is not inlinable.
-
 Assuming there's a foreign table ``premieres`` that we want to relate to ``films``.
 
 .. code-block:: postgres
@@ -289,10 +283,6 @@ The name of the function ``film`` is arbitrary and can be used to do the embeddi
     ".."
   ]
 
-.. warning::
-
-  - Make sure to correctly label the ``to-one`` part of the relationship. When using the ``ROWS 1`` estimation, PostgREST will expect a single row to be returned. If that is not the case, it will unnest the embedding and return repeated values for the top level resource.
-
 Now let's define the opposite one-to-many relationship.
 
 .. code-block:: postgres
@@ -341,6 +331,12 @@ Thanks to overloaded functions, you can use the same function name for different
 
 Computed relationships have good performance as their intended design enable `function inlining <https://wiki.postgresql.org/wiki/Inlining_of_SQL_functions#Inlining_conditions_for_table_functions>`_.
 
+.. warning::
+
+  - Always use ``SETOF`` when creating computed relationships. Functions can return a table without using ``SETOF``, but bear in mind that PostgreSQL will not inline them.
+
+  - Make sure to correctly label the ``to-one`` part of the relationship. When using the ``ROWS 1`` estimation, PostgREST will expect a single row to be returned. If that is not the case, it will unnest the embedding and return repeated values for the top level resource.
+
 .. _embed_disamb:
 .. _target_disamb:
 .. _hint_disamb:
@@ -1210,7 +1206,7 @@ Spread on resources forming :ref:`one-to-many <one-to-many>` and :ref:`many-to-m
      }
    ]
 
-Note that ``films`` is no longer an array of objects, unlike regularly embedding :ref:`one-to-many`. The embedded columns become arrays and they're correlated-in the above result, we can say that "Pulp Fiction" premiered in 1994 and "Reservoir Dogs" in 1992.
+Note that ``films`` is no longer an array of objects, unlike regularly embedding :ref:`one-to-many`. The embedded columns become arrays and they're correlated—in the above result, we can say that "Pulp Fiction" premiered in 1994 and "Reservoir Dogs" in 1992.
 
 Order in spread to-many
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -1306,7 +1302,7 @@ You can use multiple spreads at any level. For example, let's spread ``technical
 
 Note that:
 
-- All the ``film_*`` arrays are correlated-"Reservoir Dogs" premiered in 1992, its runtime is 1:39:00 and it has the following characters: ``[ "Mr. Pink", "Mr. White" ]``.
+- All the ``film_*`` arrays are correlated—"Reservoir Dogs" premiered in 1992, its runtime is 1:39:00 and it has the following characters: ``[ "Mr. Pink", "Mr. White" ]``.
 - The ``film_*`` arrays are ordered by ``year`` (due to ``films.order=year``).
 - The bottom level array ``film_characters`` is ordered (due to ``films.roles.order=character``).
 

docs/references/api/tables_views.rst

@@ -217,15 +217,6 @@ This allows using the ``fts`` operator on ``text`` and ``json`` types out of the
   curl --get "http://localhost:3000/people" \
     -d "my_json_column=not.phfts(english).The%20Fat%20Cats"
 
-.. important::
-
-  To ensure this operation is fast, you need to create an index on the expression:
-
-  .. code-block:: postgres
-
-    CREATE INDEX idx_people_col ON people
-    USING GIN (to_tsvector('french', my_text_column));
-
 .. _v_filter:
 
 Vertical Filtering

docs/references/auth.rst

@@ -31,7 +31,7 @@ The authenticator role is used for connecting to the database and should be conf
 .. _user_impersonation:
 
 User Impersonation
-~~~~~~~~~~~~~~~~~~
+------------------
 
 The picture below shows how the server handles authentication. If auth succeeds, it switches into the user role specified by the request, otherwise it switches into the anonymous role (if it's set in :ref:`db-anon-role`).
 
@@ -43,13 +43,12 @@ This role switching mechanism is called **user impersonation**. In PostgreSQL it
 
   The impersonated roles will have their settings applied. See :ref:`impersonated_settings`.
 
-.. _jwt_auth:
+.. _jwt_impersonation:
 
-JWT Authentication
+JWT-Based User Impersonation
-------------------
+----------------------------
 
-We use `JSON Web Tokens <https://datatracker.ietf.org/doc/html/rfc7519/>`_ to authenticate API requests, this allows us to be stateless and not require database lookups for verification.
+We use `JSON Web Tokens <https://jwt.io/>`_ to authenticate API requests, this allows us to be stateless and not require database lookups for verification. As you'll recall a JWT contains a list of cryptographically signed claims. All claims are allowed but PostgREST cares specifically about a claim called role.
-As you'll recall a JWT contains a list of cryptographically signed claims. All claims are allowed but PostgREST cares specifically about a claim called role (configurable with :ref:`jwt_role_extract`).
 
 .. code:: json
 
@@ -73,10 +72,17 @@ Note that the database administrator must allow the authenticator role to switch
 
 If the client included no JWT (or one without a role claim) then PostgREST switches into the anonymous role. The database administrator must set the anonymous role permissions correctly to prevent anonymous users from seeing or changing things they shouldn't.
 
-.. _bearer_auth:
+.. _jwt_generation:
 
-Bearer Authentication
+JWT Generation
-~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~
+
+You can create a valid JWT either from inside your database (see :ref:`sql_user_management`) or via an external service (see :ref:`external_auth`).
+
+.. _client_auth:
+
+Client Auth
+~~~~~~~~~~~
 
 To make an authenticated request the client must include an :code:`Authorization` HTTP header with the value :code:`Bearer <jwt>`. For instance:
 
@@ -87,29 +93,24 @@ To make an authenticated request the client must include an :code:`Authorization
 
 The ``Bearer`` header value can be used with or without capitalization(``bearer``).
 
-.. _jwt_generation:
+.. _jwt_caching:
 
-JWT Generation
+JWT Caching
-~~~~~~~~~~~~~~
+-----------
 
-You can create a valid JWT either from inside your database (see :ref:`sql_user_management`) or via an external service (see :ref:`external_auth`).
+PostgREST validates ``JWTs`` on every request. We can cache ``JWTs`` to avoid this performance overhead.
 
-.. _jwt_signature:
+To enable JWT caching, the config :code:`jwt-cache-max-lifetime` is to be set. It is the maximum number of seconds for which the cache stores the JWT validation results. The cache uses the :code:`exp` claim to set the cache entry lifetime. If the JWT does not have an :code:`exp` claim, it uses the config value. See :ref:`jwt-cache-max-lifetime` for more details.
 
-JWT Signature Verification
+.. note::
---------------------------
 
-PostgREST supports both symmetric and asymmetric keys for verifying the signature of the token.
+  You can use the :ref:`server-timing_header` to see the effect of JWT caching.
 
 Symmetric Keys
 ~~~~~~~~~~~~~~
 
-In the case of symmetric cryptography the signer and verifier share the same secret passphrase, which can be configured with :ref:`jwt-secret`.
+Each token is cryptographically signed with a secret key. In the case of symmetric cryptography the signer and verifier share the same secret passphrase, which can be configured with :ref:`jwt-secret`.
-If it is set to a simple string then PostgREST interprets it as an HMAC-SHA256 passphrase.
+If it is set to a simple string value like “reallyreallyreallyreallyverysafe” then PostgREST interprets it as an HMAC-SHA256 passphrase.
-
-.. code-block:: ini
-
-  jwt-secret = "reallyreallyreallyreallyverysafe"
 
 .. _asym_keys:
 
@@ -155,39 +156,39 @@ You can specify the literal value as we saw earlier, or reference a filename to
 
   jwt-secret = "@rsa.jwk.pub"
 
-``kid`` verification
+JWK ``kid`` validation
-^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^
 
-PostgREST has built-in verification of the `key ID parameter <https://www.rfc-editor.org/rfc/rfc7517#section-4.5>`_, useful when working with a JSON Web Key Set.
+PostgREST has built-in validation of the `key ID parameter <https://www.rfc-editor.org/rfc/rfc7517#section-4.5>`_, useful when working with a JWK Set.
 It goes as follows:
 
-- If the JWT contains a ``kid`` parameter, then PostgREST will look for the JSON Web Key in the :ref:`jwt-secret`.
+- If the JWT contains a ``kid`` parameter, then PostgREST will look for the JWK in the :ref:`jwt-secret`.
 
-  + If no key has a matching ``kid`` (or if they don't have one defined), the token will be rejected with a :ref:`401 Unauthorized <pgrst301>` error.
+  + If no JWK matches the same ``kid`` value (or if they do not have a ``kid``), then the token will be rejected with a :ref:`401 Unauthorized <pgrst301>` error.
-  + If a key matches the ``kid`` value then it will validate the token against that key accordingly.
+  + If a JWK matches the ``kid`` value then it will validate the token against that JWK accordingly.
 
-- If the JWT doesn't have a ``kid``, PostgREST  will try each key in the :ref:`jwt-secret` one by one until it finds one that works.
+- If the JWT does not have a ``kid`` parameter, then PostgREST will validate the token against each JWK in the :ref:`jwt-secret`.
 
 .. _jwt_claims_validation:
 
 JWT Claims Validation
----------------------
+~~~~~~~~~~~~~~~~~~~~~
 
-Time-Based claims validation
+PostgREST honors the following `JWT claims <https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.4>`_:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The time-based JWT claims specified in `RFC 7519 <https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.4>`_ are validated:
 
 - ``exp`` Expiration Time
 - ``iat`` Issued At
 - ``nbf`` Not Before
+- ``aud`` :ref:`Audience <jwt_aud_validation>`
 
-We allow a 30-second clock skew when validating the above claims. In other words, we give an extra 30 seconds before the JWT is rejected if there is a slight discrepancy in the timestamps.
+.. note::
+  PostgREST allows for a 30-second clock skew when validating the ``exp``, ``iat`` and ``nbf`` claims.
+  In other words, it gives an extra 30 seconds before the token is rejected if there is a slight discrepancy in the timestamps.
 
-.. _jwt_aud:
+.. _jwt_aud_validation:
 
-``aud`` validation
+JWT ``aud`` Claim Validation
-~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 PostgREST has built-in validation of the `JWT audience claim <https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.3>`_.
 It works this way:
@@ -200,29 +201,10 @@ It works this way:
   + If the match fails or if the ``aud`` value is not a string or array of strings, then the token will be rejected with a :ref:`401 Unauthorized <pgrst303>` error.
   + If the ``aud`` key **is not present** or if its value is ``null`` or ``[]``, PostgREST will interpret this token as allowed for all audiences and will complete the request.
 
-.. _jwt_caching:
-
-JWT Cache
----------
-
-JWT signature validation (specially :ref:`asym_keys` such as RSA) is slow, we can cache ``JWT`` validation results to avoid this performance overhead.
-
-The JWT cache is bounded and uses the `SIEVE algorithm <https://cachemon.github.io/SIEVE-website>`_ for efficient eviction. The cache is enabled by default and can be configured with :ref:`jwt-cache-max-entries`.
-
-It's recommended to leave the JWT cache enabled as our load tests indicate ~20% more throughput for simple GET requests when using it. This while reducing CPU utilization in exchange for a bit more memory.
-
-:ref:`jwt_cache_metrics` are available.
-
-.. note::
-
-  - If the ``jwt-secret`` is changed and the config is reloaded, the JWT cache will reset.
-  - JWTs that pass :ref:`jwt_signature` are cached, regardless if they pass :ref:`jwt_claims_validation`. We do this to ensure responses stays fast under common failure cases (such as expired JWTs).
-  - You can use the :ref:`server-timing_header` to see the peformance benefit of JWT caching.
-
 .. _jwt_role_extract:
 
 JWT Role Extraction
--------------------
+~~~~~~~~~~~~~~~~~~~
 
 A JSPath DSL that specifies the location of the :code:`role` key in the JWT claims. It's configured by :ref:`jwt-role-claim-key`. This can be used to consume a JWT provided by a third party service like Auth0, Okta, Microsoft Entra or Keycloak.
 
@@ -260,7 +242,7 @@ Usage examples:
   The string comparison operators are implemented as a custom extension to the JSPath and does not strictly follow the `RFC 9535 <https://www.rfc-editor.org/rfc/rfc9535.html>`_.
 
 JWT Security
-------------
+~~~~~~~~~~~~
 
 There are at least three types of common critiques against using JWT: 1) against the standard itself, 2) against using libraries with known security vulnerabilities, and 3) against using JWT for web sessions. We'll briefly explain each critique, how PostgREST deals with it, and give recommendations for appropriate user action.
 
@@ -296,23 +278,3 @@ doing custom logic based on the web user info.
     END IF;
   END
   $$ LANGUAGE plpgsql;
-
-.. raw:: html
-
-  <script type="text/javascript">
-    let hash = window.location.hash;
-
-    const redirects = {
-      '#jwt-based-user-impersonation': '#jwt-authentication',
-      '#client-auth': '#bearer-authentication',
-      '#jwt-caching': '#jwt-cache',
-      '#jwk-kid-validation': '#kid-verification',
-      '#jwt-aud-claim-validation': '#aud-validation',
-    };
-
-    let willRedirectTo = redirects[hash];
-
-    if (willRedirectTo) {
-      window.location.href = willRedirectTo;
-    }
-  </script>

docs/references/cli.rst

@@ -3,47 +3,23 @@
 CLI
 ===
 
-PostgREST provides a CLI with the options listed below:
+PostgREST provides a CLI with the commands listed below:
-
-.. code:: text
-
-  Usage: postgrest [-v|--version] [-e|--example] [--dump-config | --dump-schema | --ready]
-                 [FILENAME]
-
-    PostgREST / create a REST API to an existing Postgres
-    database
-
-  Available options:
-    -h,--help                Show this help text
-    -v,--version             Show the version information
-    -e,--example             Show an example configuration file
-    --dump-config            Dump loaded configuration and exit
-    --dump-schema            Dump loaded schema as JSON and exit (for debugging,
-                             output structure is unstable)
-    --ready                  Checks the health of PostgREST by doing a request on
-                             the admin server /ready endpoint
-    FILENAME                 Path to configuration file
-
-FILENAME
---------
-
-Runs PostgREST with the given :ref:`file_config`.
 
 Help
 ----
 
 .. code:: bash
 
-  $ postgrest --help
+  $ postgrest [-h|--help]
 
-Shows all the options available.
+Shows all the commands available.
 
 Version
 -------
 
 .. code:: bash
 
-  $ postgrest --version
+  $ postgrest [-v|--version]
 
 Prints the PostgREST version.
 
@@ -52,16 +28,16 @@ Example
 
 .. code:: bash
 
-  $ postgrest --example
+  $ postgrest [-e|--example]
 
-Shows example configuration settings.
+Shows example configuration options.
 
 Dump Config
 -----------
 
 .. code:: bash
 
-  $ postgrest --dump-config
+  $ postgrest [--dump-config]
 
 Dumps the loaded :ref:`configuration` values, considering the configuration file, environment variables and :ref:`in_db_config`.
 
@@ -70,20 +46,6 @@ Dump Schema
 
 .. code:: bash
 
-  $ postgrest --dump-schema
+  $ postgrest [--dump-schema]
 
 Dumps the schema cache in JSON format.
-
-Ready Flag
-----------
-
-Makes a request to the ``/ready`` endpoint of the :ref:`admin_server`. It exits with a return code of ``0`` on success and ``1`` on failure.
-
-.. code-block:: bash
-
-  $ postgrest --ready
-  OK: http://localhost:3001/ready
-
-.. note::
-
-  The ``--ready`` flag cannot be used when :ref:`server-host` is configured with special hostnames. We suggest to change it to ``localhost``.

docs/references/configuration.rst

@@ -409,7 +409,7 @@ db-pool-max-idletime
   **In-Database** `n/a`
   =============== =================================
 
-   *For backwards compatibility, this config parameter is also available as "db-pool-timeout".*
+   *For backwards compatibility, this config parameter is also available as “db-pool-timeout”.*
 
    Time in seconds to close idle pool connections.
 
@@ -603,7 +603,7 @@ jwt-aud
   **In-Database** pgrst.jwt_aud
   =============== =================================
 
-    Specifies an audience for the JWT ``aud`` claim. See :ref:`jwt_aud`.
+    Specifies an audience for the JWT ``aud`` claim. See :ref:`jwt_aud_validation`.
 
 .. _jwt-role-claim-key:
 
@@ -658,20 +658,20 @@ jwt-secret-is-base64
 
   When this is set to :code:`true`, the value derived from :code:`jwt-secret` will be treated as a base64 encoded secret.
 
-.. _jwt-cache-max-entries:
+.. _jwt-cache-max-lifetime:
 
-jwt-cache-max-entries
+jwt-cache-max-lifetime
 ----------------------
 
   =============== =================================
   **Type**        Int
-  **Default**     1000
+  **Default**     0
   **Reloadable**  Y
-  **Environment** PGRST_JWT_CACHE_MAX_ENTRIES
+  **Environment** PGRST_JWT_CACHE_MAX_LIFETIME
-  **In-Database** pgrst.jwt_cache_max_entries
+  **In-Database** pgrst.jwt_cache_max_lifetime
   =============== =================================
 
-  Maximum number of entries in JWT cache. The value :code:`0` disables JWT caching. See :ref:`jwt_caching`.
+  Maximum number of seconds of lifetime for cached entries. The default :code:`0` disables caching. See :ref:`jwt_caching`.
 
 .. _log-level:
 
@@ -714,14 +714,23 @@ log-query
 ---------
 
   =============== =================================
-  **Type**        Boolean
+  **Type**        String
-  **Default**     False
+  **Default**     "disabled"
   **Reloadable**  Y
   **Environment** PGRST_LOG_QUERY
   **In-Database** `n/a`
   =============== =================================
 
-  Logs the SQL query for the corresponding request at the current :ref:`log-level`. See :ref:`sql_query_logs`.
+  Logs the SQL query for the corresponding request at the current :ref:`log-level`.
+  See :ref:`sql_query_logs`.
+
+    .. code:: bash
+
+        # Logs the main SQL query
+        log-query = "main-query"
+
+        # Disables logging the SQL query
+        log-query = "disabled"
 
 .. _openapi-mode:
 

docs/references/connection_pool.rst

@@ -15,7 +15,7 @@ Dynamic Connection Pool
 
 To conserve system resources, PostgREST uses a dynamic connection pool. This enables the number of connections in the pool to increase and decrease depending on request traffic.
 
-- If all the connections are being used, a new connection is added. The pool can grow until it reaches the :ref:`db-pool` size. Note that it's pointless to set this higher than the ``max_connections`` setting in your database.
+- If all the connections are being used, a new connection is added. The pool can grow until it reaches the :ref:`db-pool` size. Note that it’s pointless to set this higher than the ``max_connections`` setting in your database.
 - If a connection is unused for a period of time (:ref:`db-pool-max-idletime`), it will be released.
 - For connecting to the database, the :ref:`authenticator <roles>` role is used. You can configure this using :ref:`db-uri`.
 
@@ -106,4 +106,4 @@ Also set :ref:`db-channel-enabled` to ``false`` since ``LISTEN`` is not compatib
 
 .. note::
 
-  It's not recommended to use an external connection pooler. `Our benchmarks <https://github.com/PostgREST/postgrest/issues/2294#issuecomment-1139148672>`_ indicate it provides much lower performance than PostgREST built-in pool.
+  It’s not recommended to use an external connection pooler. `Our benchmarks <https://github.com/PostgREST/postgrest/issues/2294#issuecomment-1139148672>`_ indicate it provides much lower performance than PostgREST built-in pool.

docs/references/errors.rst

@@ -267,10 +267,6 @@ Related to the HTTP request elements.
 |               |             | implemented.                                                |
 | PGRST127      |             |                                                             |
 +---------------+-------------+-------------------------------------------------------------+
-| .. _pgrst128: | 400         | ``max-affected`` preference is violated with ``RPC`` call.  |
-|               |             | See :ref:`prefer_max_affected`.                             |
-| PGRST128      |             |                                                             |
-+---------------+-------------+-------------------------------------------------------------+
 
 
 .. _pgrst2**:
@@ -329,7 +325,7 @@ Related to the authentication process using JWT. You can follow the :ref:`tut1`
 | PGRST301      |             |                                                             |
 +---------------+-------------+-------------------------------------------------------------+
 | .. _pgrst302: | 401         | Attempted to do a request without                           |
-|               |             | :ref:`bearer_auth` when the anonymous role                  |
+|               |             | :ref:`authentication <client_auth>` when the anonymous role |
 | PGRST302      |             | is disabled by not setting it in :ref:`db-anon-role`.       |
 +---------------+-------------+-------------------------------------------------------------+
 | .. _pgrst303: | 401         | :ref:`JWT claims validation <jwt_claims_validation>`        |

docs/references/listener.rst

@@ -4,7 +4,7 @@ Listener
 ########
 
 PostgREST uses `LISTEN <https://www.postgresql.org/docs/current/sql-listen.html>`_ to reload its :ref:`Schema Cache <schema_reloading_notify>` and :ref:`Configuration <config_reloading_notify>` via `NOTIFY <https://www.postgresql.org/docs/current/sql-notify.html>`_.
-This is useful in environments where you can't send SIGUSR1 or SIGUSR2 Unix Signals.
+This is useful in environments where you can’t send SIGUSR1 or SIGUSR2 Unix Signals.
 Like on cloud managed containers or on Windows systems.
 
 .. code:: postgresql

docs/references/observability.rst

@@ -52,12 +52,14 @@ For diagnostic information about the server itself, PostgREST logs to ``stderr``
 SQL Query Logs
 --------------
 
-To log the SQL queries executed for a request, set the :ref:`log-query` to ``true``. It will be logged based on the current :ref:`log-level` setting.
+To log the :ref:`main SQL query <main_query>` executed for a request, set the :ref:`log-query` to ``main-query``.
+It will be logged based on the current :ref:`log-level` setting.
+For example, with this configuration:
 
 .. code-block:: bash
 
   log-level = "warn"
-  log-query = "true"
+  log-query = "main-query"
 
 The SQL queries will only be logged on ``400`` HTTP errors and up.
 So, if the user requests a resource without sufficient privileges:
@@ -126,11 +128,6 @@ The ``metrics`` endpoint on the :ref:`admin_server` endpoint provides metrics in
 
   curl "http://localhost:3001/metrics"
 
-.. code-block:: http
-
-  HTTP/1.1 200 OK
-  Content-Type: text/plain; charset=utf-8
-
   # HELP pgrst_schema_cache_query_time_seconds The query time in seconds of the last schema cache load
   # TYPE pgrst_schema_cache_query_time_seconds gauge
   pgrst_schema_cache_query_time_seconds 1.5937927e-2
@@ -204,40 +201,6 @@ pgrst_db_pool_max
 
 Max pool connections.
 
-.. _jwt_cache_metrics:
-
-JWT Cache Metrics
------------------
-
-Metrics related to the :ref:`jwt_caching`.
-
-pgrst_jwt_cache_requests_total
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-======== =======
-**Type** Counter
-======== =======
-
-The total number of JWT cache lookups.
-
-pgrst_jwt_cache_hits_total
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-======== =======
-**Type** Counter
-======== =======
-
-The total number of JWT cache hits.
-
-pgrst_jwt_cache_evictions_total
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-======== =======
-**Type** Counter
-======== =======
-
-The total number of JWT cache evictions.
-
 Traces
 ======
 
@@ -283,7 +246,7 @@ See :ref:`proxy-status_header`.
 Server-Timing Header
 --------------------
 
-You can enable the `Server-Timing <https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Server-Timing>`_ header by setting :ref:`server-timing-enabled` on.
+You can enable the `Server-Timing <https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Server-Timing>`_ header by setting :ref:`server-timing-enabled` on.
 This header communicates metrics of the different phases in the request-response cycle.
 
 .. code-block:: bash
@@ -297,7 +260,7 @@ This header communicates metrics of the different phases in the request-response
   Server-Timing: jwt;dur=14.9, parse;dur=71.1, plan;dur=109.0, transaction;dur=353.2, response;dur=4.4
 
 - All the durations (``dur``) are in milliseconds.
-- The ``jwt`` stage is when :ref:`jwt_auth` is done. This duration can be lowered with :ref:`jwt_caching`.
+- The ``jwt`` stage is when :ref:`jwt_impersonation` is done. This duration can be lowered with :ref:`jwt_caching`.
 - On the ``parse`` stage, the :ref:`url_grammar` is parsed.
 - On the ``plan`` stage, the :ref:`schema_cache` is used to generate the :ref:`main_query` of the transaction.
 - The ``transaction`` stage corresponds to the database transaction. See :ref:`transactions`.

docs/requirements.txt

@@ -1,5 +1,5 @@
 # This file is auto-generated by postgrest-nixpkgs-upgrade
-sphinx==8.2.3
+sphinx==7.4.7
 sphinx-copybutton==0.5.2
 sphinx-rtd-dark-mode==1.3.0
 sphinx-rtd-theme==3.0.2

flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1752006229,
+        "lastModified": 1731165248,
-        "narHash": "sha256-BeuAPwNM2RBc5bvUTb0j4GRs2yBkDeRCw/8Y3v9Xesc=",
+        "narHash": "sha256-DiHFKIdBmMx5/DUARhVqaxvEIiy4EE6Eqs9Qs4oxme8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c80edd02003fe3d8af527215a3ac069be9cfd47f",
+        "rev": "a90280100f41a10914edfe729a4053e60c92b8e3",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixpkgs-25.05-darwin",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,7 +2,7 @@
   description = "REST API for any Postgres database";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   };
 
   nixConfig = {
@@ -33,8 +33,8 @@
     in
     {
       packages = genSystems (attrs: {
-        default = attrs.postgrestPackage.bin;
+        default = attrs.postgrestPackage;
-        profiled = attrs.postgrestProfiled.bin;
+        profiled = attrs.postgrestProfiled;
       } // nixpkgs.lib.optionalAttrs (attrs ? postgrestStatic) {
         static = attrs.postgrestStatic;
       });
@@ -42,7 +42,7 @@
       apps = genSystems (attrs: {
         default = {
           type = "app";
-          program = "${attrs.postgrestStatic or attrs.postgrestPackage.bin}/bin/postgrest";
+          program = "${attrs.postgrestStatic or attrs.postgrestPackage}/bin/postgrest";
           meta.description = "REST API for any Postgres database";
         };
       });

nix/README.md

@@ -72,10 +72,9 @@ The PostgREST utilities available in `nix-shell` all have names that begin with
 ```bash
 # Note: The utilities listed here might not be up to date.
 [nix-shell]$ postgrest-<tab>
-postgrest-build                   postgrest-parallel-curl
+postgrest-build                   postgrest-profiled-run
-postgrest-check                   postgrest-profiled-run
+postgrest-check                   postgrest-push-cachix
-postgrest-clean                   postgrest-push-cachix
+postgrest-clean                   postgrest-release
-postgrest-commitlint              postgrest-release
 postgrest-coverage                postgrest-repl
 postgrest-coverage-draft-overlay  postgrest-run
 postgrest-docs-build              postgrest-style
@@ -91,14 +90,15 @@ postgrest-gen-ctags               postgrest-watch
 postgrest-gen-jwt                 postgrest-with-all
 postgrest-gen-secret              postgrest-with-git
 postgrest-git-hooks               postgrest-with-pgrst
-postgrest-hsie-graph-modules      postgrest-with-pg-13
+postgrest-hsie-graph-modules      postgrest-with-postgresql-12
-postgrest-hsie-graph-symbols      postgrest-with-pg-14
+postgrest-hsie-graph-symbols      postgrest-with-postgresql-13
-postgrest-hsie-minimal-imports    postgrest-with-pg-15
+postgrest-hsie-minimal-imports    postgrest-with-postgresql-14
-postgrest-lint                    postgrest-with-pg-16
+postgrest-lint                    postgrest-with-postgresql-15
-postgrest-loadtest                postgrest-with-pg-17
+postgrest-loadtest                postgrest-with-postgresql-16
-postgrest-loadtest-against        postgrest-with-slow-pg
+postgrest-loadtest-against        postgrest-with-postgresql-17
-postgrest-loadtest-report         postgrest-with-slow-postgrest
+postgrest-loadtest-report         postgrest-with-slow-pg
-postgrest-nixpkgs-upgrade
+postgrest-nixpkgs-upgrade         postgrest-with-slow-postgrest
+postgrest-parallel-curl
 ...
 
 [nix-shell]$
@@ -174,7 +174,7 @@ $ nix-shell --run "postgrest-with-all postgrest-test-spec"
 
 # Run the tests against a specific version of PostgreSQL (use tab-completion in
 # nix-shell to see all available versions):
-$ nix-shell --run "postgrest-with-pg-13 postgrest-test-spec"
+$ nix-shell --run "postgrest-with-postgresql-13 postgrest-test-spec"
 
 ```
 
@@ -284,7 +284,7 @@ Tools like `postgrest-build`, `postgrest-run`, `postgrest-repl` etc. are simple
 also run in CI, with the exception of the IO and Memory checks that need to be run
 separately.
 
-`postgrest-with-pg-*` take a command as an argument and will run it
+`postgrest-with-postgresql-*` take a command as an argument and will run it
 with a temporary database. `postgrest-with-all` will run the command against
 all supported PostgreSQL versions. Tests run without `postgrest-with-*` are
 run against the latest PostgreSQL version by default.
@@ -380,7 +380,7 @@ that).
 We also use `default.nix` to load our pinned version of the `nixpkgs`
 repository. This set of packages will always be the same, independently from
 where or when you use it. The pinned version is taken from `flake.lock` and
-can be updated with `postgrest-nixpkgs-upgrade`.
+can be updated with `nix flake update`.
 
 ### `shell.nix`
 

nix/libpq.nix

@@ -0,0 +1,61 @@
+# Creating a separate libpq package is is discussed in
+# https://github.com/NixOS/nixpkgs/issues/61580, but nixpkgs has not moved
+# forward, yet.
+# This package is passed to postgresql-libpq (haskell) which needs to be
+# cross-compiled to the static build and possibly other architectures as
+# as well. To reduce the number of dependencies that need to be built with
+# it, this derivation focuses on building the client libraries only. No
+# server, no tests.
+{ stdenv
+, lib
+, openssl
+, zlib
+, postgresql
+, pkg-config
+, tzdata
+}:
+
+stdenv.mkDerivation {
+  pname = "libpq";
+  inherit (postgresql) src version patches;
+
+  __structuredAttrs = true;
+  env.CFLAGS = "-fdata-sections -ffunction-sections"
+    + (if stdenv.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections");
+
+  configureFlags = [
+    "--without-gssapi"
+    "--without-icu"
+    "--without-readline"
+    "--with-openssl"
+    "--with-system-tzdata=${tzdata}/share/zoneinfo"
+    "--sysconfdir=/etc/postgresql"
+  ];
+
+  nativeBuildInputs = [ pkg-config tzdata ];
+  buildInputs = [ openssl zlib ];
+
+  buildFlags = [ "submake-libpq" "submake-libpgport" ];
+
+  installPhase = ''
+    runHook preInstall
+
+    make -C src/bin/pg_config install
+    make -C src/common install
+    make -C src/include install
+    make -C src/interfaces/libpq install
+    make -C src/port install
+
+    rm -rfv $out/share
+
+    runHook postInstall
+  '';
+
+  outputs = [ "out" ];
+
+  meta = with lib; {
+    homepage = "https://www.postgresql.org";
+    description = "Client API library for PostgreSQL";
+    license = licenses.postgresql;
+  };
+}

nix/overlays/checked-shell-script/checked-shell-script.nix

@@ -6,7 +6,6 @@
 , coreutils
 , git
 , lib
-, moreutils
 , runCommand
 , shellcheck
 , stdenv
@@ -57,7 +56,7 @@ let
         # Example: This way `postgrest-watch -h` will return the help output for watch, while
         # `postgrest-watch postgrest-test-spec -h` will return the help output for test-spec.
         # Taken from: https://github.com/matejak/argbash/issues/114#issuecomment-557108274
-        sed '/_positionals_count + 1/a\\t\t\t\tset -- "''${@:1:1}" "--" "''${@:2}"' $out | ${moreutils}/bin/sponge $out
+        sed '/_positionals_count + 1/a\\t\t\t\tset -- "''${@:1:1}" "--" "''${@:2}"' -i $out
       '';
 
   bash-completion =
@@ -67,7 +66,7 @@ let
       ''
 
       + lib.optionalString (positionalCompletion != "") ''
-        sed 's#COMPREPLY.*compgen -o bashdefault .*$#${escape positionalCompletion}#' $out | ${moreutils}/bin/sponge $out
+        sed 's#COMPREPLY.*compgen -o bashdefault .*$#${escape positionalCompletion}#' -i $out
       ''
     );
 
@@ -104,7 +103,8 @@ let
         ''
 
         + lib.optionalString withTmpDir ''
-          tmpdir="$(${coreutils}/bin/mktemp -d --tmpdir ${name}-XXX)"
+          mkdir -p "''${TMPDIR:-/tmp}/postgrest"
+          tmpdir="$(${coreutils}/bin/mktemp -d --tmpdir postgrest/${name}-XXX)"
 
           # we keep the tmpdir when an error occurs for debugging
           trap 'echo Temporary directory kept at: $tmpdir' ERR

nix/overlays/default.nix

@@ -3,5 +3,6 @@
   checked-shell-script = import ./checked-shell-script;
   gitignore = import ./gitignore.nix;
   haskell-packages = import ./haskell-packages.nix;
+  postgresql-libpq = import ./postgresql-libpq.nix;
   slocat = import ./slocat.nix;
 }

nix/overlays/haskell-packages.nix

@@ -50,34 +50,34 @@ let
       # jailbreak, because hspec limit for tests
       fuzzyset = prev.fuzzyset_0_2_4;
 
-      # TODO: Remove once available in nixpkgs haskellPackages
+      hasql-pool = lib.dontCheck (prev.callHackageDirect
-      configurator-pg =
+        {
-        prev.callHackageDirect
+          pkg = "hasql-pool";
-          {
+          ver = "1.0.1";
-            pkg = "configurator-pg";
+          sha256 = "sha256-Hf1f7lX0LWkjrb25SDBovCYPRdmUP1H6pAxzi7kT4Gg=";
-            ver = "0.2.11";
+        }
-            sha256 = "sha256-mtGtNawDJgz2ZIEVca+IYXVu4oNw9xsfJiYWAqAbbgc=";
+        { });
-          }
-          { };
 
-      # TODO: Remove once available in nixpkgs haskellPackages
+      hasql-notifications = lib.dontCheck (prev.callHackageDirect
-      streaming-commons =
+        {
-        prev.callHackageDirect
+          pkg = "hasql-notifications";
-          {
+          ver = "0.2.2.2";
-            pkg = "streaming-commons";
+          sha256 = "sha256-myKwlug7OgTa/qP6mHfCD+5Q8IhM17JvpJBfSo+M01k=";
-            ver = "0.2.3.1";
+        }
-            sha256 = "sha256-Gl2eaJcWe1sxmcE/octWlH9uSnERguf+5H66K4fV87s=";
+        { });
-          }
-          { };
 
-      # Downgrade hasql and related packages while we are still on GHC 9.4 for the static build.
+      # newer nixpkgs already has 0.10., so we fallback to default for forward compat
-      hasql = lib.dontCheck (lib.doJailbreak prev.hasql_1_6_4_4);
+      jose-jwt = prev.jose-jwt_0_10_0 or prev.jose-jwt;
-      hasql-dynamic-statements = lib.dontCheck prev.hasql-dynamic-statements_0_3_1_5;
+
-      hasql-implicits = lib.dontCheck prev.hasql-implicits_0_1_1_3;
+      postgresql-libpq = lib.dontCheck (prev.callHackageDirect
-      hasql-notifications = lib.dontCheck prev.hasql-notifications_0_2_2_2;
+        {
-      hasql-pool = lib.dontCheck prev.hasql-pool_1_0_1;
+          pkg = "postgresql-libpq";
-      hasql-transaction = lib.dontCheck prev.hasql-transaction_1_1_0_1;
+          ver = "0.10.1.0";
-      postgresql-binary = lib.dontCheck (lib.doJailbreak prev.postgresql-binary_0_13_1_3);
+          sha256 = "sha256-tXOMqCO8opMilI9rx0D+njqjIjbZsH168Bzb8Aq8Ff4=";
+        }
+        {
+          postgresql = super.libpq;
+        });
     };
 in
 {

nix/overlays/postgresql-libpq.nix

@@ -0,0 +1,7 @@
+_: super:
+{
+  # Depending on which nixpkgs version is pinned, libpq might either be available already - or not.
+  libpq = super.libpq or (super.callPackage ../libpq.nix {
+    postgresql = super.postgresql_16;
+  });
+}

nix/static.nix

@@ -8,25 +8,65 @@ let
   inherit (pkgs) pkgsStatic;
   inherit (pkgsStatic.haskell) lib;
 
-  packagesStatic = pkgsStatic.haskell.packages.native-bignum."${compiler}";
+  packagesStatic =
+    pkgsStatic.haskell.packages."${compiler}".override (old: {
+      ghc = pkgsStatic.pkgsBuildHost.haskell.compiler."${compiler}".override {
+        # Using the bundled libffi generally works better for cross-compiling
+        libffi = null;
+        # Building sphinx fails on some platforms
+        enableDocs = false;
+        # Cross compiling with native bignum works better than with gmp
+        enableNativeBignum = true;
+      };
+
+      overrides = pkgs.lib.composeExtensions old.overrides (_: prev: {
+        postgresql-libpq = (lib.overrideCabal prev.postgresql-libpq {
+          # TODO: This section can be simplified when this PR has made it's way to us:
+          #  https://github.com/NixOS/nixpkgs/pull/286370
+          # Additionally, we need to use the default version in nixpkgs, otherwise the
+          # override will not be active as well.
+          # Using use-pkg-config flag, because pg_config won't work when cross-compiling
+          configureFlags = [ "-fuse-pkg-config" ];
+          # postgresql doesn't build in the fully static overlay - but the default
+          # derivation is built with static libraries anyway.
+          libraryPkgconfigDepends = [ pkgsStatic.libpq ];
+          librarySystemDepends = [ ];
+        }).overrideAttrs (_: prevAttrs: {
+          buildInputs = prevAttrs.buildInputs ++ [ pkgsStatic.openssl ];
+        });
+      });
+    });
 
   makeExecutableStatic = drv: pkgs.lib.pipe drv [
     lib.compose.justStaticExecutables
 
     # To successfully compile a redistributable, fully static executable we need to:
-    # 1. avoid any references to /nix/store to prevent blowing up the closure size.
+    # 1. make executable really statically linked.
-    (drv: drv.overrideAttrs {
+    # 2. avoid any references to /nix/store to prevent blowing up the closure size.
-      allowedReferences = [
+    # 3. be able to run the executable.
-        pkgsStatic.openssl.etc
+    # When checking for references, we ignore the following:
-      ];
+    # - eeee... are removed references which don't actually exist
-    })
+    # - openssl-etc references are purposely designed to be very small
+    (lib.compose.overrideCabal (drv: {
+      postFixup = drv.postFixup + ''
+        exe="$out/bin/postgrest"
 
-    # 2. be able to run the executable.
+        if ! (file "$exe" | grep 'statically linked') then
-    (drv: drv.overrideAttrs {
+          echo "not a static executable, ldd output:"
-      passthru.tests.version = pkgsStatic.testers.testVersion {
+          ldd "$exe"
-        package = drv;
+          exit 1
-      };
+        fi
-    })
+
+        echo "Checking for references to /nix/store..."
+        (${pkgsStatic.binutils}/bin/strings "$exe" \
+          | grep -v /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee \
+          | grep -v -etc/etc/ssl \
+          | grep /nix/store || exit 0 && exit 1)
+        echo "No references to /nix/store found"
+
+        "$exe" --help
+      '';
+    }))
   ];
 
 in

nix/tools/cabalTools.nix

@@ -15,6 +15,7 @@ let
         withEnv = postgrest.env;
       }
       ''
+        ${cabal-install}/bin/cabal v2-update
         exec ${cabal-install}/bin/cabal v2-build ${devCabalOptions} "''${_arg_leftovers[@]}"
       '';
 
@@ -33,17 +34,6 @@ let
         exec ${cabal-install}/bin/cabal v2-clean
       '';
 
-  update =
-    checkedShellScript
-      {
-        name = "postgrest-cabal-update";
-        docs = "Update cabal's package list from hackage.haskell.org";
-        workingDir = "/";
-      }
-      ''
-        exec ${cabal-install}/bin/cabal v2-update
-      '';
-
   run =
     checkedShellScript
       {
@@ -55,7 +45,6 @@ let
             "ARG_USE_ENV([PGRST_DB_POOL], [1], [PostgREST pool size])"
             "ARG_USE_ENV([PGRST_DB_POOL_ACQUISITION_TIMEOUT], [1], [PostgREST pool timeout])"
             "ARG_USE_ENV([PGRST_JWT_SECRET], [reallyreallyreallyreallyverysafe], [PostgREST JWT secret])"
-            "ARG_USE_ENV([PGRST_ADMIN_SERVER_PORT], [3001], [PostgREST admin server port])"
             "ARG_LEFTOVERS([PostgREST arguments])"
           ];
         workingDir = "/";
@@ -66,7 +55,6 @@ let
         export PGRST_DB_POOL
         export PGRST_DB_POOL_ACQUISITION_TIMEOUT
         export PGRST_JWT_SECRET
-        export PGRST_ADMIN_SERVER_PORT
 
         exec ${cabal-install}/bin/cabal v2-run ${devCabalOptions} --verbose=0 -- \
           postgrest "''${_arg_leftovers[@]}"
@@ -95,8 +83,10 @@ let
         export PGRST_DB_POOL_ACQUISITION_TIMEOUT
         export PGRST_JWT_SECRET
 
-        exec ${cabal-install}/bin/cabal --builddir="dist-prof" v2-run --enable-profiling --disable-shared exe:postgrest -- \
+        ${cabal-install}/bin/cabal v2-update
-          +RTS -p -h -RTS "''${_arg_leftovers[@]}"
+        ${cabal-install}/bin/cabal --builddir="dist-prof" v2-build --enable-profiling --disable-shared exe:postgrest
+        ${cabal-install}/bin/cabal --builddir="dist-prof" v2-run -- \
+          postgrest +RTS -p -h -RTS "''${_arg_leftovers[@]}"
       '';
 
   repl =
@@ -119,7 +109,6 @@ buildToolbox
     inherit
       build
       clean
-      update
       run
       runProfiled
       repl;

nix/tools/devTools.nix

@@ -10,7 +10,6 @@
 , hsie
 , nix
 , silver-searcher
-, stdenv
 , style
 , tests
 , withTools
@@ -54,14 +53,10 @@ let
 
           Requires authentication with `cachix authtoken ...`.
         '';
-        args =
-          [
-            "ARG_OPTIONAL_SINGLE([system], , [System], [${stdenv.system}])"
-          ];
         workingDir = "/";
       }
       ''
-        ${nix}/bin/nix-instantiate --argstr system "$_arg_system" \
+        ${nix}/bin/nix-instantiate \
           | xargs ${nix}/bin/nix-store -qR --include-outputs \
           | ${cachix}/bin/cachix push postgrest
       '';
@@ -251,6 +246,7 @@ let
       }
       ''
         mkdir -p "$_arg_dumpdir"
+        ${cabal-install}/bin/cabal v2-update
         ${cabal-install}/bin/cabal v2-build ${devCabalOptions} \
           --builddir="$tmpdir" \
           --ghc-option=-ddump-minimal-imports \

nix/tools/docs.nix

@@ -2,6 +2,7 @@
 , aspellDicts
 , buildToolbox
 , checkedShellScript
+, fetchPypi
 , lib
 , plantuml
 , python3
@@ -10,14 +11,26 @@
 , writers
 }:
 let
-  selectPythonPackages = ps: [
+  selectPythonPackages = ps:
-    ps.sphinx
+    let
-    ps.sphinx-copybutton
+      # TODO: Remove with next nixpkgs update
-    ps.sphinx-rtd-dark-mode
+      sphinx-rtd-theme = assert ps.sphinx-rtd-theme.version == "2.0.0"; ps.sphinx-rtd-theme.overrideAttrs rec {
-    ps.sphinx-rtd-theme
+        version = "3.0.2";
-    ps.sphinx-tabs
+        src = fetchPypi {
-    ps.sphinxext-opengraph
+          pname = "sphinx_rtd_theme";
-  ];
+          inherit version;
+          hash = "sha256-t0V7wl3acjsgsIamcLmVPIWeq2CioD7o6yuyPhduX4U=";
+        };
+      };
+    in
+    [
+      ps.sphinx
+      ps.sphinx-copybutton
+      (ps.sphinx-rtd-dark-mode.override { inherit sphinx-rtd-theme; })
+      sphinx-rtd-theme
+      ps.sphinx-tabs
+      ps.sphinxext-opengraph
+    ];
 
   requirements = writeTextFile {
     name = "requirements.txt";
@@ -35,9 +48,6 @@ let
         workingDir = "/docs";
       }
       ''
-        # https://github.com/sphinx-doc/sphinx/issues/11739
-        export LC_ALL=C
-
         function build() {
           ${python}/bin/sphinx-build --color -W -a -n . -b "$@"
         }
@@ -122,8 +132,6 @@ let
         workingDir = "/docs";
       }
       ''
-        export LC_ALL=C
-
         FILES=$(find . -type f -iname '*.rst' | tr '\n' ' ')
 
         # shellcheck disable=SC2086 disable=SC2016
@@ -144,8 +152,6 @@ let
         workingDir = "/docs";
       }
       ''
-        export LC_ALL=C
-
         FILES=$(find . -type f -iname '*.rst' | tr '\n' ' ')
 
         tail -n+2 postgrest.dict \
@@ -164,8 +170,6 @@ let
         workingDir = "/docs";
       }
       ''
-        export LC_ALL=C
-
         ${python}/bin/sphinx-build --color -b linkcheck . ../.docs-build
       '';
 

nix/tools/generate_targets.py

@@ -1,53 +1,63 @@
 # generates a file to be used by the vegeta load testing tool
-
-# It includes a worst case scenario for the JWT cache:
-# - all requests will have a unique JWT so no cache hits
-# - all jwts have an expiration that will be long enough to be
-#   valid at time of request but short enough that already
-#   validated jwts will expire later during the loadtest run
-# - the above guarantees JWT cache purging will happen
-# - we want this to track resource consumption in the worst case
-
-# And a more normal scenario where non-expiring JWTs are picked
-# from an array
 import time
+import hmac
+import hashlib
+import base64
+import json
 import argparse
 import sys
 import random
-import jwt
-import jwcrypto.jwk as jwk
-from typing import Optional
-from pathlib import Path
 
+SECRET = b"reallyreallyreallyreallyverysafe"
 URL = "http://postgrest"
-
+JWT_DURATION = 120
-secret_key = b"reallyreallyreallyreallyverysafe"
+TOTAL_TARGETS = 50000  # tuned by hand to reduce result variance
-
-key = jwk.JWK.generate(kty="RSA", size=4096)
-private_key = jwt.algorithms.RSAAlgorithm.from_jwk(key.export_private())
-public_key = key.export_public()
 
 
-def generate_jwt(now: int, exp_inc: Optional[int], is_hs: bool) -> str:
+def base64url_encode(data: bytes) -> str:
-    """Generate an HS256 or RS256 JWT"""
+    """URL-safe Base64 encode without padding."""
+    return base64.urlsafe_b64encode(data).rstrip(b"=").decode("ascii")
+
+
+def generate_jwt(exp_inc: int) -> str:
+    """Generate an HS256 JWT"""
+    # Header & payload
+    header = {"alg": "HS256", "typ": "JWT"}
+    now = int(time.time())
     payload = {
         "sub": f"user_{random.getrandbits(32)}",
         "iat": now,
+        "exp": now + exp_inc,
         "role": "postgrest_test_author",
     }
 
-    if exp_inc is not None:
+    # Encode to JSON and then to Base64URL
-        payload["exp"] = now + exp_inc
+    header_b = json.dumps(header, separators=(",", ":")).encode()
+    payload_b = json.dumps(payload, separators=(",", ":")).encode()
+    header_b64 = base64url_encode(header_b)
+    payload_b64 = base64url_encode(payload_b)
 
-    k = secret_key if is_hs else private_key
+    # Sign (HMAC‑SHA256) the "<header>.<payload>" string
-    alg = "HS256" if is_hs else "RS256"
+    signing_input = f"{header_b64}.{payload_b64}".encode()
-    return jwt.encode(payload, k, alg)
+    signature = hmac.new(SECRET, signing_input, hashlib.sha256).digest()
+    signature_b64 = base64url_encode(signature)
+
+    return f"{header_b64}.{payload_b64}.{signature_b64}"
 
 
-def append_targets(lines: list[str], token: str):
+# We want to ensure 401 Unauthorized responses don't happen during
-    lines.append(f"OPTIONS {URL}/authors_only")
+# JWT validation, this can happen when the jwt `exp` is too short.
-    lines.append(f"Authorization: Bearer {token}")
+# At the same time, we want to ensure the `exp` is not too big,
-    lines.append("")  # blank line to separate requests
+# so expires will occur and postgREST will have to clean cached expired JWTs.
+def estimate_adequate_jwt_exp_increase(iteration: int) -> int:
+    # estimated time takes to build and run postgrest itself
+    build_run_postgrest_time = 2
+    # estimated time it takes to generate the targets file
+    file_generation_time = TOTAL_TARGETS // (10**-5)
+    # estimated exp time so some JWTs will expire
+    dynamic_exp_inc = iteration // 1000
+
+    return build_run_postgrest_time + file_generation_time + dynamic_exp_inc
 
 
 def main():
@@ -58,77 +68,16 @@ def main():
         "output",
         help="Path to write the generated targets file",
     )
-    parser.add_argument(
-        "--worst",
-        dest="worst",
-        action=argparse.BooleanOptionalAction,
-        default=False,
-        help="Generate worst case targets for a JWT cache",
-    )
-    parser.add_argument(
-        "--rsa",
-        dest="jwk_path",
-        metavar="JWK_PATH",
-        type=Path,
-        default=None,
-        help="Path for generating a RSA JWK file to sign tokens with",
-    )
-
     args = parser.parse_args()
 
-    is_hs = args.jwk_path is None
+    lines = []
-
-    nsamples = 1000
-    if is_hs:
-        ntargets = 200000
-    else:
-        # The asymmetric targets take too long to compute so we reduce them
-        ntargets = 50000
-
-    if not is_hs:
-        try:
-            with open(args.jwk_path, "w") as jwk:
-                jwk.write(public_key)
-                print(f"Created {args.jwk_path} file containing the RSA JWK")
-        except IOError as e:
-            print(f"Error writing to {args.jwk_path}: {e}", file=sys.stderr)
-            sys.exit(1)
-
-    print(f"Generating {ntargets} targets...")
-
     start_time = time.time()
 
-    now = int(start_time)
+    for i in range(TOTAL_TARGETS):
-
+        token = generate_jwt(estimate_adequate_jwt_exp_increase(i))
-    lines = []
+        lines.append(f"OPTIONS {URL}/authors_only")
-
+        lines.append(f"Authorization: Bearer {token}")
-    # We want to ensure 401 Unauthorized responses don't happen during
+        lines.append("")  # blank line to separate requests
-    # JWT validation, this can happen when the jwt `exp` is too short.
-    # At the same time, we want to ensure the `exp` is not too big,
-    # so expires will occur and postgREST needs to
-    # clean cached expired JWTs
-    if args.worst:
-        # estimated time takes to build and run postgrest itself
-        build_run_postgrest_time = 2
-        # estimated time it takes to generate the targets file
-        # the division numbers are tuned by hand
-        if is_hs:  # hs generation is much faster
-            gen_time = ntargets // 66666
-        else:  # asymmetric is slower so the time is higher
-            gen_time = ntargets // 220
-
-        # estimated exp time so some JWTs will expire
-        inc = build_run_postgrest_time + gen_time
-
-        for i in range(ntargets):
-            token = generate_jwt(now, inc + i // 1000, is_hs)
-            append_targets(lines, token)
-
-    else:
-        tokens = [generate_jwt(now, None, is_hs) for _ in range(nsamples)]
-        for i in range(ntargets):
-            token = random.choice(tokens)
-            append_targets(lines, token)
 
     try:
         with open(args.output, "w") as f:
@@ -138,8 +87,7 @@ def main():
         sys.exit(1)
 
     elapsed = time.time() - start_time
-    print(f"Created {ntargets} targets", end=" ")
+    print(f"Created {TOTAL_TARGETS} targets in {args.output} ({elapsed:.2f}s)")
-    print(f"in {args.output} ({elapsed:.2f}s)")
 
 
 if __name__ == "__main__":

nix/tools/gitTools.nix

@@ -1,60 +0,0 @@
-{ buildToolbox
-, checkedShellScript
-, commitlint
-, writeText
-}:
-let
-  # Rules format: [<severity>, <"always"/"never">, <value>]
-  commitlintConfig = writeText "commitlint.config.mjs" ''
-    export default {
-      rules: {
-        "type-enum": [2, "always", [
-            'add',      // Add a new feature
-            'amend',    // To amend an unrealease commit
-            'change',   // Breaking changes
-            'chore',    // Update sponsors, changelog, readme etc
-            'ci',       // CI configuration files and scripts
-            'docs',     // Documentation
-            'fix',      // Bug fix
-            'nix',      // Related to Nix
-            'perf',     // Performance improvements
-            'refactor', // Refactoring code
-            'remove',   // Remove a feature or fix
-            'test',     // Adding tests
-          ]],
-
-          'subject-case':       [2, 'never', ['pascal-case', 'start-case']],
-          'subject-empty':      [2, 'never'],
-          'subject-full-stop':  [2, 'never', '.'],
-          'subject-max-length': [2, 'always', 80],
-          'subject-min-length': [2, 'always', 5],
-
-          'scope-case':         [2, 'always', 'lower-case'],
-
-          'body-leading-blank': [2, 'always'],
-      },
-    };
-  '';
-
-  commitCheck =
-    checkedShellScript
-      {
-        name = "postgrest-commitlint";
-        docs = "Script to validate commit messages";
-        workingDir = "/";
-        args = [
-          "ARG_OPTIONAL_SINGLE([from],, [commit ref start from], [main])"
-          "ARG_OPTIONAL_SINGLE([to],, [commit ref end at], [HEAD])"
-        ];
-      }
-      ''
-        # Run commitlint with the given configuration
-
-        ${commitlint}/bin/commitlint --config ${commitlintConfig} --from "$_arg_from" --to "$_arg_to"
-      '';
-in
-buildToolbox
-{
-  name = "postgrest-commitlint";
-  tools = { inherit commitCheck; };
-}

nix/tools/loadtest.nix

@@ -41,9 +41,8 @@ let
         args = [
           "ARG_OPTIONAL_SINGLE([output], [o], [Filename to dump json output to], [./loadtest/result.bin])"
           "ARG_OPTIONAL_SINGLE([testdir], [t], [Directory to load tests and fixtures from], [./test/load])"
-          "ARG_OPTIONAL_SINGLE([kind], [k], [Kind of loadtest], [mixed])"
+          "ARG_OPTIONAL_SINGLE([kind], [k], [Kind of loadtest (mixed: repeat mixed requests, jwt: run once over many requests with unique jwts)], [mixed])"
-          "ARG_TYPE_GROUP_SET([KIND], [KIND], [kind], [mixed,jwt-hs,jwt-hs-cache,jwt-hs-cache-worst,jwt-rsa,jwt-rsa-cache,jwt-rsa-cache-worst])"
+          "ARG_TYPE_GROUP_SET([KIND], [KIND], [kind], [mixed,jwt])"
-          "ARG_OPTIONAL_SINGLE([monitor], [m], [Monitoring file], [./loadtest/result.csv])"
           "ARG_LEFTOVERS([additional vegeta arguments])"
         ];
         workingDir = "/";
@@ -59,67 +58,35 @@ let
         export PGRST_DB_TX_END="rollback-allow-override"
         export PGRST_LOG_LEVEL="crit"
         export PGRST_JWT_SECRET="reallyreallyreallyreallyverysafe"
-        # set previous PGRST_JWT_CACHE_MAX_LIFETIME configuration so that
-        # load test works across branches
-        # TODO clean once PGRST_JWT_CACHE_MAX_ENTRIES merged and released
         export PGRST_JWT_CACHE_MAX_LIFETIME="86400"
 
         mkdir -p "$(dirname "$_arg_output")"
         abs_output="$(realpath "$_arg_output")"
 
         case "$_arg_kind" in
-          jwt-hs)
+          jwt)
-            ${genTargetsHS} "$_arg_testdir"/gen_targets.http
-            export PGRST_JWT_CACHE_MAX_ENTRIES="0"
-            export PGRST_JWT_CACHE_MAX_LIFETIME="0"
-            ;;
 
-          jwt-hs-cache)
+            ${genTargets} "$_arg_testdir"/gen_targets.http
-            ${genTargetsHS} "$_arg_testdir"/gen_targets.http
-            ;;
 
-          jwt-hs-cache-worst)
+            # shellcheck disable=SC2145
-            ${genTargetsHS} --worst "$_arg_testdir"/gen_targets.http
+            ${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \
-            ;;
+            ${withTools.withPgrst} \
-
+            sh -c "cd \"$_arg_testdir\" && ${runner} -lazy -targets gen_targets.http -output \"$abs_output\" \"''${_arg_leftovers[@]}\""
-          jwt-rsa)
+            ${vegeta}/bin/vegeta report -type=text "$_arg_output"
-            ${genTargetsHS} --rsa="$_arg_testdir"/gen_jwk.json "$_arg_testdir"/gen_targets.http
-            export PGRST_JWT_CACHE_MAX_ENTRIES="0"
-            export PGRST_JWT_CACHE_MAX_LIFETIME="0"
-            export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.json"
-            ;;
-
-          jwt-rsa-cache)
-            ${genTargetsHS} --rsa="$_arg_testdir"/gen_jwk.json "$_arg_testdir"/gen_targets.http
-            export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.json"
-            ;;
-
-          jwt-rsa-cache-worst)
-            ${genTargetsHS} --worst --rsa="$_arg_testdir"/gen_jwk.json "$_arg_testdir"/gen_targets.http
-            export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.json"
             ;;
 
           *)
+
+            # shellcheck disable=SC2145
+            ${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \
+            ${withTools.withSlowPg} \
+            ${withTools.withPgrst} \
+            ${withTools.withSlowPgrst} \
+            sh -c "cd \"$_arg_testdir\" && ${runner} -targets targets.http -output \"$abs_output\" \"''${_arg_leftovers[@]}\""
+            ${vegeta}/bin/vegeta report -type=text "$_arg_output"
             ;;
+
         esac
-
-        if [ "$_arg_kind" == "mixed" ]; then
-          # shellcheck disable=SC2145
-          ${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \
-          ${withTools.withSlowPg} \
-          ${withTools.withPgrst} -m "$_arg_monitor" \
-          ${withTools.withSlowPgrst} \
-          sh -c "cd \"$_arg_testdir\" && \
-          ${runner} -targets targets.http -output \"$abs_output\" \"''${_arg_leftovers[@]}\""
-        else
-          # shellcheck disable=SC2145
-          ${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \
-          ${withTools.withPgrst} -m "$_arg_monitor" \
-          sh -c "cd \"$_arg_testdir\" && \
-          ${runner} -lazy -targets gen_targets.http -output \"$abs_output\" \"''${_arg_leftovers[@]}\""
-        fi
-
-        ${vegeta}/bin/vegeta report -type=text "$_arg_output"
       '';
 
   loadtestAgainst =
@@ -148,12 +115,11 @@ let
         workingDir = "/";
       }
       ''
-        # run loadtest for every target
         for tgt in "''${_arg_target[@]}"; do
 
         cat << EOF
 
-        Running "$_arg_kind" loadtest on "$tgt"...
+        Running loadtest on "$tgt"...
 
         EOF
 
@@ -162,7 +128,7 @@ let
         # Save the results in the current working tree, too,
         # otherwise they'd be lost in the temporary working tree
         # created by withTools.withGit.
-        ${withTools.withGit} "$tgt" ${loadtest} -k "$_arg_kind" -m "$PWD/loadtest/$tgt.csv" --output "$PWD/loadtest/$tgt.bin" --testdir "$PWD/test/load"
+        ${withTools.withGit} "$tgt" ${loadtest} -k "$_arg_kind" --output "$PWD/loadtest/$tgt.bin" --testdir "$PWD/test/load"
 
         cat << EOF
 
@@ -172,15 +138,13 @@ let
 
         done
 
-        # run loadtest once on HEAD
-
         cat << EOF
 
-        Running "$_arg_kind" loadtest on HEAD...
+        Running loadtest on HEAD...
 
         EOF
 
-        ${loadtest} -k "$_arg_kind" -m "$PWD/loadtest/head.csv" --output "$PWD/loadtest/head.bin" --testdir "$PWD/test/load"
+        ${loadtest} -k "$_arg_kind" --output "$PWD/loadtest/head.bin" --testdir "$PWD/test/load"
 
         cat << EOF
 
@@ -217,7 +181,6 @@ let
         pd.read_json(sys.stdin) \
           .set_index('param') \
           .drop(['branch', 'earliest', 'end', 'latest']) \
-          .fillna("") \
           .convert_dtypes() \
           .to_markdown(sys.stdout, floatfmt='.0f')
       '';
@@ -228,41 +191,16 @@ let
       {
         name = "postgrest-loadtest-report";
         docs = "Create a report of all loadtest reports as markdown.";
-        args = [
-          "ARG_OPTIONAL_SINGLE([group], [g], [Marker to group results])"
-        ];
         workingDir = "/";
       }
       ''
-        marker=''${_arg_group:+"($_arg_group)"}
-
-        echo -e "## Loadtest results $marker\n"
-
         find loadtest -type f -iname '*.bin' -exec ${reporter} {} \; \
           | ${jq}/bin/jq '[paths(scalars) as $path | {param: $path | join("."), (.branch): getpath($path)}]' \
           | ${jq}/bin/jq --slurp 'flatten | group_by(.param) | map(add)' \
           | ${toMarkdown}
-
-        echo -e "\n\n## Loadtest elapsed seconds vs CPU/MEM usage $marker\n"
-
-        find loadtest -type f -iname '*.csv' \
-          | sort -m \
-          | ${mergeMonitorResults}
       '';
 
-  genTargetsHS =
+  genTargets = writers.writePython3 "postgrest-gen-loadtest-targets" { } (builtins.readFile ./generate_targets.py);
-    writers.writePython3 "postgrest-gen-loadtest-targets-hs"
-      {
-        libraries = [ python3Packages.pyjwt python3Packages.jwcrypto ];
-      }
-      (builtins.readFile ./generate_targets.py);
-
-  mergeMonitorResults =
-    writers.writePython3 "postgrest-merge-monitor-results"
-      {
-        libraries = [ python3Packages.pandas python3Packages.tabulate ];
-      }
-      (builtins.readFile ./merge_monitor_result.py);
 in
 buildToolbox {
   name = "postgrest-loadtest";

nix/tools/merge_monitor_result.py

@@ -1,44 +0,0 @@
-import os
-import sys
-import pandas as pd
-
-KEY = "Elapsed seconds"
-BASE_METRICS = ["CPU (%)", "Real (MB)"]
-branch_order = []
-merged = None
-
-paths = [p.strip() for p in sys.stdin.read().split() if p.strip()]
-
-for csv_path in paths:
-    # br is branch (variable shortened to pass linter)
-    br = os.path.splitext(os.path.basename(csv_path))[0]
-    branch_order.append(br)
-
-    df = pd.read_csv(csv_path)
-
-    if KEY not in df.columns:
-        sys.exit(f"{csv_path} is missing the {KEY} column")
-
-    for m in BASE_METRICS:
-        if m not in df.columns:
-            sys.exit(f"Error: '{csv_path}' missing required column '{m}'.")
-
-    # add branch marker to every metric column
-    df = df.rename(columns={c: f"{c} [{br}]" for c in df.columns if c != KEY})
-
-    # outer join so missing rows appear
-    merged = df if merged is None else merged.merge(df, on=KEY, how="outer")
-
-# Re-order columns so related metrics are adjacent
-ordered_cols = [KEY]
-for metric in BASE_METRICS:
-    for br in branch_order:
-        col_name = f"{metric} [{br}]"
-        if col_name in merged.columns:
-            ordered_cols.append(col_name)
-
-merged = merged[ordered_cols]
-
-# replace nan with empty string
-merged = merged.fillna("")
-merged.to_markdown(sys.stdout, index=False, tablefmt="github")

nix/tools/monitor_pid.py

@@ -1,57 +0,0 @@
-# Monitor a process pid with psutil and emits a CSV.
-import sys
-import time
-import psutil
-import pandas as pd
-
-KEY = "Elapsed seconds"
-BASE_METRICS = ["CPU (%)", "Real (MB)"]
-SAMPLE_INTERVAL_SECS = 1
-
-if len(sys.argv) != 2 or not sys.argv[1].isdigit():
-    sys.exit(f"Usage: {sys.argv[0]} <PID>")
-
-pid = int(sys.argv[1])
-try:
-    proc = psutil.Process(pid)
-except psutil.NoSuchProcess:
-    sys.exit(f"Error: process {pid} not found.")
-
-print(f"Starting monitoring of {pid} pid", file=sys.stderr)
-
-records = []
-start = time.time()
-# ignore first result as per docs recommendation
-# https://psutil.readthedocs.io/en/latest/#psutil.cpu_percent
-proc.cpu_percent(None)
-
-while True:
-    try:
-        if not proc.is_running():
-            break
-        time.sleep(SAMPLE_INTERVAL_SECS)
-
-        elapsed_secs = int(time.time() - start)
-        cpu = proc.cpu_percent(None)
-        meminfo = proc.memory_info()
-        bytes_in_MB = 1024**2
-        rss_mb = meminfo.rss / bytes_in_MB
-
-        records.append(
-            [
-                str(elapsed_secs),
-                f"{cpu:.3f}",
-                f"{rss_mb:.3f}",
-            ]
-        )
-
-    except psutil.NoSuchProcess:
-        break
-
-end = time.time()
-total_time = end - start
-print(f"Finished {pid} pid monitoring in {total_time:.3f}", file=sys.stderr)
-
-cols = [KEY] + BASE_METRICS
-df = pd.DataFrame(records, columns=cols, dtype=str)
-df.to_csv(sys.stdout, index=False)

nix/tools/nixpkgsTools.nix

@@ -1,28 +0,0 @@
-{ buildToolbox
-, checkedShellScript
-}:
-# Utility script for pinning the latest stable version of Nixpkgs.
-
-# Instead of running `nix flake update` manually, we run this script
-# to also pin readthedocs dependencies at the same time.
-let
-  upgrade =
-    checkedShellScript
-      {
-        name = "postgrest-nixpkgs-upgrade";
-        docs = "Pin the newest version of Nixpkgs.";
-        workingDir = "/";
-      }
-      ''
-        nix flake update
-
-        echo "# This file is auto-generated by postgrest-nixpkgs-upgrade" > docs/requirements.txt
-        cat "$(nix-build -A docs.requirements)" >> docs/requirements.txt
-      '';
-
-in
-buildToolbox
-{
-  name = "postgrest-nixpkgs";
-  tools = { inherit upgrade; };
-}

nix/tools/release.nix

@@ -20,24 +20,27 @@ let
         git diff --exit-code HEAD postgrest.cabal > /dev/null
         trap "" ERR
 
-        # TODO: Support C+D bumps when implementing hackage releases
         bump () {
           current_version="$(grep -oP '^version:\s*\K.*' postgrest.cabal)"
           # shellcheck disable=SC2034
-          IFS=. read -r A B C D <<< "$current_version"
+          IFS=. read -r major minor patch <<< "$current_version"
           echo "Current version is $current_version"
 
           case "$1" in
-            A)
+            major)
-              new_version="$((A+1)).0"
+              new_version="$((major+1)).0.0"
-              new_docs_version="$((A+1))"
+              new_docs_version="$((major+1)).0"
               ;;
-            B)
+            minor)
-              new_version="$A.$((B+1))"
+              new_version="$major.$((minor+1)).0"
-              new_docs_version="$A"
+              new_docs_version="$major.$((minor+1))"
+              ;;
+            patch)
+              new_version="$major.$minor.$((patch+1))"
+              new_docs_version="$major.$minor"
               ;;
             devel)
-              new_version="$((A+1))"
+              new_version="$major.$((minor+1))"
               new_docs_version="devel"
               ;;
           esac
@@ -52,9 +55,13 @@ let
 
         today_date_for_changelog="$(date '+%Y-%m-%d')"
         if [[ "$current_branch" == "main" ]]; then
-          bump A
+          if [[ "$_arg_major" == "on" ]]; then
+            bump major
+          else
+            bump minor
+          fi
         else
-          bump B
+          bump patch
         fi
 
         echo "Updating CHANGELOG.md ..."
@@ -68,10 +75,10 @@ let
           bump devel
 
           # The order of operations is important here:
-          # - bump devel is run and $A is upated to the new version
+          # - bump devel is run and $major is upated to the new version
-          # - the branch is created with the new A, but the commit before the devel bump
+          # - the branch is created with the new major, but the commit before the devel bump
           # - the devel bump is committed
-          git branch "v$A"
+          git branch -f "v$major"
 
           echo "Committing (devel bump)..."
           git commit -m "bump version to $new_version" > /dev/null
@@ -83,7 +90,7 @@ let
 
         if [[ "$current_branch" == "main" ]]; then
           push1="git push $remote $current_branch"
-          push2="git push $remote v$A"
+          push2="git push $remote v$major --force"
         else
           push1="git push $remote $current_branch"
           push2=""

nix/tools/style.nix

@@ -7,8 +7,6 @@
 , hlint
 , hsie
 , nixpkgs-fmt
-, python3Packages
-, ruff
 , silver-searcher
 , statix
 , stylish-haskell
@@ -65,21 +63,13 @@ let
         echo "Scanning nix files for unused code..."
         ${deadnix}/bin/deadnix -f
 
-        # ruff has gaps in scanning for unused code, so we use vulture
-        echo "Scanning python files for unused code..."
-        ${silver-searcher}/bin/ag -l --vimgrep -g '\.l?py$' . \
-          | xargs ${python3Packages.vulture}/bin/vulture --exclude docs/conf.py
-
-        echo "Linting python files..."
-        ${ruff}/bin/ruff check .
-
         echo "Checking consistency of import aliases in Haskell code..."
         ${hsie} check-aliases main src
 
         echo "Linting Haskell files..."
         # --vimgrep fixes a bug in ag: https://github.com/ggreer/the_silver_searcher/issues/753
         ${silver-searcher}/bin/ag -l --vimgrep -g '\.l?hs$' . \
-          | xargs ${hlint}/bin/hlint -j -X QuasiQuotes -X NoPatternSynonyms
+          | xargs ${hlint}/bin/hlint -X QuasiQuotes -X NoPatternSynonyms
       '';
 
 in

nix/tools/tests.nix

@@ -28,6 +28,7 @@ let
         withEnv = postgrest.env;
       }
       ''
+        ${cabal-install}/bin/cabal v2-update
         ${withTools.withPg} -f test/spec/fixtures/load.sql \
           ${cabal-install}/bin/cabal v2-run ${devCabalOptions} test:spec -- "''${_arg_leftovers[@]}"
       '';
@@ -41,6 +42,7 @@ let
         withEnv = postgrest.env;
       }
       ''
+        ${cabal-install}/bin/cabal v2-update
         # This makes nix-env -iA tests.doctests.bin work.
         export NIX_GHC=${postgrest.env.NIX_GHC}
         ${cabal-install}/bin/cabal v2-run ${devCabalOptions} test:doctests
@@ -55,6 +57,7 @@ let
         withEnv = postgrest.env;
       }
       ''
+        ${cabal-install}/bin/cabal v2-update
         ${withTools.withPg} -f test/spec/fixtures/load.sql \
           ${runtimeShell} -c " \
             ${cabal-install}/bin/cabal v2-run ${devCabalOptions} test:spec && \
@@ -82,8 +85,9 @@ let
         withEnv = postgrest.env;
       }
       ''
+        ${cabal-install}/bin/cabal v2-update
         ${cabal-install}/bin/cabal v2-build ${devCabalOptions} exe:postgrest
-        ${cabal-install}/bin/cabal v2-exec -- ${withTools.withPg} -f test/io/fixtures/load.sql \
+        ${cabal-install}/bin/cabal v2-exec -- ${withTools.withPg} -f test/io/fixtures.sql \
           ${ioTestPython}/bin/pytest --ignore=test/io/test_big_schema.py --ignore=test/io/test_replica.py -v test/io "''${_arg_leftovers[@]}"
       '';
 
@@ -97,8 +101,9 @@ let
         withEnv = postgrest.env;
       }
       ''
+        ${cabal-install}/bin/cabal v2-update
         ${cabal-install}/bin/cabal v2-build ${devCabalOptions} exe:postgrest
-        ${cabal-install}/bin/cabal v2-exec -- ${withTools.withPg} -f test/io/fixtures/big_schema.sql \
+        ${cabal-install}/bin/cabal v2-exec -- ${withTools.withPg} -f test/io/big_schema.sql \
           ${ioTestPython}/bin/pytest -v test/io/test_big_schema.py "''${_arg_leftovers[@]}"
       '';
 
@@ -112,8 +117,9 @@ let
         withEnv = postgrest.env;
       }
       ''
+        ${cabal-install}/bin/cabal v2-update
         ${cabal-install}/bin/cabal v2-build ${devCabalOptions} exe:postgrest
-        ${cabal-install}/bin/cabal v2-exec -- ${withTools.withPg} --replica -f test/io/fixtures/replica.sql \
+        ${cabal-install}/bin/cabal v2-exec -- ${withTools.withPg} --replica -f test/io/replica.sql \
           ${ioTestPython}/bin/pytest -v test/io/test_replica.py "''${_arg_leftovers[@]}"
       '';
 
@@ -127,6 +133,7 @@ let
         withPath = [ jq ];
       }
       ''
+        ${cabal-install}/bin/cabal v2-update
         ${withTools.withPg} -f test/spec/fixtures/load.sql \
             ${cabal-install}/bin/cabal v2-run ${devCabalOptions} --verbose=0 -- \
             postgrest --dump-schema
@@ -155,6 +162,7 @@ let
           rm -rf coverage/*
 
           # build once before running all the tests
+          ${cabal-install}/bin/cabal v2-update
           ${cabal-install}/bin/cabal v2-build ${devCabalOptions} exe:postgrest lib:postgrest test:spec
 
           (
@@ -164,15 +172,15 @@ let
 
           # collect all tests
           HPCTIXFILE="$tmpdir"/io.tix \
-            ${withTools.withPg} -f test/io/fixtures/load.sql \
+            ${withTools.withPg} -f test/io/fixtures.sql \
             ${cabal-install}/bin/cabal v2-exec ${devCabalOptions} -- ${ioTestPython}/bin/pytest --ignore=test/io/test_big_schema.py --ignore=test/io/test_replica.py -v test/io
 
           HPCTIXFILE="$tmpdir"/big_schema.tix \
-            ${withTools.withPg} -f test/io/fixtures/big_schema.sql \
+            ${withTools.withPg} -f test/io/big_schema.sql \
             ${cabal-install}/bin/cabal v2-exec ${devCabalOptions} -- ${ioTestPython}/bin/pytest -v test/io/test_big_schema.py
 
           HPCTIXFILE="$tmpdir"/replica.tix \
-            ${withTools.withPg} --replica -f test/io/fixtures/replica.sql \
+            ${withTools.withPg} --replica -f test/io/replica.sql \
             ${cabal-install}/bin/cabal v2-exec ${devCabalOptions} -- ${ioTestPython}/bin/pytest -v test/io/test_replica.py
 
           HPCTIXFILE="$tmpdir"/spec.tix \
@@ -238,6 +246,7 @@ let
         withPath = [ curl ];
       }
       ''
+        ${cabal-install}/bin/cabal v2-update
         ${cabal-install}/bin/cabal --builddir="dist-prof" v2-build --enable-profiling --disable-shared exe:postgrest
         ${cabal-install}/bin/cabal --builddir="dist-prof" v2-exec -- ${withTools.withPg} -f test/spec/fixtures/load.sql \
           test/memory/memory-tests.sh

nix/tools/withTools.nix

@@ -5,10 +5,8 @@
 , lib
 , postgresqlVersions
 , postgrest
-, python3Packages
 , slocat
 , writeText
-, writers
 }:
 let
   withTmpDb =
@@ -46,7 +44,7 @@ let
         }
 
         # Avoid starting multiple layers of withTmpDb, but make sure to have the last invocation
-        # load fixtures. Otherwise postgrest-with-pg-xx postgrest-test-io would not be possible.
+        # load fixtures. Otherwise postgrest-with-postgresql-xx postgrest-test-io would not be possible.
         if ! test -v PGHOST; then
 
           mkdir -p "$tmpdir"/{db,socket}
@@ -74,13 +72,7 @@ let
             >> "$setuplog"
 
           log "Starting the database cluster..."
-
           # Instead of listening on a local port, we will listen on a unix domain socket.
-          # NOTE: unix domain socket filename name must remain under max limit.
-          # On Linux, it's 108 chars (including '\0' terminator)
-          # On MacOS, it's 104 chars
-          # See: https://serverfault.com/questions/641347/check-if-a-path-exceeds-maximum-for-unix-domain-socket
-
           pg_ctl -l "$tmpdir/db.log" -w start -o "-F -c listen_addresses=\"\" -c hba_file=$HBA_FILE -k $PGHOST -c log_statement=\"all\" " \
             >> "$setuplog"
 
@@ -335,22 +327,6 @@ let
         done
       '';
 
-  # Broadcast SIGINT to any running postgrest instances on the host. Uses python for cross-platform compatibility.
-  signalPostgrest =
-    writers.writePython3 "postgrest-signal-int"
-      { libraries = [ python3Packages.psutil ]; }
-      ''
-        import psutil
-        import signal
-
-        for proc in psutil.process_iter(["name"]):
-            try:
-                if proc.info["name"] == "postgrest":
-                    proc.send_signal(signal.SIGINT)
-            except (psutil.NoSuchProcess, psutil.AccessDenied):
-                continue
-      '';
-
   withPgrst =
     checkedShellScript
       {
@@ -360,7 +336,6 @@ let
           [
             "ARG_POSITIONAL_SINGLE([command], [Command to run])"
             "ARG_LEFTOVERS([command arguments])"
-            "ARG_OPTIONAL_SINGLE([monitor], [m], [Enable CPU and memory monitoring of the PostgREST process and output to the designated file as markdown])"
           ];
         positionalCompletion = "_command";
         workingDir = "/";
@@ -373,13 +348,12 @@ let
         rm -f result
         if [ -z "''${PGRST_BUILD_CABAL:-}" ]; then
           echo -n "Building postgrest (nix)... "
-          # Using lib.getBin to also make this work with older checkouts, where .bin was not a thing, yet.
+          nix-build -A postgrestPackage > "$tmpdir"/build.log 2>&1 || {
-          nix-build -E 'with import ./. {}; pkgs.lib.getBin postgrestPackage' > "$tmpdir"/build.log 2>&1 || {
             echo "failed, output:"
             cat "$tmpdir"/build.log
             exit 1
           }
-          PGRST_CMD=$(echo ./result*/bin/postgrest)
+          PGRST_CMD=./result/bin/postgrest
         else
           echo -n "Building postgrest (cabal)... "
           postgrest-build
@@ -387,22 +361,11 @@ let
         fi
         echo "done."
 
-        ver=$($PGRST_CMD ${legacyConfig} --version)
+        echo -n "Starting postgrest... "
-
-        echo -n "Starting $ver... "
-
         $PGRST_CMD ${legacyConfig} > "$tmpdir"/run.log 2>&1 &
         pid=$!
         # shellcheck disable=SC2317
         cleanup() {
-          # Send INT to all postgrest processes.
-          # Workaround to trigger dumping postgrest.prof for postgrest-profiled-run
-          # Caveat: we cannot realistically limit this to the current process' tree,
-          # since pkill's --parent supports only direct children; therefore this
-          # would reap neighbor postgrest instances as well, because INT is asking
-          # the process to terminate too.
-          # TODO: consider cgroups to make this cleaner
-          ${signalPostgrest}
           kill "$pid" || true
         }
         trap cleanup EXIT
@@ -414,19 +377,9 @@ let
         }
         echo "done."
 
-        if [[ -n "$_arg_monitor" ]]; then
-          ${monitorPid} "$pid" > "$_arg_monitor" &
-        fi
-
         ("$_arg_command" "''${_arg_leftovers[@]}")
       '';
 
-  monitorPid =
-    writers.writePython3 "postgrest-monitor-pid"
-      {
-        libraries = [ python3Packages.pandas python3Packages.tabulate python3Packages.psutil ];
-      }
-      (builtins.readFile ./monitor_pid.py);
 in
 buildToolbox
 {
@@ -439,7 +392,7 @@ buildToolbox
       withSlowPg
       withSlowPgrst;
   } // builtins.listToAttrs (
-    # Create a `postgrest-with-pg-` for each PostgreSQL version
+    # Create a `postgrest-with-postgresql-` for each PostgreSQL version
     builtins.map (pg: { inherit (pg) name; value = withTmpDb pg; }) postgresqlVersions
   );
   # make latest withPg available for other nix files

postgrest.cabal

@@ -1,5 +1,5 @@
 name:               postgrest
-version:            14.2
+version:            13.0.1
 synopsis:           REST API for any Postgres database
 description:        Reads the schema of a PostgreSQL database and creates RESTful routes
                     for tables, views, and functions, supporting all HTTP methods that security
@@ -16,17 +16,19 @@ extra-source-files: CHANGELOG.md
 cabal-version:      >= 1.10
 
 tested-with:
-    -- nix
+    -- stack on FreeBSD
-    GHC == 9.4.8
+    GHC == 9.4.5
+    -- nix, cabal on Ubuntu (arm)
+  , GHC == 9.4.8
     -- cabal on Ubuntu
-    -- stack on FreeBSD, MacOS, Ubuntu, Windows
+    -- stack on MacOS, Ubuntu, Windows
-  , GHC == 9.6.7
+  , GHC == 9.6.6
     -- cabal on Ubuntu
-  , GHC == 9.8.4
+  , GHC == 9.8.2
 
 source-repository head
   type:     git
-  location: https://github.com/PostgREST/postgrest.git
+  location: git://github.com/PostgREST/postgrest.git
 
 flag dev
   default:     False
@@ -47,12 +49,9 @@ library
                       PostgREST.App
                       PostgREST.AppState
                       PostgREST.Auth
-                      PostgREST.Auth.Jwt
                       PostgREST.Auth.JwtCache
                       PostgREST.Auth.Types
-                      PostgREST.Cache.Sieve
                       PostgREST.CLI
-                      PostgREST.Client
                       PostgREST.Config
                       PostgREST.Config.Database
                       PostgREST.Config.JSPath
@@ -68,13 +67,11 @@ library
                       PostgREST.Error
                       PostgREST.Listener
                       PostgREST.Logger
-                      PostgREST.MainTx
                       PostgREST.MediaType
                       PostgREST.Metrics
                       PostgREST.Network
                       PostgREST.Observation
                       PostgREST.Query
-                      PostgREST.Query.PreQuery
                       PostgREST.Query.QueryBuilder
                       PostgREST.Query.SqlFragment
                       PostgREST.Query.Statements
@@ -88,26 +85,27 @@ library
                       PostgREST.ApiRequest
                       PostgREST.ApiRequest.Preferences
                       PostgREST.ApiRequest.QueryParams
-                      PostgREST.ApiRequest.Payload
                       PostgREST.ApiRequest.Types
                       PostgREST.Response
                       PostgREST.Response.OpenAPI
                       PostgREST.Response.GucHeader
                       PostgREST.Response.Performance
-                      PostgREST.TimeIt
                       PostgREST.Version
+  other-modules:      Paths_postgrest
   build-depends:      base                      >= 4.9 && < 4.20
                     , HTTP                      >= 4000.3.7 && < 4000.5
                     , Ranged-sets               >= 0.3 && < 0.5
                     , aeson                     >= 2.0.3 && < 2.3
-                    , auto-update               >= 0.1.4 && < 0.3
+                    , auto-update               >= 0.1.4 && < 0.2
                     , base64-bytestring         >= 1 && < 1.3
                     , bytestring                >= 0.10.8 && < 0.13
+                    , cache                     >= 0.1.3 && < 0.2.0
                     , case-insensitive          >= 1.2 && < 1.3
                     , cassava                   >= 0.4.5 && < 0.6
-                    , configurator-pg           >= 0.2.11 && < 0.3
+                    , clock                     >= 0.8.3 && < 0.9.0
+                    , configurator-pg           >= 0.2 && < 0.3
                     , containers                >= 0.5.7 && < 0.7
-                    , cookie                    >= 0.4.2 && < 0.6
+                    , cookie                    >= 0.4.2 && < 0.5
                     , directory                 >= 1.2.6 && < 1.4
                     , either                    >= 4.4.1 && < 5.1
                     , extra                     >= 1.7.0 && < 2.0
@@ -116,16 +114,17 @@ library
                     , hasql-dynamic-statements  >= 0.3.1 && < 0.4
                     , hasql-notifications       >= 0.2.2.2 && < 0.2.3
                     , hasql-pool                >= 1.0.1 && < 1.1
-                    , hasql-transaction         >= 1.0.1 && < 1.2
+                    , hasql-transaction         >= 1.0.1 && < 1.1
-                    , http-client               >= 0.7.19 && < 0.8
+                    , heredoc                   >= 0.2 && < 0.3
                     , http-types                >= 0.12.2 && < 0.13
                     , insert-ordered-containers >= 0.2.2 && < 0.3
+                    , iproute                   >= 1.7.0 && < 1.8
                     , jose-jwt                  >= 0.9.6 && < 0.11
-                    , lens                      >= 4.14 && < 5.4
+                    , lens                      >= 4.14 && < 5.3
                     , lens-aeson                >= 1.0.1 && < 1.3
                     , mtl                       >= 2.2.2 && < 2.4
                     , neat-interpolation        >= 0.5 && < 0.6
-                    , network                   >= 2.6 && < 3.3
+                    , network                   >= 2.6 && < 3.2
                     , network-uri               >= 2.6.1 && < 2.8
                     , optparse-applicative      >= 0.13 && < 0.19
                     , parsec                    >= 3.1.11 && < 3.2
@@ -136,10 +135,11 @@ library
                     , regex-tdfa                >= 1.2.2 && < 1.4
                     , retry                     >= 0.7.4 && < 0.10
                     , scientific                >= 0.3.4 && < 0.4
-                    , streaming-commons         >= 0.2.3.1 && < 0.3
+                    , streaming-commons         >= 0.1.1 && < 0.3
                     , swagger2                  >= 2.4 && < 2.9
                     , text                      >= 1.2.2 && < 2.2
                     , time                      >= 1.6 && < 1.13
+                    , timeit                    >= 2.0 && < 2.1
                     , unordered-containers      >= 0.2.8 && < 0.3
                     , unix-compat               >= 0.5.4 && < 0.8
                     , vault                     >= 0.3.1.5 && < 0.4
@@ -152,11 +152,7 @@ library
                     -- for unix sockets; this is tested in test/io/test_io.py. See
                     -- https://github.com/kazu-yamamoto/logger/commit/3a71ca70afdbb93d4ecf0083eeba1fbbbcab3fc3
                     , wai-logger                >= 2.4.0
-                    , warp                      >= 3.3.19 && < 3.5
+                    , warp                      >= 3.3.19 && < 3.4
-                    , stm                       >= 2.5 && < 3
-                    , stm-hamt                  >= 1.2 && < 2
-                    , focus                     >= 1.0 && < 2
-                    , some                      >= 1.0.4.1 && < 2
                       -- -fno-spec-constr may help keep compile time memory use in check,
                       --   see https://gitlab.haskell.org/ghc/ghc/issues/16017#note_219304
                       -- -optP-Wno-nonportable-include-path
@@ -211,7 +207,6 @@ test-suite spec
                       Feature.Auth.AudienceJwtSecretSpec
                       Feature.Auth.AuthSpec
                       Feature.Auth.BinaryJwtSecretSpec
-                      Feature.Auth.JwtCacheSpec
                       Feature.Auth.NoAnonSpec
                       Feature.Auth.NoJwtSecretSpec
                       Feature.ConcurrentSpec
@@ -266,20 +261,18 @@ test-suite spec
                     , case-insensitive  >= 1.2 && < 1.3
                     , containers        >= 0.5.7 && < 0.7
                     , hasql-pool        >= 1.0.1 && < 1.1
-                    , hasql-transaction >= 1.0.1 && < 1.2
+                    , hasql-transaction >= 1.0.1 && < 1.1
                     , heredoc           >= 0.2 && < 0.3
                     , hspec             >= 2.3 && < 2.12
-                    , hspec-expectations >= 0.8.4 && < 0.9
                     , hspec-wai         >= 0.10 && < 0.12
                     , hspec-wai-json    >= 0.10 && < 0.12
                     , http-types        >= 0.12.3 && < 0.13
                     , jose-jwt          >= 0.9.6 && < 0.11
-                    , lens              >= 4.14 && < 5.4
+                    , lens              >= 4.14 && < 5.3
                     , lens-aeson        >= 1.0.1 && < 1.3
                     , monad-control     >= 1.0.1 && < 1.1
                     , postgrest
                     , process           >= 1.4.2 && < 1.7
-                    , prometheus-client >= 1.1.1 && < 1.2.0
                     , protolude         >= 0.3.1 && < 0.4
                     , regex-tdfa        >= 1.2.2 && < 1.4
                     , scientific        >= 0.3.4 && < 0.4

shell.nix

@@ -21,9 +21,7 @@ let
       postgrest.cabalTools
       postgrest.devTools
       postgrest.docs
-      postgrest.gitTools
       postgrest.loadtest
-      postgrest.nixpkgsTools
       postgrest.release
       postgrest.style
       postgrest.tests

src/PostgREST/Admin.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE NamedFieldPuns #-}
+
 module PostgREST.Admin
   ( runAdmin
   ) where
@@ -7,14 +9,15 @@ import qualified Network.HTTP.Types.Status as HTTP
 import qualified Network.Wai               as Wai
 import qualified Network.Wai.Handler.Warp  as Warp
 
-import Control.Monad.Extra       (whenJust)
+import Control.Monad.Extra (whenJust)
-import Network.Socket            hiding (addrFamily)
+
+import Network.Socket
 import Network.Socket.ByteString
 
 import PostgREST.AppState    (AppState)
-import PostgREST.MediaType   (MediaType (..), toContentType)
+import PostgREST.Config      (AppConfig (..))
 import PostgREST.Metrics     (metricsToText)
-import PostgREST.Network     (resolveSocketToAddress)
+import PostgREST.Network     (resolveHost)
 import PostgREST.Observation (Observation (..))
 
 import qualified PostgREST.AppState as AppState
@@ -23,9 +26,10 @@ import Protolude
 
 runAdmin :: AppState -> Warp.Settings -> IO ()
 runAdmin appState settings = do
+  AppConfig{configAdminServerPort} <- AppState.getConfig appState
   whenJust (AppState.getSocketAdmin appState) $ \adminSocket -> do
-    address <- resolveSocketToAddress adminSocket
+    host <- resolveHost adminSocket
-    observer $ AdminStartObs address
+    observer $ AdminStartObs host configAdminServerPort
     void . forkIO $ Warp.runSettingsSocket settings adminSocket adminApp
   where
     adminApp = admin appState
@@ -54,7 +58,7 @@ admin appState req respond  = do
       respond $ Wai.responseLBS HTTP.status200 [] (maybe mempty JSON.encode sCache)
     ["metrics"] -> do
       mets <- metricsToText
-      respond $ Wai.responseLBS HTTP.status200 [toContentType MTTextPlain] mets -- Content-Type is required for prometheus compliance
+      respond $ Wai.responseLBS HTTP.status200 [] mets
     _ ->
       respond $ Wai.responseLBS HTTP.status404 [] mempty
 

src/PostgREST/ApiRequest.hs

@@ -6,30 +6,44 @@ Description : PostgREST functions to translate HTTP request to a domain type cal
 {-# LANGUAGE NamedFieldPuns #-}
 module PostgREST.ApiRequest
   ( ApiRequest(..)
+  , InvokeMethod(..)
+  , Mutation(..)
+  , MediaType(..)
+  , Action(..)
+  , DbAction(..)
+  , Payload(..)
   , userApiRequest
   , userPreferences
   ) where
 
-import qualified Data.CaseInsensitive as CI
+import qualified Data.Aeson            as JSON
-import qualified Data.HashMap.Strict  as HM
+import qualified Data.Aeson.Key        as K
-import qualified Data.List.NonEmpty   as NonEmptyList
+import qualified Data.Aeson.KeyMap     as KM
-import qualified Data.Set             as S
+import qualified Data.ByteString.Char8 as BS
-import qualified Data.Text.Encoding   as T
+import qualified Data.ByteString.Lazy  as LBS
+import qualified Data.CaseInsensitive  as CI
+import qualified Data.Csv              as CSV
+import qualified Data.HashMap.Strict   as HM
+import qualified Data.List.NonEmpty    as NonEmptyList
+import qualified Data.Map.Strict       as M
+import qualified Data.Set              as S
+import qualified Data.Text.Encoding    as T
+import qualified Data.Vector           as V
 
+import Data.Either.Combinators (mapBoth)
+
+import Control.Arrow             ((***))
+import Data.Aeson.Types          (emptyArray, emptyObject)
 import Data.List                 (lookup)
 import Data.Ranged.Ranges        (emptyRange, rangeIntersection,
                                   rangeIsEmpty)
 import Network.HTTP.Types.Header (RequestHeaders, hCookie)
+import Network.HTTP.Types.URI    (parseSimpleQuery)
 import Network.Wai               (Request (..))
 import Network.Wai.Parse         (parseHttpAccept)
 import Web.Cookie                (parseCookies)
 
-import PostgREST.ApiRequest.Payload      (getPayload)
 import PostgREST.ApiRequest.QueryParams  (QueryParams (..))
-import PostgREST.ApiRequest.Types        (Action (..), DbAction (..),
-                                          InvokeMethod (..),
-                                          Mutation (..), Payload (..),
-                                          RequestBody, Resource (..))
 import PostgREST.Config                  (AppConfig (..),
                                           OpenAPIMode (..))
 import PostgREST.Config.Database         (TimezoneNames)
@@ -50,6 +64,44 @@ import qualified PostgREST.MediaType              as MediaType
 
 import Protolude
 
+
+type RequestBody = LBS.ByteString
+
+data Payload
+  = ProcessedJSON -- ^ Cached attributes of a JSON payload
+      { payRaw  :: LBS.ByteString
+      -- ^ This is the raw ByteString that comes from the request body.  We
+      -- cache this instead of an Aeson Value because it was detected that for
+      -- large payloads the encoding had high memory usage, see
+      -- https://github.com/PostgREST/postgrest/pull/1005 for more details
+      , payKeys :: S.Set Text
+      -- ^ Keys of the object or if it's an array these keys are guaranteed to
+      -- be the same across all its objects
+      }
+  | ProcessedUrlEncoded { payArray  :: [(Text, Text)], payKeys :: S.Set Text }
+  | RawJSON { payRaw  :: LBS.ByteString }
+  | RawPay  { payRaw  :: LBS.ByteString }
+
+data InvokeMethod = Inv | InvRead Bool  deriving Eq
+data Mutation = MutationCreate | MutationDelete | MutationSingleUpsert | MutationUpdate deriving Eq
+
+data Resource
+  = ResourceRelation Text
+  | ResourceRoutine Text
+  | ResourceSchema
+
+data DbAction
+  = ActRelationRead {dbActQi :: QualifiedIdentifier, actHeadersOnly :: Bool}
+  | ActRelationMut  {dbActQi :: QualifiedIdentifier, actMutation :: Mutation}
+  | ActRoutine      {dbActQi :: QualifiedIdentifier, actInvMethod :: InvokeMethod}
+  | ActSchemaRead   Schema Bool
+
+data Action
+  = ActDb           DbAction
+  | ActRelationInfo QualifiedIdentifier
+  | ActRoutineInfo  QualifiedIdentifier InvokeMethod
+  | ActSchemaInfo
+
 {-|
   Describes what the user wants to do. This data type is a
   translation of the raw elements of an HTTP request into domain
@@ -155,7 +207,7 @@ getAction resource schema method =
 getSchema :: AppConfig -> RequestHeaders -> ByteString -> Either ApiRequestError (Schema, Bool)
 getSchema AppConfig{configDbSchemas} hdrs method = do
   case profile of
-    Just p | p `notElem` configDbSchemas -> Left $ UnacceptableSchema p $ toList configDbSchemas
+    Just p | p `notElem` configDbSchemas -> Left $ UnacceptableSchema $ toList configDbSchemas
            | otherwise                   -> Right (p, True)
     Nothing -> Right (defaultSchema, length configDbSchemas /= 1) -- if we have many schemas, assume the default schema was negotiated
   where
@@ -188,3 +240,103 @@ getRanges method QueryParams{qsRanges} hdrs
     -- The only emptyRange allowed is the limit zero range
     isInvalidRange = topLevelRange == emptyRange && not (hasLimitZero limitRange)
     topLevelRange = fromMaybe allRange $ HM.lookup "limit" ranges -- if no limit is specified, get all the request rows
+
+getPayload :: RequestBody -> MediaType -> QueryParams.QueryParams -> Action -> Either ApiRequestError (Maybe Payload, S.Set FieldName)
+getPayload reqBody contentMediaType QueryParams{qsColumns} action = do
+  checkedPayload <- if shouldParsePayload then payload else Right Nothing
+  let cols = case (checkedPayload, columns) of
+        (Just ProcessedJSON{payKeys}, _)       -> payKeys
+        (Just ProcessedUrlEncoded{payKeys}, _) -> payKeys
+        (Just RawJSON{}, Just cls)             -> cls
+        _                                      -> S.empty
+  return (checkedPayload, cols)
+  where
+    payload :: Either ApiRequestError (Maybe Payload)
+    payload = mapBoth InvalidBody Just $ case (contentMediaType, isProc) of
+      (MTApplicationJSON, _) ->
+        if isJust columns
+          then Right $ RawJSON reqBody
+          else note "All object keys must match" . payloadAttributes reqBody
+                 =<< if LBS.null reqBody && isProc
+                       then Right emptyObject
+                       else first BS.pack $
+                          -- Drop parsing error message in favor of generic one (https://github.com/PostgREST/postgrest/issues/2344)
+                          maybe (Left "Empty or invalid json") Right $ JSON.decode reqBody
+      (MTTextCSV, _) -> do
+        json <- csvToJson <$> first BS.pack (CSV.decodeByName reqBody)
+        note "All lines must have same number of fields" $ payloadAttributes (JSON.encode json) json
+      (MTUrlEncoded, True) ->
+        Right $ ProcessedUrlEncoded params (S.fromList $ fst <$> params)
+      (MTUrlEncoded, False) ->
+        let paramsMap = HM.fromList $ (identity *** JSON.String) <$> params in
+        Right $ ProcessedJSON (JSON.encode paramsMap) $ S.fromList (HM.keys paramsMap)
+      (MTTextPlain, True) -> Right $ RawPay reqBody
+      (MTTextXML, True) -> Right $ RawPay reqBody
+      (MTOctetStream, True) -> Right $ RawPay reqBody
+      (ct, _) -> Left $ "Content-Type not acceptable: " <> MediaType.toMime ct
+
+    shouldParsePayload = case action of
+      ActDb (ActRelationMut _ MutationDelete) -> False
+      ActDb (ActRelationMut _ _)              -> True
+      ActDb (ActRoutine _  Inv)               -> True
+      _                                       -> False
+
+    columns = case action of
+      ActDb (ActRelationMut _ MutationCreate) -> qsColumns
+      ActDb (ActRelationMut _ MutationUpdate) -> qsColumns
+      ActDb (ActRoutine     _ Inv)            -> qsColumns
+      _                                       -> Nothing
+
+    isProc = case action of
+      ActDb (ActRoutine _ _) -> True
+      _                      -> False
+    params = (T.decodeUtf8 *** T.decodeUtf8) <$> parseSimpleQuery (LBS.toStrict reqBody)
+
+type CsvData = V.Vector (M.Map Text LBS.ByteString)
+
+{-|
+  Converts CSV like
+  a,b
+  1,hi
+  2,bye
+
+  into a JSON array like
+  [ {"a": "1", "b": "hi"}, {"a": 2, "b": "bye"} ]
+
+  The reason for its odd signature is so that it can compose
+  directly with CSV.decodeByName
+-}
+csvToJson :: (CSV.Header, CsvData) -> JSON.Value
+csvToJson (_, vals) =
+  JSON.Array $ V.map rowToJsonObj vals
+ where
+  rowToJsonObj = JSON.Object . KM.fromMapText .
+    M.map (\str ->
+        if str == "NULL"
+          then JSON.Null
+          else JSON.String . T.decodeUtf8 $ LBS.toStrict str
+      )
+
+payloadAttributes :: RequestBody -> JSON.Value -> Maybe Payload
+payloadAttributes raw json =
+  -- Test that Array contains only Objects having the same keys
+  case json of
+    JSON.Array arr ->
+      case arr V.!? 0 of
+        Just (JSON.Object o) ->
+          let canonicalKeys = S.fromList $ K.toText <$> KM.keys o
+              areKeysUniform = all (\case
+                JSON.Object x -> S.fromList (K.toText <$> KM.keys x) == canonicalKeys
+                _ -> False) arr in
+          if areKeysUniform
+            then Just $ ProcessedJSON raw canonicalKeys
+            else Nothing
+        Just _ -> Nothing
+        Nothing -> Just emptyPJArray
+
+    JSON.Object o -> Just $ ProcessedJSON raw (S.fromList $ K.toText <$> KM.keys o)
+
+    -- truncate everything else to an empty array.
+    _ -> Just emptyPJArray
+  where
+    emptyPJArray = ProcessedJSON (JSON.encode emptyArray) S.empty

src/PostgREST/ApiRequest/Payload.hs

@@ -1,138 +0,0 @@
--- |
--- Module      : PostgREST.ApiRequest.Payload
--- Description : Parser for PostgREST Request Body
---
--- This module is in charge of parsing the request body (payload)
---
-{-# LANGUAGE LambdaCase     #-}
-{-# LANGUAGE NamedFieldPuns #-}
-module PostgREST.ApiRequest.Payload
-  ( getPayload
-  ) where
-
-import qualified Data.Aeson            as JSON
-import qualified Data.Aeson.Key        as K
-import qualified Data.Aeson.KeyMap     as KM
-import qualified Data.ByteString.Char8 as BS
-import qualified Data.ByteString.Lazy  as LBS
-import qualified Data.Csv              as CSV
-import qualified Data.HashMap.Strict   as HM
-import qualified Data.Map.Strict       as M
-import qualified Data.Set              as S
-import qualified Data.Text.Encoding    as T
-import qualified Data.Vector           as V
-
-import Control.Arrow           ((***))
-import Data.Aeson.Types        (emptyArray, emptyObject)
-import Data.Either.Combinators (mapBoth)
-import Network.HTTP.Types.URI  (parseSimpleQuery)
-
-import PostgREST.ApiRequest.QueryParams  (QueryParams (..))
-import PostgREST.ApiRequest.Types
-import PostgREST.Error                   (ApiRequestError (..))
-import PostgREST.MediaType               (MediaType (..))
-import PostgREST.SchemaCache.Identifiers (FieldName)
-
-import qualified PostgREST.MediaType as MediaType
-
-import Protolude
-
-getPayload :: RequestBody -> MediaType -> QueryParams -> Action -> Either ApiRequestError (Maybe Payload, S.Set FieldName)
-getPayload reqBody contentMediaType QueryParams{qsColumns} action = do
-  checkedPayload <- if shouldParsePayload then payload else Right Nothing
-  let cols = case (checkedPayload, columns) of
-        (Just ProcessedJSON{payKeys}, _)       -> payKeys
-        (Just ProcessedUrlEncoded{payKeys}, _) -> payKeys
-        (Just RawJSON{}, Just cls)             -> cls
-        _                                      -> S.empty
-  return (checkedPayload, cols)
-  where
-    payload :: Either ApiRequestError (Maybe Payload)
-    payload = mapBoth InvalidBody Just $ case (contentMediaType, isProc) of
-      (MTApplicationJSON, _) ->
-        if isJust columns
-          then Right $ RawJSON reqBody
-          else note "All object keys must match" . payloadAttributes reqBody
-                 =<< if LBS.null reqBody && isProc
-                       then Right emptyObject
-                       else first BS.pack $
-                          -- Drop parsing error message in favor of generic one (https://github.com/PostgREST/postgrest/issues/2344)
-                          maybe (Left "Empty or invalid json") Right $ JSON.decode reqBody
-      (MTTextCSV, _) -> do
-        json <- csvToJson <$> first BS.pack (CSV.decodeByName reqBody)
-        note "All lines must have same number of fields" $ payloadAttributes (JSON.encode json) json
-      (MTUrlEncoded, True) ->
-        Right $ ProcessedUrlEncoded params (S.fromList $ fst <$> params)
-      (MTUrlEncoded, False) ->
-        let paramsMap = HM.fromList $ (identity *** JSON.String) <$> params in
-        Right $ ProcessedJSON (JSON.encode paramsMap) $ S.fromList (HM.keys paramsMap)
-      (MTTextPlain, True) -> Right $ RawPay reqBody
-      (MTTextXML, True) -> Right $ RawPay reqBody
-      (MTOctetStream, True) -> Right $ RawPay reqBody
-      (ct, _) -> Left $ "Content-Type not acceptable: " <> MediaType.toMime ct
-
-    shouldParsePayload = case action of
-      ActDb (ActRelationMut _ MutationDelete) -> False
-      ActDb (ActRelationMut _ _)              -> True
-      ActDb (ActRoutine _  Inv)               -> True
-      _                                       -> False
-
-    columns = case action of
-      ActDb (ActRelationMut _ MutationCreate) -> qsColumns
-      ActDb (ActRelationMut _ MutationUpdate) -> qsColumns
-      ActDb (ActRoutine     _ Inv)            -> qsColumns
-      _                                       -> Nothing
-
-    isProc = case action of
-      ActDb (ActRoutine _ _) -> True
-      _                      -> False
-    params = (T.decodeUtf8 *** T.decodeUtf8) <$> parseSimpleQuery (LBS.toStrict reqBody)
-
-type CsvData = V.Vector (M.Map Text LBS.ByteString)
-
-{-|
-  Converts CSV like
-  a,b
-  1,hi
-  2,bye
-
-  into a JSON array like
-  [ {"a": "1", "b": "hi"}, {"a": 2, "b": "bye"} ]
-
-  The reason for its odd signature is so that it can compose
-  directly with CSV.decodeByName
--}
-csvToJson :: (CSV.Header, CsvData) -> JSON.Value
-csvToJson (_, vals) =
-  JSON.Array $ V.map rowToJsonObj vals
- where
-  rowToJsonObj = JSON.Object . KM.fromMapText .
-    M.map (\str ->
-        if str == "NULL"
-          then JSON.Null
-          else JSON.String . T.decodeUtf8 $ LBS.toStrict str
-      )
-
-payloadAttributes :: RequestBody -> JSON.Value -> Maybe Payload
-payloadAttributes raw json =
-  -- Test that Array contains only Objects having the same keys
-  case json of
-    JSON.Array arr ->
-      case arr V.!? 0 of
-        Just (JSON.Object o) ->
-          let canonicalKeys = S.fromList $ K.toText <$> KM.keys o
-              areKeysUniform = all (\case
-                JSON.Object x -> S.fromList (K.toText <$> KM.keys x) == canonicalKeys
-                _ -> False) arr in
-          if areKeysUniform
-            then Just $ ProcessedJSON raw canonicalKeys
-            else Nothing
-        Just _ -> Nothing
-        Nothing -> Just emptyPJArray
-
-    JSON.Object o -> Just $ ProcessedJSON raw (S.fromList $ K.toText <$> KM.keys o)
-
-    -- truncate everything else to an empty array.
-    _ -> Just emptyPJArray
-  where
-    emptyPJArray = ProcessedJSON (JSON.encode emptyArray) S.empty

src/PostgREST/ApiRequest/Preferences.hs

@@ -19,7 +19,6 @@ module PostgREST.ApiRequest.Preferences
   , PreferMaxAffected(..)
   , fromHeaders
   , shouldCount
-  , shouldExplainCount
   , prefAppliedHeader
   ) where
 
@@ -156,7 +155,7 @@ fromHeaders allowTxDbOverride acceptedTzNames headers =
     listStripPrefix prefix prefList = listToMaybe $ mapMaybe (BS.stripPrefix prefix) prefList
 
     timezonePref = listStripPrefix "timezone=" prefs
-    isTimezonePrefAccepted = ((S.member . decodeUtf8 <$> timezonePref) <*> pure acceptedTzNames) == Just True
+    isTimezonePrefAccepted = (S.member <$> (decodeUtf8 <$> timezonePref) <*> pure acceptedTzNames) == Just True
 
     maxAffectedPref = listStripPrefix "max-affected=" prefs >>= readMaybe . BS.unpack
 
@@ -239,10 +238,6 @@ shouldCount :: Maybe PreferCount -> Bool
 shouldCount prefCount =
   prefCount == Just ExactCount || prefCount == Just EstimatedCount
 
-shouldExplainCount :: Maybe PreferCount -> Bool
-shouldExplainCount prefCount =
-  prefCount == Just PlannedCount || prefCount == Just EstimatedCount
-
 -- | Whether to commit or roll back transactions.
 data PreferTransaction
   = Commit   -- ^ Commit transaction - the default.

src/PostgREST/ApiRequest/Types.hs

@@ -30,69 +30,12 @@ module PostgREST.ApiRequest.Types
   , QuantOperator(..)
   , FtsOperator(..)
   , SelectItem(..)
-  , Payload (..)
-  , InvokeMethod (..)
-  , Mutation (..)
-  , Resource (..)
-  , DbAction (..)
-  , Action (..)
-  , RequestBody
   ) where
 
-import qualified Data.ByteString.Lazy as LBS
+import PostgREST.SchemaCache.Identifiers (FieldName)
-import qualified Data.Set             as S
-
-import PostgREST.SchemaCache.Identifiers (FieldName,
-                                          QualifiedIdentifier (..),
-                                          Schema)
 
 import Protolude
 
-data InvokeMethod = Inv | InvRead Bool
-  deriving Eq
-
-data Mutation
-  = MutationCreate
-  | MutationDelete
-  | MutationSingleUpsert
-  | MutationUpdate
-  deriving Eq
-
-data Resource
-  = ResourceRelation Text
-  | ResourceRoutine Text
-  | ResourceSchema
-
-data DbAction
-  = ActRelationRead {dbActQi :: QualifiedIdentifier, actHeadersOnly :: Bool}
-  | ActRelationMut  {dbActQi :: QualifiedIdentifier, actMutation :: Mutation}
-  | ActRoutine      {dbActQi :: QualifiedIdentifier, actInvMethod :: InvokeMethod}
-  | ActSchemaRead   Schema Bool
-
-data Action
-  = ActDb           DbAction
-  | ActRelationInfo QualifiedIdentifier
-  | ActRoutineInfo  QualifiedIdentifier InvokeMethod
-  | ActSchemaInfo
-
-type RequestBody = LBS.ByteString
-
-data Payload
-  = ProcessedJSON -- ^ Cached attributes of a JSON payload
-      { payRaw  :: LBS.ByteString
-      -- ^ This is the raw ByteString that comes from the request body.  We
-      -- cache this instead of an Aeson Value because it was detected that for
-      -- large payloads the encoding had high memory usage, see
-      -- https://github.com/PostgREST/postgrest/pull/1005 for more details
-      , payKeys :: S.Set Text
-      -- ^ Keys of the object or if it's an array these keys are guaranteed to
-      -- be the same across all its objects
-      }
-  | ProcessedUrlEncoded { payArray  :: [(Text, Text)], payKeys :: S.Set Text }
-  | RawJSON { payRaw  :: LBS.ByteString }
-  | RawPay  { payRaw  :: LBS.ByteString }
-
-
 -- | The value in `/tbl?select=alias:field.aggregateFunction()::cast`
 data SelectItem
   = SelectField

src/PostgREST/App.hs

@@ -35,7 +35,6 @@ import qualified PostgREST.Cors       as Cors
 import qualified PostgREST.Error      as Error
 import qualified PostgREST.Listener   as Listener
 import qualified PostgREST.Logger     as Logger
-import qualified PostgREST.MainTx     as MainTx
 import qualified PostgREST.Plan       as Plan
 import qualified PostgREST.Query      as Query
 import qualified PostgREST.Response   as Response
@@ -44,20 +43,23 @@ import qualified PostgREST.Unix       as Unix (installSignalHandlers)
 import PostgREST.ApiRequest           (ApiRequest (..))
 import PostgREST.AppState             (AppState)
 import PostgREST.Auth.Types           (AuthResult (..))
-import PostgREST.Config               (AppConfig (..), LogLevel (..))
+import PostgREST.Config               (AppConfig (..), LogLevel (..),
+                                       LogQuery (..))
+import PostgREST.Config.PgVersion     (PgVersion (..))
 import PostgREST.Error                (Error)
-import PostgREST.Network              (resolveSocketToAddress)
+import PostgREST.Network              (resolveHost)
 import PostgREST.Observation          (Observation (..))
 import PostgREST.Response.Performance (ServerTiming (..),
                                        serverTimingHeader)
 import PostgREST.SchemaCache          (SchemaCache (..))
-import PostgREST.TimeIt               (timeItT)
 import PostgREST.Version              (docsVersion, prettyVersion)
 
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.List             as L
 import qualified Network.HTTP.Types    as HTTP
+import qualified Network.Socket        as NS
 import           Protolude             hiding (Handler)
+import           System.TimeIt         (timeItT)
 
 type Handler = ExceptT Error
 
@@ -75,9 +77,13 @@ run appState = do
 
   let app = postgrest configLogLevel appState (AppState.schemaCacheLoader appState)
 
-  do
+  case configServerUnixSocket of
-    address <- resolveSocketToAddress (AppState.getSocketREST appState)
+    Just path -> do
-    observer $ AppServerAddressObs address
+      observer $ AppServerUnixObs path
+    Nothing   -> do
+      port <- NS.socketPort $ AppState.getSocketREST appState
+      host <- resolveHost $ AppState.getSocketREST appState
+      observer $ AppServerPortObs (fromJust host) port
 
   Warp.runSettingsSocket (serverSettings conf) (AppState.getSocketREST appState) app
 
@@ -102,21 +108,18 @@ postgrest logLevel appState connWorker =
       Right authResult -> do
         appConf <- AppState.getConfig appState -- the config must be read again because it can reload
         maybeSchemaCache <- AppState.getSchemaCache appState
+        pgVer <- AppState.getPgVersion appState
 
         let
           eitherResponse :: IO (Either Error Wai.Response)
           eitherResponse =
-            runExceptT $ postgrestResponse appState appConf maybeSchemaCache authResult req
+            runExceptT $ postgrestResponse appState appConf maybeSchemaCache pgVer authResult req
 
         response <- either Error.errorResponseFor identity <$> eitherResponse
-        -- Launch the connWorker when the connection is down. The postgrest
+        -- Launch the connWorker when the connection is down.  The postgrest
         -- function can respond successfully (with a stale schema cache) before
-        -- the connWorker is done. However, when there's an empty schema cache
+        -- the connWorker is done.
-        -- postgrest responds with the error `PGRST002`; this means that the schema
+        when (isServiceUnavailable response) connWorker
-        -- cache is still loading, so we don't launch the connWorker here because
-        -- it would duplicate the loading process, e.g. https://github.com/PostgREST/postgrest/issues/3704
-        -- TODO: this process may be unnecessary when the Listener is enabled. Revisit once https://github.com/PostgREST/postgrest/issues/1766 is done
-        when (isServiceUnavailable response && isJust maybeSchemaCache) connWorker
         resp <- do
           delay <- AppState.getNextDelay appState
           return $ addRetryHint delay response
@@ -126,18 +129,16 @@ postgrestResponse
   :: AppState.AppState
   -> AppConfig
   -> Maybe SchemaCache
+  -> PgVersion
   -> AuthResult
   -> Wai.Request
   -> Handler IO Wai.Response
-postgrestResponse appState conf@AppConfig{..} maybeSchemaCache authResult@AuthResult{..} req = do
+postgrestResponse appState conf@AppConfig{..} maybeSchemaCache pgVer authResult@AuthResult{..} req = do
-  let observer = AppState.getObserver appState
-
   sCache <-
     case maybeSchemaCache of
       Just sCache ->
         return sCache
-      Nothing -> do
+      Nothing ->
-        lift $ observer SchemaCacheEmptyObs
         throwError Error.NoSchemaCacheError
 
   body <- lift $ Wai.strictRequestBody req
@@ -149,32 +150,24 @@ postgrestResponse appState conf@AppConfig{..} maybeSchemaCache authResult@AuthRe
   (parseTime, apiReq@ApiRequest{..}) <- withTiming $ liftEither . mapLeft Error.ApiRequestError $ ApiRequest.userApiRequest conf prefs req body
   (planTime, plan)                   <- withTiming $ liftEither $ Plan.actionPlan iAction conf apiReq sCache
 
-  let mainQ = Query.mainQuery plan conf apiReq authResult configDbPreRequest
+  let query = Query.query conf authResult apiReq plan sCache pgVer
-      tx = MainTx.mainTx mainQ conf authResult apiReq plan sCache
+      logSQL = lift . AppState.getObserver appState . DBQuery (Query.getSQLQuery query)
-      obsQuery s = when configLogQuery $ observer $ QueryObs mainQ s
 
-  (txTime, txResult) <- withTiming $ do
+  (queryTime, queryResult) <- withTiming $ do
-    case tx of
+    case query of
-      MainTx.NoDbTx r -> pure r
+      Query.NoDbQuery r -> pure r
-      MainTx.DbTx{..} -> do
+      Query.DbQuery{..} -> do
         dbRes <- lift $ AppState.usePool appState (dqTransaction dqIsoLevel dqTxMode $ runExceptT dqDbHandler)
-        let eitherResp = join $ mapLeft (Error.PgErr . Error.PgError (Just authRole /= configDbAnonRole)) dbRes
+        let eitherResp = mapLeft Error.PgErr . mapLeft (Error.PgError (Just authRole /= configDbAnonRole)) $ dbRes
-
+        when (configLogQuery /= LogQueryDisabled) $ whenLeft eitherResp $ logSQL . Error.status
-        -- TODO: we use obsQuery twice, one here and one below because in case of an error with the usePool above, the request will finish here and return an error message.
+        liftEither eitherResp >>= liftEither
-        -- This is because of a combination of ExceptT + our Error module which has Wai.responseLBS.
-        -- This needs refactoring so only the below obsQuery is used.
-        lift $ whenLeft eitherResp $ obsQuery . Error.status
-        liftEither eitherResp
 
   (respTime, resp) <- withTiming $ do
-    let response = Response.actionResponse txResult apiReq (T.decodeUtf8 prettyVersion, docsVersion) conf sCache iSchema iNegotiatedByProfile
+    let response = Response.actionResponse queryResult apiReq (T.decodeUtf8 prettyVersion, docsVersion) conf sCache iSchema iNegotiatedByProfile
-        status' = either Error.status Response.pgrstStatus response
+    when (configLogQuery /= LogQueryDisabled) $ logSQL $ either Error.status Response.pgrstStatus response
-
-    -- TODO: see above obsQuery, only this obsQuery should remain after refactoring (because the QueryObs depends on the status)
-    lift $ obsQuery status'
     liftEither response
 
-  return $ toWaiResponse (ServerTiming jwtTime parseTime planTime txTime respTime) resp
+  return $ toWaiResponse (ServerTiming jwtTime parseTime planTime queryTime respTime) resp
 
   where
     toWaiResponse :: ServerTiming -> Response.PgrstResponse -> Wai.Response

src/PostgREST/AppState.hs

@@ -44,8 +44,8 @@ import qualified PostgREST.Error            as Error
 import qualified PostgREST.Logger           as Logger
 import qualified PostgREST.Metrics          as Metrics
 import           PostgREST.Observation
-import           PostgREST.TimeIt           (timeItT)
 import           PostgREST.Version          (prettyVersion)
+import           System.TimeIt              (timeItT)
 
 import Control.AutoUpdate (defaultUpdateSettings, mkAutoUpdate,
                            updateAction)
@@ -57,7 +57,7 @@ import Data.IORef         (IORef, atomicWriteIORef, newIORef,
                            readIORef)
 import Data.Time.Clock    (UTCTime, getCurrentTime)
 
-import PostgREST.Auth.JwtCache           (JwtCacheState, update)
+import PostgREST.Auth.JwtCache           (JwtCacheState)
 import PostgREST.Config                  (AppConfig (..),
                                           addFallbackAppName,
                                           readAppConfig)
@@ -69,7 +69,7 @@ import PostgREST.Config.PgVersion        (PgVersion (..),
 import PostgREST.SchemaCache             (SchemaCache (..),
                                           querySchemaCache,
                                           showSummary)
-import PostgREST.SchemaCache.Identifiers (quoteQi)
+import PostgREST.SchemaCache.Identifiers (dumpQi)
 import PostgREST.Unix                    (createAndBindDomainSocket)
 
 import Data.Streaming.Network (bindPortTCP, bindRandomPortTCP)
@@ -127,13 +127,14 @@ init conf@AppConfig{configLogLevel, configDbPoolSize} = do
 
   observer $ AppStartObs prettyVersion
 
+  jwtCacheState <- JwtCache.init
   pool <- initPool conf observer
   (sock, adminSock) <- initSockets conf
-  state' <- initWithPool (sock, adminSock) pool conf loggerState metricsState observer
+  state' <- initWithPool (sock, adminSock) pool conf jwtCacheState loggerState metricsState observer
   pure state' { stateSocketREST = sock, stateSocketAdmin = adminSock}
 
-initWithPool :: AppSockets -> SQL.Pool -> AppConfig -> Logger.LoggerState -> Metrics.MetricsState -> ObservationHandler -> IO AppState
+initWithPool :: AppSockets -> SQL.Pool -> AppConfig -> JwtCache.JwtCacheState -> Logger.LoggerState -> Metrics.MetricsState -> ObservationHandler -> IO AppState
-initWithPool (sock, adminSock) pool conf loggerState metricsState observer = do
+initWithPool (sock, adminSock) pool conf jwtCacheState loggerState metricsState observer = do
 
   appState <- AppState pool
     <$> newIORef minimumPgVersion -- assume we're in a supported version when starting, this will be corrected on a later step
@@ -149,7 +150,7 @@ initWithPool (sock, adminSock) pool conf loggerState metricsState observer = do
     <*> pure sock
     <*> pure adminSock
     <*> pure observer
-    <*> JwtCache.init conf observer
+    <*> pure jwtCacheState
     <*> pure loggerState
     <*> pure metricsState
 
@@ -382,16 +383,14 @@ retryingSchemaCacheLoad appState@AppState{stateObserver=observer, stateMainThrea
             observer ExitDBNoRecoveryObs
             killThread mainThreadId
           return Nothing
-        Right actualPgVersion ->
+        Right actualPgVersion -> do
-          if actualPgVersion < minimumPgVersion then do
+          when (actualPgVersion < minimumPgVersion) $ do
             observer $ ExitUnsupportedPgVersion actualPgVersion minimumPgVersion
             killThread mainThreadId
-            return Nothing
+          observer $ DBConnectedObs $ pgvFullName actualPgVersion
-          else do
+          observer $ PoolInit configDbPoolSize
-            observer $ DBConnectedObs $ pgvFullName actualPgVersion
+          putPgVersion appState actualPgVersion
-            observer $ PoolInit configDbPoolSize
+          return $ Just actualPgVersion
-            putPgVersion appState actualPgVersion
-            return $ Just actualPgVersion
 
     qInDbConfig :: IO ()
     qInDbConfig = do
@@ -443,7 +442,7 @@ readInDbConfig startingUp appState@AppState{stateObserver=observer} = do
   pgVer <- getPgVersion appState
   dbSettings <-
     if configDbConfig conf then do
-      qDbSettings <- usePool appState (queryDbSettings (quoteQi <$> configDbPreConfig conf) (configDbPreparedStatements conf))
+      qDbSettings <- usePool appState (queryDbSettings (dumpQi <$> configDbPreConfig conf) (configDbPreparedStatements conf))
       case qDbSettings of
         Left e -> do
           observer $ ConfigReadErrorObs e
@@ -472,7 +471,10 @@ readInDbConfig startingUp appState@AppState{stateObserver=observer} = do
       -- After the config has reloaded, jwt-secret might have changed, so
       -- if it has changed, it is important to invalidate the jwt cache
       -- entries, because they were cached using the old secret
-      update (getJwtCacheState appState) newConf
+      if configJwtSecret conf == configJwtSecret newConf then
+        pass
+      else
+        JwtCache.emptyCache (getJwtCacheState appState) -- atomic O(1) operation
 
       if startingUp then
         pass

src/PostgREST/Auth.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE RecordWildCards #-}
 {-|
 Module      : PostgREST.Auth
 Description : PostgREST authentication functions.
@@ -11,6 +10,8 @@ Authentication should always be implemented in an external service.
 In the test suite there is an example of simple login function that can be used for a
 very simple authentication system inside the PostgreSQL database.
 -}
+{-# LANGUAGE LambdaCase      #-}
+{-# LANGUAGE RecordWildCards #-}
 module PostgREST.Auth
   ( getResult
   , getJwtDur
@@ -18,44 +19,177 @@ module PostgREST.Auth
   , middleware
   ) where
 
+import qualified Data.Aeson                      as JSON
+import qualified Data.Aeson.Key                  as K
+import qualified Data.Aeson.KeyMap               as KM
+import qualified Data.Aeson.Types                as JSON
 import qualified Data.ByteString                 as BS
+import qualified Data.ByteString.Internal        as BS
+import qualified Data.ByteString.Lazy.Char8      as LBS
+import qualified Data.Scientific                 as Sci
+import qualified Data.Text                       as T
 import qualified Data.Vault.Lazy                 as Vault
+import qualified Data.Vector                     as V
+import qualified Jose.Jwk                        as JWT
+import qualified Jose.Jwt                        as JWT
 import qualified Network.HTTP.Types.Header       as HTTP
 import qualified Network.Wai                     as Wai
 import qualified Network.Wai.Middleware.HttpAuth as Wai
 
-import Data.List        (lookup)
+import Control.Monad.Except    (liftEither)
-import PostgREST.TimeIt (timeItT)
+import Data.Either.Combinators (mapLeft)
-import System.IO.Unsafe (unsafePerformIO)
+import Data.List               (lookup)
+import Data.Time.Clock         (UTCTime, nominalDiffTimeToSeconds)
+import Data.Time.Clock.POSIX   (utcTimeToPOSIXSeconds)
+import System.IO.Unsafe        (unsafePerformIO)
+import System.TimeIt           (timeItT)
 
 import PostgREST.AppState      (AppState, getConfig, getJwtCacheState,
                                 getTime)
-import PostgREST.Auth.Jwt      (parseClaims)
 import PostgREST.Auth.JwtCache (lookupJwtCache)
 import PostgREST.Auth.Types    (AuthResult (..))
-import PostgREST.Config        (AppConfig (..))
+import PostgREST.Config        (AppConfig (..), FilterExp (..),
-import PostgREST.Error         (Error (..))
+                                JSPath, JSPathExp (..))
+import PostgREST.Error         (Error (..), JwtError (..))
 
 import Protolude
 
--- | Validate authorization header
+-- | Receives the JWT secret and audience (from config) and a JWT and returns a
+-- JSON object of JWT claims.
+parseToken :: AppConfig -> Maybe ByteString -> UTCTime -> ExceptT Error IO JSON.Value
+parseToken _ Nothing _ = return JSON.emptyObject
+parseToken _ (Just "") _ = throwE . JwtErr $ JwtDecodeError "Empty JWT is sent in Authorization header"
+parseToken AppConfig{..} (Just tkn) time = do
+  secret <- liftEither . maybeToRight (JwtErr JwtSecretMissing) $ configJWKS
+  tknWith3Parts <- liftEither $ hasThreeParts tkn
+  eitherContent <- liftIO $ JWT.decode (JWT.keys secret) Nothing tknWith3Parts
+  content <- liftEither . mapLeft (JwtErr . jwtDecodeError) $ eitherContent
+  liftEither $ mapLeft JwtErr $ verifyClaims content
+  where
+      hasThreeParts :: ByteString -> Either Error ByteString
+      hasThreeParts token = case length $ BS.split (BS.c2w '.') token of
+        3 -> Right token
+        n -> Left $ JwtErr $ JwtDecodeError ("Expected 3 parts in JWT; got " <> show n)
+      jwtDecodeError :: JWT.JwtError -> JwtError
+      -- The only errors we can get from JWT.decode function are:
+      --   BadAlgorithm
+      --   KeyError
+      --   BadCrypto
+      jwtDecodeError (JWT.KeyError _)     = JwtDecodeError "No suitable key or wrong key type"
+      jwtDecodeError (JWT.BadAlgorithm _) = JwtDecodeError "Wrong or unsupported encoding algorithm"
+      jwtDecodeError JWT.BadCrypto        = JwtDecodeError "JWT cryptographic operation failed"
+      -- Control never reaches here, the decode function only returns the above three
+      jwtDecodeError _                    = JwtDecodeError "JWT couldn't be decoded"
+
+      verifyClaims :: JWT.JwtContent -> Either JwtError JSON.Value
+      verifyClaims (JWT.Jws (_, claims)) = case JSON.decodeStrict claims of
+        Just jclaims@(JSON.Object mclaims) ->
+          verifyClaim mclaims "exp" isValidExpClaim "JWT expired" >>
+          verifyClaim mclaims "nbf" isValidNbfClaim "JWT not yet valid" >>
+          verifyClaim mclaims "iat" isValidIatClaim "JWT issued at future" >>
+          verifyClaim mclaims "aud" isValidAudClaim "JWT not in audience" >>
+          return jclaims
+        _ -> Left $ JwtClaimsError "Parsing claims failed"
+      -- TODO: We could enable JWE support here (encrypted tokens)
+      verifyClaims _ = Left $ JwtDecodeError "Unsupported token type"
+
+      verifyClaim mclaims claim func err = do
+        isValid <- maybe (Right True) func (KM.lookup claim mclaims)
+        unless isValid $ Left $ JwtClaimsError err
+
+      allowedSkewSeconds = 30 :: Int64
+      now = floor . nominalDiffTimeToSeconds $ utcTimeToPOSIXSeconds time
+      sciToInt = fromMaybe 0 . Sci.toBoundedInteger
+      allStrings = all (\case (JSON.String _) -> True; _ -> False)
+
+      isValidExpClaim :: JSON.Value -> Either JwtError Bool
+      isValidExpClaim (JSON.Number secs) = Right $ now <= (sciToInt secs + allowedSkewSeconds)
+      isValidExpClaim _ = Left $ JwtClaimsError "The JWT 'exp' claim must be a number"
+
+      isValidNbfClaim :: JSON.Value -> Either JwtError Bool
+      isValidNbfClaim (JSON.Number secs) = Right $ now >= (sciToInt secs - allowedSkewSeconds)
+      isValidNbfClaim _ = Left $ JwtClaimsError "The JWT 'nbf' claim must be a number"
+
+      isValidIatClaim :: JSON.Value -> Either JwtError Bool
+      isValidIatClaim (JSON.Number secs) = Right $ now >= (sciToInt secs - allowedSkewSeconds)
+      isValidIatClaim _ = Left $ JwtClaimsError "The JWT 'iat' claim must be a number"
+
+      isValidAudClaim :: JSON.Value -> Either JwtError Bool
+      isValidAudClaim JSON.Null = Right True -- {"aud": null} is valid for all audiences
+      isValidAudClaim (JSON.String str) = Right $ maybe (const True) (==) configJwtAudience str
+      isValidAudClaim (JSON.Array arr)
+        | null arr = Right True              -- {"aud": []} is valid for all audiences
+        | allStrings arr = Right $ maybe True (\a -> JSON.String a `elem` arr) configJwtAudience
+      isValidAudClaim _ = Left $ JwtClaimsError "The JWT 'aud' claim must be a string or an array of strings"
+
+parseClaims :: Monad m =>
+  AppConfig -> JSON.Value -> ExceptT Error m AuthResult
+parseClaims AppConfig{..} jclaims@(JSON.Object mclaims) = do
+  -- role defaults to anon if not specified in jwt
+  role <- liftEither . maybeToRight (JwtErr JwtTokenRequired) $
+    unquoted <$> walkJSPath (Just jclaims) configJwtRoleClaimKey <|> configDbAnonRole
+  return AuthResult
+           { authClaims = mclaims & KM.insert "role" (JSON.toJSON $ decodeUtf8 role)
+           , authRole = role
+           }
+  where
+    walkJSPath :: Maybe JSON.Value -> JSPath -> Maybe JSON.Value
+    walkJSPath x                      []                = x
+    walkJSPath (Just (JSON.Object o)) (JSPKey key:rest) = walkJSPath (KM.lookup (K.fromText key) o) rest
+    walkJSPath (Just (JSON.Array ar)) (JSPIdx idx:rest) = walkJSPath (ar V.!? idx) rest
+    walkJSPath (Just (JSON.Array ar)) [JSPFilter (EqualsCond txt)] = findFirstMatch (==) txt ar
+    walkJSPath (Just (JSON.Array ar)) [JSPFilter (NotEqualsCond txt)] = findFirstMatch (/=) txt ar
+    walkJSPath (Just (JSON.Array ar)) [JSPFilter (StartsWithCond txt)] = findFirstMatch T.isPrefixOf txt ar
+    walkJSPath (Just (JSON.Array ar)) [JSPFilter (EndsWithCond txt)] = findFirstMatch T.isSuffixOf txt ar
+    walkJSPath (Just (JSON.Array ar)) [JSPFilter (ContainsCond txt)] = findFirstMatch T.isInfixOf txt ar
+    walkJSPath _                      _                 = Nothing
+
+    findFirstMatch matchWith pattern = foldr checkMatch Nothing
+      where
+        checkMatch (JSON.String txt) acc
+            | pattern `matchWith` txt = Just $ JSON.String txt
+            | otherwise = acc
+        checkMatch _ acc = acc
+
+    unquoted :: JSON.Value -> BS.ByteString
+    unquoted (JSON.String t) = encodeUtf8 t
+    unquoted v               = LBS.toStrict $ JSON.encode v
+-- impossible case - just added to please -Wincomplete-patterns
+parseClaims _ _ = return AuthResult { authClaims = KM.empty, authRole = mempty }
+
+-- | Validate authorization header.
 --   Parse and store JWT claims for future use in the request.
 middleware :: AppState -> Wai.Middleware
 middleware appState app req respond = do
-  conf@AppConfig{..} <- getConfig appState
+  conf <- getConfig appState
   time <- getTime appState
 
   let token  = Wai.extractBearerAuth =<< lookup HTTP.hAuthorization (Wai.requestHeaders req)
-      parseJwt = runExceptT $ lookupJwtCache jwtCacheState token >>= parseClaims conf time
+      parseJwt = runExceptT $ parseToken conf token time >>= parseClaims conf
       jwtCacheState = getJwtCacheState appState
 
-  -- If ServerTimingEnabled -> calculate JWT validation time
+-- If ServerTimingEnabled -> calculate JWT validation time
-  req' <- if configServerTimingEnabled then do
+-- If JwtCacheMaxLifetime -> cache JWT validation result
-      (dur, authResult) <- timeItT parseJwt
+  req' <- case (configServerTimingEnabled conf, configJwtCacheMaxLifetime conf) of
-      pure $ req { Wai.vault = Wai.vault req & Vault.insert authResultKey authResult & Vault.insert jwtDurKey dur }
+    (True, 0)            -> do
-    else do
+          (dur, authResult) <- timeItT parseJwt
-      authResult <- parseJwt
+          return $ req { Wai.vault = Wai.vault req & Vault.insert authResultKey authResult & Vault.insert jwtDurKey dur }
-      pure $ req { Wai.vault = Wai.vault req & Vault.insert authResultKey authResult }
+
+    (True, maxLifetime)  -> do
+          (dur, authResult) <- timeItT $ case token of
+            Just tkn -> lookupJwtCache jwtCacheState tkn maxLifetime parseJwt time
+            Nothing  -> parseJwt
+          return $ req { Wai.vault = Wai.vault req & Vault.insert authResultKey authResult & Vault.insert jwtDurKey dur }
+
+    (False, 0)           -> do
+          authResult <- parseJwt
+          return $ req { Wai.vault = Wai.vault req & Vault.insert authResultKey authResult }
+
+    (False, maxLifetime) -> do
+          authResult <- case token of
+            Just tkn -> lookupJwtCache jwtCacheState tkn maxLifetime parseJwt time
+            Nothing -> parseJwt
+          return $ req { Wai.vault = Wai.vault req & Vault.insert authResultKey authResult }
 
   app req' respond
 

src/PostgREST/Auth/Jwt.hs

@@ -1,151 +0,0 @@
-{-|
-Module      : PostgREST.Auth.Jwt
-Description : PostgREST JWT support functions.
-
-This module provides functions to deal with JWT parsing and validation (http://jwt.io).
--}
-{-# LANGUAGE DeriveGeneric         #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE ImpredicativeTypes    #-}
-{-# LANGUAGE LambdaCase            #-}
-{-# LANGUAGE NamedFieldPuns        #-}
-{-# LANGUAGE QuantifiedConstraints #-}
-
-module PostgREST.Auth.Jwt
-  ( parseAndDecodeClaims
-  , parseClaims) where
-
-import qualified Data.Aeson                 as JSON
-import qualified Data.Aeson.Key             as K
-import qualified Data.Aeson.KeyMap          as KM
-import qualified Data.ByteString            as BS
-import qualified Data.ByteString.Internal   as BS
-import qualified Data.ByteString.Lazy.Char8 as LBS
-import qualified Data.Scientific            as Sci
-import qualified Data.Text                  as T
-import qualified Data.Vector                as V
-import qualified Jose.Jwk                   as JWT
-import qualified Jose.Jwt                   as JWT
-
-import Control.Monad.Except    (liftEither)
-import Data.Either.Combinators (mapLeft)
-import Data.Text               ()
-import Data.Time.Clock         (UTCTime, nominalDiffTimeToSeconds)
-import Data.Time.Clock.POSIX   (utcTimeToPOSIXSeconds)
-
-import PostgREST.Auth.Types (AuthResult (..))
-import PostgREST.Config     (AppConfig (..), FilterExp (..), JSPath,
-                             JSPathExp (..), audMatchesCfg)
-import PostgREST.Error      (Error (..),
-                             JwtClaimsError (AudClaimNotStringOrArray, ExpClaimNotNumber, IatClaimNotNumber, JWTExpired, JWTIssuedAtFuture, JWTNotInAudience, JWTNotYetValid, NbfClaimNotNumber, ParsingClaimsFailed),
-                             JwtDecodeError (..), JwtError (..))
-
-import Data.Aeson       ((.:?))
-import Data.Aeson.Types (parseMaybe)
-import Jose.Jwk         (JwkSet)
-import Protolude        hiding (first)
-
-parseAndDecodeClaims :: (MonadError Error m, MonadIO m) => JwkSet -> ByteString -> m JSON.Object
-parseAndDecodeClaims jwkSet token = parseToken jwkSet token >>= decodeClaims
-
-decodeClaims :: MonadError Error m => JWT.JwtContent -> m JSON.Object
-decodeClaims (JWT.Jws (_, claims)) = maybe (throwError (JwtErr $ JwtClaimsErr ParsingClaimsFailed)) pure (JSON.decodeStrict claims)
-decodeClaims _ = throwError $ JwtErr $ JwtDecodeErr UnsupportedTokenType
-
-validateClaims :: MonadError Error m => UTCTime -> (Text -> Bool) -> JSON.Object -> m ()
-validateClaims time audMatches claims = liftEither $ maybeToLeft () (fmap JwtErr . getAlt $ JwtClaimsErr <$> checkForErrors time audMatches claims)
-
-data ValidAud = VAString Text | VAArray [Text] deriving Generic
-instance JSON.FromJSON ValidAud where
-  parseJSON = JSON.genericParseJSON JSON.defaultOptions { JSON.sumEncoding = JSON.UntaggedValue }
-
-checkForErrors :: (Applicative m, Monoid (m JwtClaimsError)) => UTCTime -> (Text -> Bool) -> JSON.Object -> m JwtClaimsError
-checkForErrors time audMatches = mconcat
-  [
-    claim "exp" ExpClaimNotNumber $ inThePast JWTExpired
-  , claim "nbf" NbfClaimNotNumber $ inTheFuture JWTNotYetValid
-  , claim "iat" IatClaimNotNumber $ inTheFuture JWTIssuedAtFuture
-  , claim "aud" AudClaimNotStringOrArray $ checkValue (not . validAud) JWTNotInAudience
-  ]
-  where
-      allowedSkewSeconds = 30 :: Int64
-      sciToInt = fromMaybe 0 . Sci.toBoundedInteger
-      toSec = floor . nominalDiffTimeToSeconds . utcTimeToPOSIXSeconds
-      now = toSec time
-
-      inTheFuture = checkTime ((now + allowedSkewSeconds) <)
-      inThePast = checkTime ((now - allowedSkewSeconds) >)
-
-      checkTime cond = checkValue (cond. sciToInt)
-
-      validAud = \case
-        (VAString aud) -> audMatches aud
-        (VAArray auds) -> null auds || any audMatches auds
-
-      checkValue invalid msg val =
-        if invalid val then
-          pure msg
-        else
-          mempty
-
-      claim key parseError checkParsed = maybe (pure parseError) (maybe mempty checkParsed) . parseMaybe (.:? key)
-
--- | Receives the JWT secret and audience (from config) and a JWT and returns a
--- JSON object of JWT claims.
-parseToken :: (MonadError Error m, MonadIO m) => JwkSet -> ByteString -> m JWT.JwtContent
-parseToken _ "" = throwError $ JwtErr $ JwtDecodeErr EmptyAuthHeader
-parseToken secret tkn = do
-  -- secret <- liftEither . maybeToRight (JwtErr JwtSecretMissing) $ configJWKS
-  tknWith3Parts <- hasThreeParts tkn
-  eitherContent <- liftIO $ JWT.decode (JWT.keys secret) Nothing tknWith3Parts
-  liftEither . mapLeft (JwtErr . jwtDecodeError) $ eitherContent
-  --liftEither $ mapLeft JwtErr $ verifyClaims content
-  where
-      --hasThreeParts :: ByteString -> Either Error ByteString
-      hasThreeParts token = case length $ BS.split (BS.c2w '.') token of
-        3 -> pure token
-        n -> throwError $ JwtErr $ JwtDecodeErr $ UnexpectedParts n
-
-      jwtDecodeError :: JWT.JwtError -> JwtError
-      -- The only errors we can get from JWT.decode function are:
-      --   BadAlgorithm
-      --   KeyError
-      --   BadCrypto
-      jwtDecodeError (JWT.KeyError m)     = JwtDecodeErr $ KeyError m
-      jwtDecodeError (JWT.BadAlgorithm m) = JwtDecodeErr $ BadAlgorithm m
-      jwtDecodeError JWT.BadCrypto        = JwtDecodeErr BadCrypto
-      -- Control never reaches here, the decode function only returns the above three
-      jwtDecodeError _                    = JwtDecodeErr UnreachableDecodeError
-
-parseClaims :: (MonadError Error m, MonadIO m) => AppConfig -> UTCTime -> JSON.Object -> m AuthResult
-parseClaims cfg@AppConfig{configJwtRoleClaimKey, configDbAnonRole} time mclaims = do
-  validateClaims time (audMatchesCfg cfg) mclaims
-  -- role defaults to anon if not specified in jwt
-  role <- liftEither . maybeToRight (JwtErr JwtTokenRequired) $
-    unquoted <$> walkJSPath (Just $ JSON.Object mclaims) configJwtRoleClaimKey <|> configDbAnonRole
-  pure AuthResult
-           { authClaims = mclaims & KM.insert "role" (JSON.toJSON $ decodeUtf8 role)
-           , authRole = role
-           }
-  where
-    walkJSPath :: Maybe JSON.Value -> JSPath -> Maybe JSON.Value
-    walkJSPath x                      []                = x
-    walkJSPath (Just (JSON.Object o)) (JSPKey key:rest) = walkJSPath (KM.lookup (K.fromText key) o) rest
-    walkJSPath (Just (JSON.Array ar)) (JSPIdx idx:rest) = walkJSPath (ar V.!? idx) rest
-    walkJSPath (Just (JSON.Array ar)) [JSPFilter (EqualsCond txt)] = findFirstMatch (==) txt ar
-    walkJSPath (Just (JSON.Array ar)) [JSPFilter (NotEqualsCond txt)] = findFirstMatch (/=) txt ar
-    walkJSPath (Just (JSON.Array ar)) [JSPFilter (StartsWithCond txt)] = findFirstMatch T.isPrefixOf txt ar
-    walkJSPath (Just (JSON.Array ar)) [JSPFilter (EndsWithCond txt)] = findFirstMatch T.isSuffixOf txt ar
-    walkJSPath (Just (JSON.Array ar)) [JSPFilter (ContainsCond txt)] = findFirstMatch T.isInfixOf txt ar
-    walkJSPath _                      _                 = Nothing
-
-    findFirstMatch matchWith pattern = foldr checkMatch Nothing
-      where
-        checkMatch (JSON.String txt) acc
-            | pattern `matchWith` txt = Just $ JSON.String txt
-            | otherwise = acc
-        checkMatch _ acc = acc
-
-    unquoted :: JSON.Value -> BS.ByteString
-    unquoted (JSON.String t) = encodeUtf8 t
-    unquoted v               = LBS.toStrict $ JSON.encode v

src/PostgREST/Auth/JwtCache.hs

@@ -1,114 +1,99 @@
 {-|
 Module      : PostgREST.Auth.JwtCache
-Description : PostgREST JWT validation results Cache.
+Description : PostgREST Jwt Authentication Result Cache.
 
-This module provides functions to deal with the JWT cache.
+This module provides functions to deal with the JWT cache
 -}
-{-# LANGUAGE ExistentialQuantification #-}
+{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE FlexibleInstances         #-}
-{-# LANGUAGE LambdaCase                #-}
-{-# LANGUAGE MultiParamTypeClasses     #-}
-{-# LANGUAGE NamedFieldPuns            #-}
-{-# LANGUAGE StrictData                #-}
-
 module PostgREST.Auth.JwtCache
   ( init
-  , update
   , JwtCacheState
   , lookupJwtCache
+  , emptyCache
   ) where
 
 import qualified Data.Aeson        as JSON
 import qualified Data.Aeson.KeyMap as KM
+import qualified Data.Cache        as C
+import qualified Data.Scientific   as Sci
 
-import PostgREST.Error (Error (..), JwtError (JwtSecretMissing))
+import Control.Debounce
 
-import           Control.Concurrent.STM      (newTVarIO, readTVar,
+import Data.Time.Clock       (UTCTime, nominalDiffTimeToSeconds)
-                                              writeTVar)
+import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds)
-import           Control.Concurrent.STM.TVar (TVar)
+import System.Clock          (TimeSpec (..))
-import           Control.Monad.Error.Class   (liftEither)
-import           Data.ByteString             hiding (all, init)
-import           Data.IORef                  (IORef, newIORef,
-                                              readIORef, writeIORef)
-import           Jose.Jwk                    (JwkSet)
-import           PostgREST.Auth.Jwt          (parseAndDecodeClaims)
-import           PostgREST.Cache.Sieve       (alwaysValid)
-import qualified PostgREST.Cache.Sieve       as SC
-import           PostgREST.Config            (AppConfig (..))
-import           PostgREST.Observation       (Observation (JwtCacheEviction, JwtCacheLookup),
-                                              ObservationHandler)
-import           Protolude
 
-data JwtCacheState = JwtCacheState ObservationHandler (IORef JwtCache)
+import PostgREST.Auth.Types (AuthResult (..))
+import PostgREST.Error      (Error (..))
 
-class CacheVariant m v where
+import Protolude
-  cached :: SC.Cache m ByteString v -> ByteString -> ExceptT Error IO JSON.Object
 
-{-|
+-- | JWT Cache and IO action that triggers purging old entries from the cache
-Jwt caching can have three different configurations:
+data JwtCacheState = JwtCacheState
-* missing JWT Key (no caching and throw error when JWT token present in the request)
+  { jwtCache   :: C.Cache ByteString AuthResult
-* JWT cache turned off
+  , purgeCache :: IO ()
-* JWT cache turned on
+  }
-
-All three options are represented by JwtCache data type.
-
-Handling of reconfiguration is centralized in this module.
--}
-data JwtCache =
-  JwtNoJwks |
-  JwtNoCache JwkSet |
-  forall m v. CacheVariant m v => JwtCache JwkSet (TVar Int) (SC.Cache m ByteString v)
-
-instance CacheVariant IO (Either Error JSON.Object) where
-  cached c = lift . SC.cached c >=> liftEither
-
-instance CacheVariant (ExceptT Error IO) JSON.Object where
-  cached = SC.cached
-
-decode :: JwtCache -> ByteString -> ExceptT Error IO JSON.Object
-decode JwtNoJwks        = const $ throwError (JwtErr JwtSecretMissing)
-decode (JwtNoCache key) = parseAndDecodeClaims key
-decode (JwtCache _ _ c) = cached c
-
--- | Reconfigure JWT caching and update JwtCacheState accordingly
-update :: JwtCacheState -> AppConfig -> IO ()
-update (JwtCacheState observationHandler jwtCacheState) config@AppConfig{configJWKS, configJwtCacheMaxEntries} =
-  let reinitialize =
-        newJwtCache config observationHandler
-          >>= writeIORef jwtCacheState
-  in
-  readIORef jwtCacheState >>= \case
-    (JwtCache decodingKey maxSize _) ->
-      if configJWKS /= Just decodingKey || configJwtCacheMaxEntries <= 0 then
-        -- reinitialize if key changed or cache disabled
-        reinitialize
-      else
-        -- max size changed - set it and let the cache shrink itself if necessary
-        atomically $ writeTVar maxSize configJwtCacheMaxEntries
-
-    _ -> reinitialize
-
-init :: AppConfig -> ObservationHandler -> IO JwtCacheState
-init config = fmap (<$>) JwtCacheState <*> (newJwtCache config >=> newIORef)
 
 -- | Initialize JwtCacheState
-newJwtCache :: AppConfig -> ObservationHandler -> IO JwtCache
+init :: IO JwtCacheState
-newJwtCache AppConfig{configJWKS, configJwtCacheMaxEntries} observationHandler = do
+init = do
-  maybe (pure JwtNoJwks) initCache configJWKS
+  cache <- C.newCache Nothing -- no default expiration
-  where
+  -- purgeExpired has O(n^2) complexity
-    initCache key = if configJwtCacheMaxEntries <= 0 then pure (JwtNoCache key) else createCache key configJwtCacheMaxEntries
+  -- so we wrap it in debounce to make sure it:
+  -- 1) is executed asynchronously
+  -- 2) only a single purge operation is running at a time
+  debounce <- mkDebounce defaultDebounceSettings
+    -- debounceFreq is set to default 1 second
+    { debounceAction = C.purgeExpired cache
+    , debounceEdge = leadingEdge
+    }
+  pure $ JwtCacheState cache debounce
 
-    createCache key maxSize = do
+-- | Used to retrieve and insert JWT to JWT Cache
-          maxSizeTVar <- newTVarIO maxSize
+lookupJwtCache :: JwtCacheState -> ByteString -> Int -> IO (Either Error AuthResult) -> UTCTime -> IO (Either Error AuthResult)
-          JwtCache key maxSizeTVar <$>
+lookupJwtCache JwtCacheState{jwtCache, purgeCache} token maxLifetime parseJwt utc = do
-            notCachingErrors (readTVar maxSizeTVar) key
+  checkCache <- C.lookup jwtCache token
+  authResult <- maybe parseJwt (pure . Right) checkCache
 
-    notCachingErrors :: STM Int -> JwkSet -> IO (SC.Cache (ExceptT Error IO) ByteString JSON.Object)
+  case (authResult,checkCache) of
-    notCachingErrors maxSize key = SC.cacheIO (SC.CacheConfig maxSize
+    -- From comment:
-            (parseAndDecodeClaims key)
+    -- https://github.com/PostgREST/postgrest/pull/3801#discussion_r1857987914
-            (lift . observationHandler . JwtCacheLookup) -- lookup metrics
+    --
-            (const . const $ lift $ observationHandler JwtCacheEviction) -- evictions metrics
+    -- We purge expired cache entries on a cache miss
-            alwaysValid) -- no invalidation for now
+    -- The reasoning is that:
+    --
+    -- 1. We expect it to be rare (otherwise there is no point of the cache)
+    -- 2. It makes sure the cache is not growing (as inserting new entries
+    --    does garbage collection)
+    -- 3. Since this is time expiration based cache there is no real risk of
+    --    starvation - sooner or later we are going to have a cache miss.
 
-lookupJwtCache :: JwtCacheState -> Maybe ByteString -> ExceptT Error IO JSON.Object
+    (Right res, Nothing) -> do -- cache miss
-lookupJwtCache (JwtCacheState _ cacheState) k = liftIO (readIORef cacheState) >>= flip (maybe (pure KM.empty)) k . decode
+
+      let timeSpec = getTimeSpec res maxLifetime utc
+
+      -- insert new cache entry
+      C.insert' jwtCache (Just timeSpec) token res
+
+      -- Execute IO action to purge the cache
+      -- It is assumed this action returns immidiately
+      -- so that request processing is not blocked.
+      purgeCache
+
+    _                    -> pure ()
+
+  return authResult
+
+-- Used to extract JWT exp claim and add to JWT Cache
+getTimeSpec :: AuthResult -> Int -> UTCTime -> TimeSpec
+getTimeSpec res maxLifetime utc = do
+  let expireJSON = KM.lookup "exp" (authClaims res)
+      utcToSecs = floor . nominalDiffTimeToSeconds . utcTimeToPOSIXSeconds
+      sciToInt = fromMaybe 0 . Sci.toBoundedInteger
+  case expireJSON of
+    Just (JSON.Number seconds) -> TimeSpec (sciToInt seconds - utcToSecs utc) 0
+    _                          -> TimeSpec (fromIntegral maxLifetime :: Int64) 0
+
+-- | Empty the cache (done when the config is reloaded)
+emptyCache :: JwtCacheState -> IO ()
+emptyCache JwtCacheState{jwtCache} = C.purge jwtCache

src/PostgREST/CLI.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE NamedFieldPuns  #-}
+{-# LANGUAGE QuasiQuotes     #-}
 {-# LANGUAGE RecordWildCards #-}
 module PostgREST.CLI
   ( main
@@ -13,6 +14,8 @@ import qualified Data.ByteString.Lazy       as LBS
 import qualified Hasql.Transaction.Sessions as SQL
 import qualified Options.Applicative        as O
 
+import Text.Heredoc (str)
+
 import PostgREST.AppState    (AppState)
 import PostgREST.Config      (AppConfig (..))
 import PostgREST.Observation (Observation (..))
@@ -21,7 +24,6 @@ import PostgREST.Version     (prettyVersion)
 
 import qualified PostgREST.App      as App
 import qualified PostgREST.AppState as AppState
-import qualified PostgREST.Client   as Client
 import qualified PostgREST.Config   as Config
 
 import Protolude
@@ -29,26 +31,16 @@ import Protolude
 
 main :: CLI -> IO ()
 main CLI{cliCommand, cliPath} = do
-  conf <-
+  conf@AppConfig{..} <-
     either panic identity <$> Config.readAppConfig mempty cliPath Nothing mempty mempty
-  case cliCommand of
-    Client adminCmd -> runClientCommand conf adminCmd
-    Run runCmd      -> runAppCommand conf runCmd
 
--- | Run command using http-client to communicate with an already running postgrest
-runClientCommand :: AppConfig -> ClientCommand -> IO ()
-runClientCommand conf CmdReady = Client.ready conf
-
--- | Run postgrest with command
-runAppCommand :: AppConfig -> RunCommand -> IO ()
-runAppCommand conf@AppConfig{..} runCmd = do
   -- Per https://github.com/PostgREST/postgrest/issues/268, we want to
   -- explicitly close the connections to PostgreSQL on shutdown.
   -- 'AppState.destroy' takes care of that.
   bracket
     (AppState.init conf)
     AppState.destroy
-    (\appState -> case runCmd of
+    (\appState -> case cliCommand of
       CmdDumpConfig -> do
         when configDbConfig $ AppState.readInDbConfig True appState
         putStr . Config.toText =<< AppState.getConfig appState
@@ -79,13 +71,6 @@ data CLI = CLI
   }
 
 data Command
-  = Client ClientCommand
-  | Run RunCommand
-
-data ClientCommand
-  = CmdReady
-
-data RunCommand
   = CmdRun
   | CmdDumpConfig
   | CmdDumpSchema
@@ -112,7 +97,7 @@ readCLIShowHelp =
         <> O.help "Show the version information"
 
     exampleParser =
-      O.infoOption Config.exampleConfigFile $
+      O.infoOption exampleConfigFile $
         O.long "example"
         <> O.short 'e'
         <> O.help "Show an example configuration file"
@@ -120,7 +105,7 @@ readCLIShowHelp =
     cliParser :: O.Parser CLI
     cliParser =
       CLI
-        <$> (dumpConfigFlag <|> dumpSchemaFlag <|> readyFlag)
+        <$> (dumpConfigFlag <|> dumpSchemaFlag)
         <*> O.optional configFileOption
 
     configFileOption =
@@ -129,16 +114,125 @@ readCLIShowHelp =
         <> O.help "Path to configuration file"
 
     dumpConfigFlag =
-      O.flag (Run CmdRun) (Run CmdDumpConfig) $
+      O.flag CmdRun CmdDumpConfig $
         O.long "dump-config"
         <> O.help "Dump loaded configuration and exit"
 
     dumpSchemaFlag =
-      O.flag (Run CmdRun) (Run CmdDumpSchema) $
+      O.flag CmdRun CmdDumpSchema $
         O.long "dump-schema"
         <> O.help "Dump loaded schema as JSON and exit (for debugging, output structure is unstable)"
 
-    readyFlag =
+exampleConfigFile :: [Char]
-      O.flag (Run CmdRun) (Client CmdReady) $
+exampleConfigFile =
-        O.long "ready"
+  [str|## Admin server used for checks. It's disabled by default unless a port is specified.
-        <> O.help "Checks the health of PostgREST by doing a request on the admin server /ready endpoint"
+      |# admin-server-port = 3001
+      |
+      |## The database role to use when no client authentication is provided
+      |# db-anon-role = "anon"
+      |
+      |## Notification channel for reloading the schema cache
+      |db-channel = "pgrst"
+      |
+      |## Enable or disable the notification channel
+      |db-channel-enabled = true
+      |
+      |## Enable in-database configuration
+      |db-config = true
+      |
+      |## Function for in-database configuration
+      |## db-pre-config = "postgrest.pre_config"
+      |
+      |## Extra schemas to add to the search_path of every request
+      |db-extra-search-path = "public"
+      |
+      |## Limit rows in response
+      |# db-max-rows = 1000
+      |
+      |## Allow getting the EXPLAIN plan through the `Accept: application/vnd.pgrst.plan` header
+      |# db-plan-enabled = false
+      |
+      |## Number of open connections in the pool
+      |db-pool = 10
+      |
+      |## Time in seconds to wait to acquire a slot from the connection pool
+      |# db-pool-acquisition-timeout = 10
+      |
+      |## Time in seconds after which to recycle pool connections
+      |# db-pool-max-lifetime = 1800
+      |
+      |## Time in seconds after which to recycle unused pool connections
+      |# db-pool-max-idletime = 30
+      |
+      |## Allow automatic database connection retrying
+      |# db-pool-automatic-recovery = true
+      |
+      |## Stored proc to exec immediately after auth
+      |# db-pre-request = "stored_proc_name"
+      |
+      |## Enable or disable prepared statements. disabling is only necessary when behind a connection pooler.
+      |## When disabled, statements will be parametrized but won't be prepared.
+      |db-prepared-statements = true
+      |
+      |## The name of which database schema to expose to REST clients
+      |db-schemas = "public"
+      |
+      |## How to terminate database transactions
+      |## Possible values are:
+      |## commit (default)
+      |##   Transaction is always committed, this can not be overriden
+      |## commit-allow-override
+      |##   Transaction is committed, but can be overriden with Prefer tx=rollback header
+      |## rollback
+      |##   Transaction is always rolled back, this can not be overriden
+      |## rollback-allow-override
+      |##   Transaction is rolled back, but can be overriden with Prefer tx=commit header
+      |db-tx-end = "commit"
+      |
+      |## The standard connection URI format, documented at
+      |## https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
+      |db-uri = "postgresql://"
+      |
+      |# jwt-aud = "your_audience_claim"
+      |
+      |## Jspath to the role claim key
+      |jwt-role-claim-key = ".role"
+      |
+      |## Choose a secret, JSON Web Key (or set) to enable JWT auth
+      |## (use "@filename" to load from separate file)
+      |# jwt-secret = "secret_with_at_least_32_characters"
+      |jwt-secret-is-base64 = false
+      |
+      |## Enables and set JWT Cache max lifetime, disables caching with 0
+      |# jwt-cache-max-lifetime = 0
+      |
+      |## Logging level, the admitted values are: crit, error, warn, info and debug.
+      |log-level = "error"
+      |
+      |## Log the requested SQL query at the current log-level.
+      |log-query = "disabled"
+      |
+      |## Determine if the OpenAPI output should follow or ignore role privileges or be disabled entirely.
+      |## Admitted values: follow-privileges, ignore-privileges, disabled
+      |openapi-mode = "follow-privileges"
+      |
+      |## Base url for the OpenAPI output
+      |openapi-server-proxy-uri = ""
+      |
+      |## Configurable CORS origins
+      |# server-cors-allowed-origins = ""
+      |
+      |server-host = "!4"
+      |server-port = 3000
+      |
+      |## Allow getting the request-response timing information through the `Server-Timing` header
+      |server-timing-enabled = false
+      |
+      |## Unix socket location
+      |## if specified it takes precedence over server-port
+      |# server-unix-socket = "/tmp/pgrst.sock"
+      |
+      |## Unix socket file mode
+      |## When none is provided, 660 is applied by default
+      |# server-unix-socket-mode = "660"
+      |]

src/PostgREST/Cache/Sieve.hs

@@ -1,218 +0,0 @@
-{-|
-Module      : PostgREST.Cache.Sieve
-Description : PostgREST cache implementation based on Sieve algorithm.
-
-This module provides implementation of a mutable cache on Sieve algorithm.
--}
-{-# LANGUAGE DataKinds       #-}
-{-# LANGUAGE GADTs           #-}
-{-# LANGUAGE LambdaCase      #-}
-{-# LANGUAGE NamedFieldPuns  #-}
-{-# LANGUAGE PolyKinds       #-}
-{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE RecursiveDo     #-}
-{-# LANGUAGE StrictData      #-}
-{-# LANGUAGE TupleSections   #-}
-
-module PostgREST.Cache.Sieve (
-      Cache
-    , CacheConfig (..)
-    , Discard (..)
-    , alwaysValid
-    , cache
-    , cacheIO
-    , cached
-)
-where
-
-import           Control.Concurrent.STM
-import           Control.Monad.Extra    (whileM)
-import           Data.Some
-import qualified Focus                  as F
-import           Protolude              hiding (elem, head)
-import qualified StmHamt.SizedHamt      as SH
-
-data ListNode k v (b :: Bool) = ListNode {
-        nextPtr        :: NodePtr k v,
-        prevNextPtrPtr :: NodePtrPtr k v,
-        elem           :: NodeElem k v b
-    }
-
-data NodeElem :: Type -> Type -> Bool -> Type where
-    Head :: {
-            entries          :: SH.SizedHamt (HamtEntry k v),
-            finger           :: NodePtrPtr k v
-        } -> NodeElem k v False
-    Entry :: Hashable k => {
-            visited :: TVar Bool,
-            ekey :: k,
-            entryValue :: v
-        } -> NodeElem k v True
-
-type HamtEntry k v = ListNode k v True
-type AnyNode k v = Some (ListNode k v)
-type NodePtr k v = TVar (AnyNode k v)
-type NodePtrPtr k v = TVar (NodePtr k v)
-
-data Discard m v = Refresh (m ()) | Invalid (m v)
-
-data Cache m k v = (MonadIO m, Hashable k) => Cache (ListNode k v False) (CacheConfig m k v)
-
-data CacheConfig m k v = CacheConfig {
-        maxSize          :: STM Int,
-        load             :: k -> m v,
-        requestListener  :: Bool -> m (),
-        evictionListener :: k -> v -> m (),
-        validator        :: m (k -> v -> Maybe (Discard m v))
-}
-
-alwaysValid :: Applicative m => m (k -> v -> Maybe (Discard m v))
-alwaysValid = pure (const . const Nothing)
-
-cacheIO :: (MonadIO m, Hashable k) => CacheConfig m k v -> IO (Cache m k v)
-cacheIO = atomically . cache
-
-cache :: (MonadIO m, Hashable k) => CacheConfig m k v -> STM (Cache m k v)
-cache cacheConfig = mdo
-    tail <- newTVar (Some head)
-    entries <- SH.new
-    finger <- newTVar tail
-    head <- ListNode tail <$> newTVar tail <*> pure Head {..}
-    pure $ Cache head cacheConfig
-
-cached :: Cache m k v -> k -> m v
-cached (Cache head@ListNode{prevNextPtrPtr=neck, elem=Head{..}} CacheConfig{..}) k = do
-    checkValid <- validator
-    tryMaybe
-        -- Fast path: lookup value, update stats and return the value if found and valid
-        ((liftIO . atomically) (lookup checkValid) >>= notify (requestListener . isJust) >>= validate)
-        -- Slow path: load/calculate value and insert it (if still not found)
-        (do
-            value <- load k
-            whileM (not <$> tryInsert value)
-            pure value)
-    where
-        tryMaybe f notFound = f >>= maybe notFound pure
-
-        notify = ((<$) <*>)
-
-        validate = fmap join . traverse (\case
-            -- valid value
-            (Right v) -> pure $ Just v
-            -- refresh value
-            (Left (Refresh act)) -> act $> Nothing
-            -- discard value and return alt result
-            (Left (Invalid res)) -> Just <$> res)
-
-        lookup checkValid = SH.focus focus (ekey . elem) k entries
-            where
-                focus = F.Focus
-                    -- not found
-                    (pure (Nothing, F.Leave))
-                    -- found
-                    -- check entry validity
-                    (\e@ListNode{elem=Entry{visited, entryValue}} ->
-                        maybe
-                            -- entry valid
-                            (mark visited True $> (Just $ Right entryValue, F.Leave))
-                            -- entry invalid
-                            -- remove it
-                            ((removeEntry e $>) . (, F.Remove) . Just . Left)
-                            (checkValid k entryValue)
-                    )
-
-        mark t b = whenM ((/= b) <$> readTVar t) (writeTVar t b)
-
-        -- perform a single entry eviction and possibly insertion atomically
-        -- returning False if could not insert
-        -- (either because entry currently pointed by the finger was visited
-        --  or because after this entry eviction the cache is still full)
-        -- so that other threads don't have to wait when visiting entries.
-        -- First check if entry is still not in the cache - this time inside transaction.
-        --
-        -- Execute evictionListener if an entry was evicted
-        tryInsert value = do
-            (result, evicted) <- liftIO . atomically $ do
-                -- Use SH.focus to performa a single lookup instead of 2
-                -- we cannot modify Hamt from inside focus
-                -- so if there is any entry to remove
-                -- we need to delete it after
-                (res, evictedKey) <- SH.focus focus (ekey . elem) k entries
-                case evictedKey of
-                    (Just Entry{ekey=entryKey, entryValue}) -> do
-                        SH.focus F.delete (ekey . elem) entryKey entries
-                        pure (res, evictionListener entryKey entryValue)
-                    Nothing -> pure (res, pure ())
-
-            evicted $> result
-            where
-                focus = F.Focus (do
-                    (hasSpace, evictedKey) <- evictionStep
-                    if hasSpace then do
-                        entry <- newLinkedEntry value
-                        -- done, maybe evicted, insert entry
-                        pure ((True, evictedKey), F.Set entry)
-                    else
-                        -- not done, maybe evicted, don't modify entries
-                        pure ((False, evictedKey), F.Leave))
-                    -- Entry found case
-                    (\ListNode{elem=Entry{visited}} -> do
-                        -- mark as visited
-                        mark visited True
-                        -- done, no evictions, don't modify entries
-                        pure ((True, Nothing), F.Leave))
-
-        -- if the cache is full precoesses a single node
-        -- removing it if it is marked as unvisited
-        -- or clearing visited mark
-        -- returns True if there is space in the cache
-        -- puts evictionListener in state if an entry was evicted
-        evictionStep = do
-            currDiff <- liftA2 (-) (SH.size entries) (max 1 <$> maxSize)
-            if currDiff >= 0 then do
-                -- no space in the cache
-                -- need to evict an entry
-                (nextFinger, evictedKey) <- readTVar finger >>= evict
-                writeTVar finger nextFinger
-                -- return if enough space and evicted key if any
-                pure (isJust evictedKey && currDiff == 0, evictedKey)
-            else
-                -- there is space in the cache
-                pure (True, Nothing)
-
-        evict :: TVar (Some (ListNode k v)) -> STM (NodePtr k v, Maybe (NodeElem k v True))
-        evict = readTVar >=> \case
-            (Some e@ListNode{nextPtr, prevNextPtrPtr, elem=elem@Entry{visited}}) -> do
-                ifM (readTVar visited)
-
-                    (writeTVar visited False $> (nextPtr, Nothing))
-
-                    (unlinkEntry e *> fmap (, Just elem) (readTVar prevNextPtrPtr))
-            -- skip head
-            (Some ListNode{nextPtr, elem=Head{}}) -> evict nextPtr
-
-        unlinkEntry :: HamtEntry k v -> STM ()
-        unlinkEntry (ListNode{nextPtr, prevNextPtrPtr=currPrev}) = do
-            nextEntry <- readTVar nextPtr
-            withSome nextEntry $ \e -> do
-                prevNextPtr <- readTVar currPrev
-                writeTVar (prevNextPtrPtr e) prevNextPtr
-                writeTVar prevNextPtr nextEntry
-
-        newLinkedEntry v = do
-            oldNeckNextPtr <- readTVar neck
-            newNeckNextPtr <- newTVar (Some head)
-            newNeck <- ListNode newNeckNextPtr <$>
-                newTVar oldNeckNextPtr <*>
-                (Entry <$> newTVar False <*> pure k <*> pure v)
-            -- update pointers
-            writeTVar oldNeckNextPtr (Some newNeck)
-            writeTVar neck newNeckNextPtr
-            -- return HAMT entry
-            pure newNeck
-
-        removeEntry = fmap (*>) unlinkEntry <*> adjustFinger
-
-        adjustFinger ListNode{nextPtr, prevNextPtrPtr} =
-            whenM ((nextPtr ==) <$> readTVar finger) $
-                readTVar prevNextPtrPtr >>= writeTVar finger

src/PostgREST/Client.hs

@@ -1,100 +0,0 @@
-{-|
-Module      : PostgREST.Client
-Description : PostgREST HTTP client
--}
-{-# LANGUAGE NamedFieldPuns #-}
-module PostgREST.Client
-  ( ready
-  ) where
-
-import qualified Data.Text                 as T
-import qualified Network.HTTP.Client       as HC
-import qualified Network.HTTP.Types.Status as HTTP
-
-import Network.HTTP.Client (HttpException (..))
-import System.IO           (hFlush)
-
-import PostgREST.Config  (AppConfig (..))
-import PostgREST.Network (isSpecialHostName)
-
-import Protolude
-
-data PgrstClientError
-  = NoAdminServer
-  | NoSpecialHostNamesAllowed Text
-  | PostgRESTNotReady         Text
-  | HTTPConnectionRefused     Text
-  | HTTPExceptionInvalidURL   Text
-
--- | This is invoked by the CLI "--ready" flag.
---   The http-client sends and a request to /ready endpoint
---   and exits with success or failure.
-ready :: AppConfig -> IO ()
-ready AppConfig{configAdminServerHost, configAdminServerPort} = do
-
-  client <- HC.newManager HC.defaultManagerSettings
-  readyURL <- getURL
-  req <- HC.parseRequest (T.unpack readyURL) `catch` handleHttpException
-  resp <- HC.httpLbs req client `catch` handleHttpException
-
-  let status = HC.responseStatus resp
-
-  if status >= HTTP.status200 && status < HTTP.status300
-    then printAndExitWithSuccess $ "OK: " <> readyURL
-    else printAndExitWithFailure $ clientErrorMsg (PostgRESTNotReady readyURL)
-        where
-          getURL :: IO Text
-          getURL =
-            -- Here, we have three cases:
-            -- 1. If the admin port config is not defined, we exit
-            --      with "no admin server error"
-            -- 2. Otherwise, if admin server is running, then we check if
-            --      postgrest server-host is configured with special hostname like "*4",
-            --      if it is, we fail with "no special hostname allowed with "--ready".
-            --      The reason for this is that we can't know the actual address.
-            -- 3. Finally, if we know the "actual" hostname and the port, then we
-            --      construct the URL and return it.
-            case configAdminServerPort of
-              Nothing   -> printAndExitWithFailure $ clientErrorMsg NoAdminServer
-              Just port ->
-                if isSpecialHostName configAdminServerHost
-                  then printAndExitWithFailure $ clientErrorMsg (NoSpecialHostNamesAllowed configAdminServerHost)
-                  else return $ makeReadyUrl port
-
-          -- NOTE: http-client automatically resolves hostnames
-          makeReadyUrl :: Int -> Text
-          makeReadyUrl p = "http://" <> wrapIfIpv6 configAdminServerHost <> ":" <> (T.pack . show) p <> "/ready"
-            where
-              -- IPv6 needs to wrapped in [], it has ':' as separator
-              wrapIfIpv6 :: Text -> Text
-              wrapIfIpv6 s
-                | T.any (== ':') s = "[" <> s <> "]"
-                | otherwise = s
-
--- | Handle HTTP exception for "http-client" requests
-handleHttpException :: HttpException -> IO a
-handleHttpException (HttpExceptionRequest req _) = do
-  let url = show (HC.getUri req)
-  printAndExitWithFailure $ clientErrorMsg (HTTPConnectionRefused $ T.pack url)
-handleHttpException (InvalidUrlException url _) = do
-  printAndExitWithFailure $ clientErrorMsg (HTTPExceptionInvalidURL $ T.pack url)
-
--- | Print the message on stdout and exit with success
-printAndExitWithSuccess :: Text -> IO a
-printAndExitWithSuccess msg = putStrLn (T.unpack msg) >> hFlush stdout >> exitSuccess
-
--- | Print the message on stderr and exit with failure
-printAndExitWithFailure :: Text -> IO a
-printAndExitWithFailure msg = hPutStrLn stderr (T.unpack msg) >> hFlush stderr >> exitWith (ExitFailure 1)
-
--- | Pgrst client error to error message
-clientErrorMsg :: PgrstClientError -> Text
-clientErrorMsg err = "ERROR: " <>
-  case err of
-    NoAdminServer -> "Admin server is not running. Please check admin-server-port config."
-    NoSpecialHostNamesAllowed host ->
-      "The `--ready` flag cannot be used when server-host is configured as \"" <> host <> "\". "
-      <> "Please update your server-host config to \"localhost\"."
-    PostgRESTNotReady url -> url
-    HTTPConnectionRefused url -> "connection refused to " <> url
-    HTTPExceptionInvalidURL url -> "invalid url - " <> url

src/PostgREST/Config.hs

@@ -17,6 +17,7 @@ module PostgREST.Config
   , JSPathExp(..)
   , FilterExp(..)
   , LogLevel(..)
+  , LogQuery(..)
   , OpenAPIMode(..)
   , Proxy(..)
   , toText
@@ -27,8 +28,6 @@ module PostgREST.Config
   , parseSecret
   , addFallbackAppName
   , addTargetSessionAttrs
-  , exampleConfigFile
-  , audMatchesCfg
   ) where
 
 import qualified Data.Aeson             as JSON
@@ -37,7 +36,6 @@ import qualified Data.ByteString.Base64 as B64
 import qualified Data.CaseInsensitive   as CI
 import qualified Data.Configurator      as C
 import qualified Data.Map.Strict        as M
-import qualified Data.String            as S
 import qualified Data.Text              as T
 import qualified Data.Text.Encoding     as T
 import qualified Jose.Jwa               as JWT
@@ -50,7 +48,7 @@ import Data.List.NonEmpty      (fromList, toList)
 import Data.Maybe              (fromJust)
 import Data.Scientific         (floatingOrInteger)
 import Jose.Jwk                (Jwk, JwkSet)
-import Network.URI             (escapeURIString, isURI,
+import Network.URI             (escapeURIString,
                                 isUnescapedInURIComponent)
 import Numeric                 (readOct, showOct)
 import System.Environment      (getEnvironment)
@@ -68,8 +66,6 @@ import PostgREST.SchemaCache.Identifiers (QualifiedIdentifier, dumpQi,
 
 import Protolude hiding (Proxy, toList)
 
-audMatchesCfg :: AppConfig -> Text -> Bool
-audMatchesCfg =  maybe (const True) (==) . configJwtAudience
 
 data AppConfig = AppConfig
   { configAppSettings              :: [(Text, Text)]
@@ -101,9 +97,9 @@ data AppConfig = AppConfig
   , configJwtRoleClaimKey          :: JSPath
   , configJwtSecret                :: Maybe BS.ByteString
   , configJwtSecretIsBase64        :: Bool
-  , configJwtCacheMaxEntries       :: Int
+  , configJwtCacheMaxLifetime      :: Int
   , configLogLevel                 :: LogLevel
-  , configLogQuery                 :: Bool
+  , configLogQuery                 :: LogQuery
   , configOpenApiMode              :: OpenAPIMode
   , configOpenApiSecurityActive    :: Bool
   , configOpenApiServerProxyUri    :: Maybe Text
@@ -118,9 +114,7 @@ data AppConfig = AppConfig
   , configAdminServerPort          :: Maybe Int
   , configRoleSettings             :: RoleSettings
   , configRoleIsoLvl               :: RoleIsolationLvl
-  , configInternalSCQuerySleep     :: Maybe Int32
+  , configInternalSCSleep          :: Maybe Int32
-  , configInternalSCLoadSleep      :: Maybe Int32
-  , configInternalSCRelLoadSleep   :: Maybe Int32
   }
 
 data LogLevel = LogCrit | LogError | LogWarn | LogInfo | LogDebug
@@ -134,6 +128,14 @@ dumpLogLevel = \case
   LogInfo  -> "info"
   LogDebug -> "debug"
 
+data LogQuery = LogQueryMain | LogQueryDisabled
+  deriving (Eq)
+
+dumpLogQuery :: LogQuery -> Text
+dumpLogQuery = \case
+  LogQueryMain     -> "main-query"
+  LogQueryDisabled -> "disabled"
+
 data OpenAPIMode = OAFollowPriv | OAIgnorePriv | OADisabled
   deriving Eq
 
@@ -175,9 +177,9 @@ toText conf =
       ,("jwt-role-claim-key",        q . T.intercalate mempty . fmap dumpJSPath . configJwtRoleClaimKey)
       ,("jwt-secret",                q . T.decodeUtf8 . showJwtSecret)
       ,("jwt-secret-is-base64",          T.toLower . show . configJwtSecretIsBase64)
-      ,("jwt-cache-max-entries",         show . configJwtCacheMaxEntries)
+      ,("jwt-cache-max-lifetime",                   show . configJwtCacheMaxLifetime)
       ,("log-level",                 q . dumpLogLevel . configLogLevel)
-      ,("log-query",                     T.toLower . show . configLogQuery)
+      ,("log-query",                 q . dumpLogQuery . configLogQuery)
       ,("openapi-mode",              q . dumpOpenApiMode . configOpenApiMode)
       ,("openapi-security-active",       T.toLower . show . configOpenApiSecurityActive)
       ,("openapi-server-proxy-uri",  q . fromMaybe mempty . configOpenApiServerProxyUri)
@@ -279,15 +281,15 @@ parser optPath env dbSettings roleSettings roleIsolationLvl =
     <*> (fromMaybe "postgresql://" <$> optString "db-uri")
     <*> pure optPath
     <*> pure Nothing
-    <*> optStringOrURI "jwt-aud"
+    <*> optString "jwt-aud"
     <*> parseRoleClaimKey "jwt-role-claim-key" "role-claim-key"
     <*> (fmap encodeUtf8 <$> optString "jwt-secret")
     <*> (fromMaybe False <$> optWithAlias
           (optBool "jwt-secret-is-base64")
           (optBool "secret-is-base64"))
-    <*> (fromMaybe 1000 <$> optInt "jwt-cache-max-entries")
+    <*> (fromMaybe 0 <$> optInt "jwt-cache-max-lifetime")
     <*> parseLogLevel "log-level"
-    <*> (fromMaybe False <$> optBool "log-query")
+    <*> parseLogQuery "log-query"
     <*> parseOpenAPIMode "openapi-mode"
     <*> (fromMaybe False <$> optBool "openapi-security-active")
     <*> parseOpenAPIServerProxyURI "openapi-server-proxy-uri"
@@ -303,9 +305,7 @@ parser optPath env dbSettings roleSettings roleIsolationLvl =
     <*> parseAdminServerPort "admin-server-port"
     <*> pure roleSettings
     <*> pure roleIsolationLvl
-    <*> optInt "internal-schema-cache-query-sleep"
+    <*> optInt "internal-schema-cache-sleep"
-    <*> optInt "internal-schema-cache-load-sleep"
-    <*> optInt "internal-schema-cache-relationship-load-sleep"
   where
     parseAppSettings :: C.Key -> C.Parser C.Config [(Text, Text)]
     parseAppSettings key = addFromEnv . fmap (fmap coerceText) <$> C.subassocs key C.value
@@ -365,6 +365,14 @@ parser optPath env dbSettings roleSettings roleIsolationLvl =
         Just "debug" -> pure LogDebug
         Just _       -> fail "Invalid logging level. Check your configuration."
 
+    parseLogQuery :: C.Key -> C.Parser C.Config LogQuery
+    parseLogQuery k =
+      optString k >>= \case
+        Nothing           -> pure  LogQueryDisabled
+        Just "disabled"   -> pure  LogQueryDisabled
+        Just "main-query" -> pure  LogQueryMain
+        Just _            -> fail "Invalid SQL logging value. Check your configuration."
+
     parseTxEnd :: C.Key -> ((Bool, Bool) -> Bool) -> C.Parser C.Config Bool
     parseTxEnd k f =
       optString k >>= \case
@@ -399,20 +407,6 @@ parser optPath env dbSettings roleSettings roleIsolationLvl =
     optStringEmptyable :: C.Key -> C.Parser C.Config (Maybe Text)
     optStringEmptyable k = overrideFromDbOrEnvironment C.optional k coerceText
 
-    optStringOrURI :: C.Key -> C.Parser C.Config (Maybe Text)
-    optStringOrURI k = do
-      stringOrURI <- mfilter (/= "") <$> overrideFromDbOrEnvironment C.optional k coerceText
-      -- If the string contains ':' then it should
-      -- be a valid URI according to RFC 3986
-      case stringOrURI of
-        Just s  -> if T.isInfixOf ":" s then validateURI s else return (Just s)
-        Nothing -> return Nothing
-      where
-        validateURI :: Text -> C.Parser C.Config (Maybe Text)
-        validateURI s = if isURI (T.unpack s)
-                          then return $ Just s
-                          else fail "jwt-aud should be a string or a valid URI"
-
     optInt :: (Read i, Integral i) => C.Key -> C.Parser C.Config (Maybe i)
     optInt k = join <$> overrideFromDbOrEnvironment C.optional k coerceInt
 
@@ -620,118 +614,3 @@ addConnStringOption dbUri key val = dbUri <>
     uriFmt = key <> "=" <> toS (escapeURIString isUnescapedInURIComponent $ toS val)
     keyValFmt = key <> "=" <> "'" <> T.replace "'" "\\'" val <> "'"
     lookAtOptions x =  T.breakOn "?" . snd $ T.breakOnEnd "@" x -- start from after `@` to not mess passwords that include `?`, see https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING-URIS
-
--- | Example config file displayed on postgrest "--example" flag
-exampleConfigFile :: [Char]
-exampleConfigFile = S.unlines
-  [ "## Admin server used for checks. It's disabled by default unless a port is specified."
-  , "# admin-server-port = 3001"
-  , ""
-  , "## The database role to use when no client authentication is provided"
-  , "# db-anon-role = \"anon\""
-  , ""
-  , "## Notification channel for reloading the schema cache"
-  , "db-channel = \"pgrst\""
-  , ""
-  , "## Enable or disable the notification channel"
-  , "db-channel-enabled = true"
-  , ""
-  , "## Enable in-database configuration"
-  , "db-config = true"
-  , ""
-  , "## Function for in-database configuration"
-  , "## db-pre-config = \"postgrest.pre_config\""
-  , ""
-  , "## Extra schemas to add to the search_path of every request"
-  , "db-extra-search-path = \"public\""
-  , ""
-  , "## Limit rows in response"
-  , "# db-max-rows = 1000"
-  , ""
-  , "## Allow getting the EXPLAIN plan through the `Accept: application/vnd.pgrst.plan` header"
-  , "# db-plan-enabled = false"
-  , ""
-  , "## Number of open connections in the pool"
-  , "db-pool = 10"
-  , ""
-  , "## Time in seconds to wait to acquire a slot from the connection pool"
-  , "# db-pool-acquisition-timeout = 10"
-  , ""
-  , "## Time in seconds after which to recycle pool connections"
-  , "# db-pool-max-lifetime = 1800"
-  ,  ""
-  ,  "## Time in seconds after which to recycle unused pool connections"
-  ,  "# db-pool-max-idletime = 30"
-  ,  ""
-  , "## Allow automatic database connection retrying"
-  , "# db-pool-automatic-recovery = true"
-  , ""
-  , "## Stored proc to exec immediately after auth"
-  , "# db-pre-request = \"stored_proc_name\""
-  , ""
-  , "## Enable or disable prepared statements. disabling is only necessary when behind a connection pooler."
-  , "## When disabled, statements will be parametrized but won't be prepared."
-  , "db-prepared-statements = true"
-  , ""
-  , "## The name of which database schema to expose to REST clients"
-  , "db-schemas = \"public\""
-  , ""
-  , "## How to terminate database transactions"
-  , "## Possible values are:"
-  , "## commit (default)"
-  , "##   Transaction is always committed, this can not be overriden"
-  , "## commit-allow-override"
-  , "##   Transaction is committed, but can be overriden with Prefer tx=rollback header"
-  , "## rollback"
-  , "##   Transaction is always rolled back, this can not be overriden"
-  , "## rollback-allow-override"
-  , "##   Transaction is rolled back, but can be overriden with Prefer tx=commit header"
-  , "db-tx-end = \"commit\""
-  , ""
-  , "## The standard connection URI format, documented at"
-  , "## https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING"
-  , "db-uri = \"postgresql://\""
-  , ""
-  , "# jwt-aud = \"your_audience_claim\""
-  , ""
-  , "## Jspath to the role claim key"
-  ,  "jwt-role-claim-key = \".role\""
-  ,  ""
-  ,  "## Choose a secret, JSON Web Key (or set) to enable JWT auth"
-  ,  "## (use \"@filename\" to load from separate file)"
-  ,  "# jwt-secret = \"secret_with_at_least_32_characters\""
-  ,  "jwt-secret-is-base64 = false"
-  , ""
-  , "## Enables JWT Cache and sets its max size, disables caching with 0"
-  , "# jwt-cache-max-entries = 0"
-  , ""
-  , "## Logging level, the admitted values are: crit, error, warn, info and debug."
-  , "log-level = \"error\""
-  , ""
-  , "## Log the SQL query at the current log-level."
-  , "log-query = false"
-  , ""
-  , "## Determine if the OpenAPI output should follow or ignore role privileges or be disabled entirely."
-  , "## Admitted values: follow-privileges, ignore-privileges, disabled"
-  , "openapi-mode = \"follow-privileges\""
-  , ""
-  , "## Base url for the OpenAPI output"
-  , "openapi-server-proxy-uri = \"\""
-  , ""
-  , "## Configurable CORS origins"
-  , "# server-cors-allowed-origins = \"\""
-  , ""
-  , "server-host = \"!4\""
-  , "server-port = 3000"
-  , ""
-  , "## Allow getting the request-response timing information through the `Server-Timing` header"
-  , "server-timing-enabled = false"
-  , ""
-  , "## Unix socket location"
-  , "## if specified it takes precedence over server-port"
-  , "# server-unix-socket = \"/tmp/pgrst.sock\""
-  , ""
-  , "## Unix socket file mode"
-  , "## When none is provided, 660 is applied by default"
-  , "# server-unix-socket-mode = \"660\""
-  ]

src/PostgREST/Config/PgVersion.hs

@@ -3,6 +3,7 @@
 module PostgREST.Config.PgVersion
   ( PgVersion(..)
   , minimumPgVersion
+  , pgVersion130
   , pgVersion140
   , pgVersion150
   , pgVersion170
@@ -25,7 +26,10 @@ instance Ord PgVersion where
 
 -- | Tells the minimum PostgreSQL version required by this version of PostgREST
 minimumPgVersion :: PgVersion
-minimumPgVersion = pgVersion130
+minimumPgVersion = pgVersion121
+
+pgVersion121 :: PgVersion
+pgVersion121 = PgVersion 120001 "12.1" "12.1"
 
 pgVersion130 :: PgVersion
 pgVersion130 = PgVersion 130000 "13.0" "13.0"

src/PostgREST/Error.hs

@@ -14,8 +14,6 @@ module PostgREST.Error
   , PgError(..)
   , Error(..)
   , JwtError (..)
-  , JwtDecodeError(..)
-  , JwtClaimsError(..)
   , errorPayload
   , status
   ) where
@@ -88,7 +86,7 @@ data ApiRequestError
   | QueryParamError QPError
   | RelatedOrderNotToOne Text Text
   | UnacceptableFilter Text
-  | UnacceptableSchema Text [Text]
+  | UnacceptableSchema [Text]
   | UnsupportedMethod ByteString
   | GucHeadersError
   | GucStatusError
@@ -98,7 +96,6 @@ data ApiRequestError
   | MaxAffectedViolationError Integer
   | InvalidResourcePath
   | OpenAPIDisabled
-  | MaxAffectedRpcViolation
   deriving Show
 
 data QPError = QPError Text Text
@@ -141,7 +138,6 @@ instance PgrstError ApiRequestError where
   status MaxAffectedViolationError{} = HTTP.status400
   status InvalidResourcePath         = HTTP.status404
   status OpenAPIDisabled             = HTTP.status404
-  status MaxAffectedRpcViolation     = HTTP.status400
 
   headers _ = mempty
 
@@ -188,7 +184,6 @@ instance ErrorBody ApiRequestError where
   code InvalidResourcePath         = "PGRST125"
   code OpenAPIDisabled             = "PGRST126"
   code NotImplemented{}            = "PGRST127"
-  code MaxAffectedRpcViolation     = "PGRST128"
 
   -- MESSAGE: Text
   message (QueryParamError (QPError msg _)) = msg
@@ -196,7 +191,7 @@ instance ErrorBody ApiRequestError where
   message (InvalidBody errorMessage)   = T.decodeUtf8 errorMessage
   message (InvalidRange _)             = "Requested range not satisfiable"
   message InvalidFilters               = "Filters must include all and only primary key columns with 'eq' operators"
-  message (UnacceptableSchema sch _)   = "Invalid schema: " <> sch
+  message (UnacceptableSchema schemas) = "The schema must be one of the following: " <> T.intercalate ", " schemas
   message (MediaTypeError cts)         = "None of these media types are available: " <> T.intercalate ", " (map T.decodeUtf8 cts)
   message (NotEmbedded resource)       = "'" <> resource <> "' is not an embedded resource in this request"
   message GucHeadersError              = "response.headers guc must be a JSON array composed of objects with a single key and a string value"
@@ -214,7 +209,6 @@ instance ErrorBody ApiRequestError where
   message InvalidResourcePath            = "Invalid path specified in request URL"
   message OpenAPIDisabled                = "Root endpoint metadata is disabled"
   message (NotImplemented _)             = "Feature not implemented"
-  message MaxAffectedRpcViolation        = "Function must return SETOF or TABLE when max-affected preference is used with handling=strict"
 
   -- DETAILS: Maybe JSON.Value
   details (QueryParamError (QPError _ dets)) = Just $ JSON.String dets
@@ -236,7 +230,6 @@ instance ErrorBody ApiRequestError where
   -- HINT: Maybe JSON.Value
   hint (NotEmbedded resource) = Just $ JSON.String $ "Verify that '" <> resource <> "' is included in the 'select' query parameter."
   hint (PGRSTParseError raiseErr) = Just $ JSON.String $ pgrstParseErrorHint raiseErr
-  hint (UnacceptableSchema _ schemas) = Just $ JSON.String $ "Only the following schemas are exposed: "  <> T.intercalate ", " schemas
 
   hint _ = Nothing
 
@@ -650,32 +643,10 @@ data Error
   deriving Show
 
 data JwtError
-  = JwtDecodeErr JwtDecodeError
+  = JwtDecodeError Text
   | JwtSecretMissing
   | JwtTokenRequired
-  | JwtClaimsErr JwtClaimsError
+  | JwtClaimsError Text
-  deriving Show
-
-data JwtDecodeError
-  = EmptyAuthHeader
-  | UnexpectedParts Int
-  | KeyError Text
-  | BadAlgorithm Text
-  | BadCrypto
-  | UnsupportedTokenType
-  | UnreachableDecodeError
-  deriving Show
-
-data JwtClaimsError
-  = JWTExpired
-  | JWTNotYetValid
-  | JWTIssuedAtFuture
-  | JWTNotInAudience
-  | ParsingClaimsFailed
-  | ExpClaimNotNumber
-  | NbfClaimNotNumber
-  | IatClaimNotNumber
-  | AudClaimNotStringOrArray
   deriving Show
 
 instance PgrstError Error where
@@ -721,14 +692,14 @@ instance ErrorBody Error where
   hint (PgErr err)           = hint err
 
 instance PgrstError JwtError where
-  status JwtDecodeErr{}   = HTTP.unauthorized401
+  status JwtDecodeError{} = HTTP.unauthorized401
   status JwtSecretMissing = HTTP.status500
   status JwtTokenRequired = HTTP.unauthorized401
-  status JwtClaimsErr{}   = HTTP.unauthorized401
+  status JwtClaimsError{} = HTTP.unauthorized401
 
-  headers e@(JwtDecodeErr _) = [invalidTokenHeader $ message e]
+  headers (JwtDecodeError m) = [invalidTokenHeader m]
   headers JwtTokenRequired   = [requiredTokenHeader]
-  headers e@(JwtClaimsErr _) = [invalidTokenHeader $ message e]
+  headers (JwtClaimsError m) = [invalidTokenHeader m]
   headers _                  = mempty
 
 instance JSON.ToJSON JwtError where
@@ -736,36 +707,16 @@ instance JSON.ToJSON JwtError where
     (code err) (message err) (details err) (hint err)
 
 instance ErrorBody JwtError where
-  code JwtSecretMissing = "PGRST300"
+  code JwtSecretMissing   = "PGRST300"
-  code (JwtDecodeErr _) = "PGRST301"
+  code (JwtDecodeError _) = "PGRST301"
-  code JwtTokenRequired = "PGRST302"
+  code JwtTokenRequired   = "PGRST302"
-  code (JwtClaimsErr _) = "PGRST303"
+  code (JwtClaimsError _) = "PGRST303"
 
-  message JwtSecretMissing = "Server lacks JWT secret"
+  message JwtSecretMissing     = "Server lacks JWT secret"
-  message (JwtDecodeErr e) = case e of
+  message (JwtDecodeError msg) = msg
-    EmptyAuthHeader        -> "Empty JWT is sent in Authorization header"
+  message JwtTokenRequired     = "Anonymous access is disabled"
-    UnexpectedParts n      -> "Expected 3 parts in JWT; got " <> show n
+  message (JwtClaimsError msg) = msg
-    KeyError _             -> "No suitable key or wrong key type"
-    BadAlgorithm _         -> "Wrong or unsupported encoding algorithm"
-    BadCrypto              -> "JWT cryptographic operation failed"
-    UnsupportedTokenType   -> "Unsupported token type"
-    UnreachableDecodeError -> "JWT couldn't be decoded"
-  message JwtTokenRequired = "Anonymous access is disabled"
-  message (JwtClaimsErr e) = case e of
-    JWTExpired               -> "JWT expired"
-    JWTNotYetValid           -> "JWT not yet valid"
-    JWTIssuedAtFuture        -> "JWT issued at future"
-    JWTNotInAudience         -> "JWT not in audience"
-    ParsingClaimsFailed      -> "Parsing claims failed"
-    ExpClaimNotNumber        -> "The JWT 'exp' claim must be a number"
-    NbfClaimNotNumber        -> "The JWT 'nbf' claim must be a number"
-    IatClaimNotNumber        -> "The JWT 'iat' claim must be a number"
-    AudClaimNotStringOrArray -> "The JWT 'aud' claim must be a string or an array of strings"
 
-  details (JwtDecodeErr jde) = case jde of
-    KeyError dets     -> Just $ JSON.String dets
-    BadAlgorithm dets -> Just $ JSON.String dets
-    _                 -> Nothing
   details _ = Nothing
 
   hint _    = Nothing

src/PostgREST/Logger.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE RecordWildCards #-}
 {-|
 Module      : PostgREST.Logger
 Description : Logging based on the Observation.hs module. Access logs get sent to stdout and server diagnostic get sent to stderr.
@@ -11,16 +10,10 @@ module PostgREST.Logger
   , LoggerState
   ) where
 
-import           Control.AutoUpdate                (defaultUpdateSettings,
+import           Control.AutoUpdate    (defaultUpdateSettings,
-                                                    mkAutoUpdate,
+                                        mkAutoUpdate, updateAction)
-                                                    updateAction)
 import           Control.Debounce
-import qualified Data.ByteString.Char8             as BS
+import qualified Data.ByteString.Char8 as BS
-import qualified Data.Text.Encoding                as T
-import qualified Hasql.Decoders                    as HD
-import qualified Hasql.DynamicStatements.Snippet   as SQL hiding (sql)
-import qualified Hasql.DynamicStatements.Statement as SQL
-import qualified Hasql.Statement                   as SQL
 
 import Data.Time (ZonedTime, defaultTimeLocale, formatTime,
                   getZonedTime)
@@ -33,7 +26,6 @@ import System.IO.Unsafe          (unsafePerformIO)
 
 import PostgREST.Config      (LogLevel (..))
 import PostgREST.Observation
-import PostgREST.Query       (MainQuery (..))
 
 import Protolude
 
@@ -95,27 +87,19 @@ observationLogger loggerState logLevel obs = case obs of
   o@(QueryErrorCodeHighObs _) -> do
     when (logLevel >= LogError) $ do
       logWithZTime loggerState $ observationMessage o
-  o@SchemaCacheEmptyObs ->
-    when (logLevel >= LogError) $ do
-    logWithZTime loggerState $ observationMessage o
   o@(HasqlPoolObs _) -> do
     when (logLevel >= LogDebug) $ do
       logWithZTime loggerState $ observationMessage o
-  QueryObs gq status -> do
+  o@(DBQuery sql status) -> do
-    when (shouldLogResponse logLevel status) $
+    -- Does not log SQL when it's empty (for OPTIONS requests or for the default OpenAPI output)
-      logMainQ loggerState gq
+    when (sql /= mempty && shouldLogResponse logLevel status) $ do
+      logWithZTime loggerState $ observationMessage o
   o@PoolRequest ->
     when (logLevel >= LogDebug) $ do
       logWithZTime loggerState $ observationMessage o
   o@PoolRequestFullfilled ->
     when (logLevel >= LogDebug) $ do
       logWithZTime loggerState $ observationMessage o
-  o@JwtCacheEviction ->
-    when (logLevel >= LogDebug) $ do
-      logWithZTime loggerState $ observationMessage o
-  o@(JwtCacheLookup _) ->
-    when (logLevel >= LogDebug) $ do
-      logWithZTime loggerState $ observationMessage o
   o ->
     logWithZTime loggerState $ observationMessage o
 
@@ -123,20 +107,3 @@ logWithZTime :: LoggerState -> Text -> IO ()
 logWithZTime loggerState txt = do
   zTime <- stateGetZTime loggerState
   hPutStrLn stderr $ toS (formatTime defaultTimeLocale "%d/%b/%Y:%T %z: " zTime) <> txt
-
-logMainQ :: LoggerState -> MainQuery -> IO ()
-logMainQ loggerState MainQuery{mqOpenAPI=(x, y, z),..} =
-  let snipts  = renderSnippet <$> [mqTxVars, fromMaybe mempty mqPreReq, mqMain, x, y, z, fromMaybe mempty mqExplain]
-      -- Does not log SQL when it's empty (happens on OPTIONS requests and when the openapi queries are not generated)
-      logQ q = when (q /= mempty) $ logWithZTime loggerState $ showOnSingleLine '\n' $ T.decodeUtf8 q in
-  mapM_ logQ snipts
-
--- TODO: maybe patch upstream hasql-dynamic-statements so we have a less hackish way to convert
--- the SQL.Snippet or maybe don't use hasql-dynamic-statements and resort to plain strings for the queries and use regular hasql
-renderSnippet :: SQL.Snippet -> ByteString
-renderSnippet snippet =
-  let SQL.Statement sql _ _ _ = SQL.dynamicallyParameterized snippet decoder prepared
-      decoder = HD.noResult -- unused
-      prepared = False  -- unused
-  in
-    sql

src/PostgREST/MainTx.hs

@@ -1,279 +0,0 @@
-{-# LANGUAGE NamedFieldPuns  #-}
-{-# LANGUAGE RecordWildCards #-}
-{-|
-Module      : PostgREST.MainTx
-Description : PostgREST transaction executor
-
-This module parametrizes, prepares, executes SQL queries and decodes their results.
--}
-module PostgREST.MainTx
-  ( MainTx (..)
-  , DbResult (..)
-  , ResultSet (..)
-  , mainTx
-  ) where
-
-import           Control.Lens                      ((^?))
-import           Control.Monad.Extra               (whenJust)
-import qualified Data.Aeson.Lens                   as L
-import qualified Data.ByteString                   as BS hiding
-                                                         (break)
-import qualified Data.ByteString.Char8             as BS
-import qualified Data.HashMap.Strict               as HM
-import qualified Data.Set                          as S
-import qualified Hasql.Decoders                    as HD
-import qualified Hasql.DynamicStatements.Statement as SQL
-import qualified Hasql.Session                     as SQL (Session)
-import qualified Hasql.Transaction                 as SQL
-import qualified Hasql.Transaction.Sessions        as SQL
-
-import qualified PostgREST.Error       as Error
-import qualified PostgREST.SchemaCache as SchemaCache
-
-
-import PostgREST.ApiRequest              (ApiRequest (..))
-import PostgREST.ApiRequest.Preferences  (PreferCount (..),
-                                          PreferHandling (..),
-                                          PreferMaxAffected (..),
-                                          PreferTransaction (..),
-                                          Preferences (..))
-import PostgREST.ApiRequest.Types        (Mutation (..))
-import PostgREST.Auth.Types              (AuthResult (..))
-import PostgREST.Config                  (AppConfig (..),
-                                          OpenAPIMode (..))
-import PostgREST.Error                   (Error)
-import PostgREST.MediaType               (MediaType (..))
-import PostgREST.Plan                    (ActionPlan (..),
-                                          CrudPlan (..),
-                                          DbActionPlan (..),
-                                          InfoPlan (..),
-                                          InspectPlan (..))
-import PostgREST.Query                   (MainQuery (..))
-import PostgREST.SchemaCache             (SchemaCache (..))
-import PostgREST.SchemaCache.Identifiers (QualifiedIdentifier (..))
-import PostgREST.SchemaCache.Routine     (Routine (..), RoutineMap)
-import PostgREST.SchemaCache.Table       (TablesMap)
-
-import Protolude hiding (Handler)
-
-type DbHandler = ExceptT Error SQL.Transaction
-
-data MainTx
-  = DbTx {
-      dqIsoLevel    :: SQL.IsolationLevel
-    , dqTxMode      :: SQL.Mode
-    , dqDbHandler   :: DbHandler DbResult
-    , dqTransaction :: SQL.IsolationLevel -> SQL.Mode -> SQL.Transaction (Either Error DbResult) -> SQL.Session (Either Error DbResult)
-    }
-  | NoDbTx DbResult
-
-data DbResult
-  = DbCrudResult  CrudPlan ResultSet
-  | DbPlanResult  MediaType BS.ByteString
-  | MaybeDbResult InspectPlan  (Maybe (TablesMap, RoutineMap, Maybe Text))
-  | NoDbResult    InfoPlan
-
--- | Standard result set format used for the mqMain query
-data ResultSet
-  = RSStandard
-  { rsTableTotal :: Maybe Int64
-  -- ^ count of all the table rows
-  , rsQueryTotal :: Int64
-  -- ^ count of the query rows
-  , rsLocation   :: [(BS.ByteString, BS.ByteString)]
-  -- ^ The Location header(only used for inserts) is represented as a list of strings containing
-  -- variable bindings like @"k1=eq.42"@, or the empty list if there is no location header.
-  , rsBody       :: BS.ByteString
-  -- ^ the aggregated body of the query
-  , rsGucHeaders :: Maybe BS.ByteString
-  -- ^ the HTTP headers to be added to the response
-  , rsGucStatus  :: Maybe Text
-  -- ^ the HTTP status to be added to the response
-  , rsInserted   :: Maybe Int64
-  -- ^ the number of rows inserted (Only used for upserts)
-  }
-
-mainTx :: MainQuery -> AppConfig -> AuthResult -> ApiRequest -> ActionPlan -> SchemaCache -> MainTx
-mainTx _ _ _ _ (NoDb x) _ = NoDbTx $ NoDbResult x
-mainTx genQ@MainQuery{..} conf@AppConfig{..} AuthResult{..} apiReq (Db plan) sCache =
-  DbTx isoLvl txMode dbHandler transaction
-  where
-    transaction = if configDbPreparedStatements then SQL.transaction else SQL.unpreparedTransaction
-    isoLvl = planIsoLvl conf authRole plan
-    txMode = planTxMode plan
-    dbHandler = do
-      lift $ SQL.statement mempty $ SQL.dynamicallyParameterized mqTxVars
-          HD.noResult configDbPreparedStatements
-      lift $ whenJust mqPreReq $ \q ->
-        SQL.statement mempty $ SQL.dynamicallyParameterized q
-          HD.noResult configDbPreparedStatements
-      actionResult genQ plan conf apiReq sCache
-
-planTxMode :: DbActionPlan -> SQL.Mode
-planTxMode (DbCrud _ x) = pTxMode x
-planTxMode (MayUseDb x) = ipTxmode x
-
-planIsoLvl :: AppConfig -> ByteString -> DbActionPlan -> SQL.IsolationLevel
-planIsoLvl AppConfig{configRoleIsoLvl} role actPlan = case actPlan of
-  DbCrud _ CallReadPlan{crProc} -> fromMaybe roleIsoLvl $ pdIsoLvl crProc
-  _                           -> roleIsoLvl
-  where
-    roleIsoLvl = HM.findWithDefault SQL.ReadCommitted role configRoleIsoLvl
-
-actionResult :: MainQuery -> DbActionPlan -> AppConfig -> ApiRequest -> SchemaCache -> ExceptT Error SQL.Transaction DbResult
-actionResult MainQuery{..} (DbCrud True plan) conf@AppConfig{..} apiReq _ = do
-  explRes <- lift $ SQL.statement mempty $ SQL.dynamicallyParameterized mqMain planRow configDbPreparedStatements
-  optionalRollback conf apiReq
-  pure $ DbPlanResult (pMedia plan) explRes
-
-actionResult MainQuery{..} (DbCrud _ plan@WrappedReadPlan{..}) conf@AppConfig{..} apiReq@ApiRequest{iPreferences=Preferences{..}} _ = do
-  resultSet@RSStandard{rsTableTotal=tableTotal} <- lift $ SQL.statement mempty $ dynStmt (HD.singleRow $ standardRow True)
-  failNotSingular pMedia resultSet
-  optionalRollback conf apiReq
-  explainTotal <- lift . fmap join $ traverse (\snip ->
-                    SQL.statement mempty $ SQL.dynamicallyParameterized snip decodeExplain configDbPreparedStatements)
-                    mqExplain
-
-  pure $ DbCrudResult plan
-    resultSet{rsTableTotal=case preferCount of
-      Just PlannedCount   -> explainTotal
-      Just EstimatedCount -> if tableTotal > (fromIntegral <$> configDbMaxRows)
-        then max <$> tableTotal <*> explainTotal
-        else tableTotal
-      _                   -> tableTotal}
-  where
-    dynStmt decod = SQL.dynamicallyParameterized mqMain decod configDbPreparedStatements
-
-    decodeExplain :: HD.Result (Maybe Int64)
-    decodeExplain =
-      let row = HD.singleRow $ column HD.bytea in
-      (^? L.nth 0 . L.key "Plan" .  L.key "Plan Rows" . L._Integral) <$> row
-
-actionResult MainQuery{..} (DbCrud _ plan@MutateReadPlan{..}) conf@AppConfig{..} apiReq@ApiRequest{iPreferences=Preferences{..}} _ = do
-  resultSet <- lift $ SQL.statement mempty $ dynStmt decodeRow
-  failMutation resultSet
-  optionalRollback conf apiReq
-  pure $ DbCrudResult plan resultSet
-  where
-    dynStmt decod = SQL.dynamicallyParameterized mqMain decod configDbPreparedStatements
-    failMutation resultSet = case mrMutation of
-      MutationCreate -> do
-        failNotSingular pMedia resultSet
-      MutationUpdate -> do
-        failNotSingular pMedia resultSet
-        failExceedsMaxAffectedPref (preferMaxAffected,preferHandling) resultSet
-      MutationSingleUpsert -> do
-        failPut resultSet
-      MutationDelete -> do
-        failNotSingular pMedia resultSet
-        failExceedsMaxAffectedPref (preferMaxAffected,preferHandling) resultSet
-    decodeRow = fromMaybe (RSStandard Nothing 0 mempty mempty Nothing Nothing Nothing) <$> HD.rowMaybe (standardRow False)
-
-actionResult MainQuery{..} (DbCrud _ plan@CallReadPlan{..}) conf@AppConfig{..} apiReq@ApiRequest{iPreferences=Preferences{..}} _ = do
-  resultSet <- lift $ SQL.statement mempty $ dynStmt decodeRow
-  optionalRollback conf apiReq
-  failNotSingular pMedia resultSet
-  failExceedsMaxAffectedPref (preferMaxAffected,preferHandling) resultSet
-  pure $ DbCrudResult plan resultSet
-  where
-    dynStmt decod = SQL.dynamicallyParameterized mqMain decod configDbPreparedStatements
-    decodeRow = fromMaybe (RSStandard (Just 0) 0 mempty mempty Nothing Nothing Nothing) <$> HD.rowMaybe (standardRow True)
-
-actionResult MainQuery{mqOpenAPI=(tblsQ, funcsQ, schQ)} (MayUseDb plan@InspectPlan{ipSchema=tSchema}) AppConfig{..} _ sCache =
-  mainActionQuery
-  where
-    mainActionQuery = lift $
-      case configOpenApiMode of
-        OAFollowPriv -> do
-          tableAccess <- SQL.statement mempty $ SQL.dynamicallyParameterized tblsQ  decodeAccessibleIdentifiers configDbPreparedStatements
-          accFuncs <-  SQL.statement mempty $ SQL.dynamicallyParameterized   funcsQ   SchemaCache.decodeFuncs configDbPreparedStatements
-          schDesc <- SQL.statement mempty $ SQL.dynamicallyParameterized     schQ decodeSchemaDesc configDbPreparedStatements
-          let tbls = HM.filterWithKey (\qi _ -> S.member qi tableAccess) $ SchemaCache.dbTables sCache
-
-          pure $ MaybeDbResult plan (Just (tbls, accFuncs, schDesc))
-        OAIgnorePriv -> do
-          schDesc <- SQL.statement mempty (SQL.dynamicallyParameterized schQ decodeSchemaDesc configDbPreparedStatements)
-
-          let tbls = HM.filterWithKey (\(QualifiedIdentifier sch _) _ ->  sch == tSchema) (SchemaCache.dbTables sCache)
-              routs = HM.filterWithKey (\(QualifiedIdentifier sch _) _ ->  sch == tSchema) (SchemaCache.dbRoutines sCache)
-
-          pure $ MaybeDbResult plan (Just (tbls, routs, schDesc))
-        OADisabled ->
-          pure $ MaybeDbResult plan Nothing
-
-    decodeSchemaDesc :: HD.Result (Maybe Text)
-    decodeSchemaDesc = join <$> HD.rowMaybe (nullableColumn HD.text)
-
-    decodeAccessibleIdentifiers :: HD.Result (S.Set QualifiedIdentifier)
-    decodeAccessibleIdentifiers =
-      let
-        row = QualifiedIdentifier
-          <$> column HD.text
-          <*> column HD.text
-      in
-      S.fromList <$> HD.rowList row
-
--- Makes sure the querystring pk matches the payload pk
--- e.g. PUT /items?id=eq.1 { "id" : 1, .. } is accepted,
--- PUT /items?id=eq.14 { "id" : 2, .. } is rejected.
--- If this condition is not satisfied then nothing is inserted,
--- check the WHERE for INSERT in QueryBuilder.hs to see how it's done
-failPut :: ResultSet -> DbHandler ()
-failPut RSStandard{rsQueryTotal=queryTotal} =
-  when (queryTotal /= 1) $ do
-    lift SQL.condemn
-    throwError $ Error.ApiRequestError Error.PutMatchingPkError
-
--- |
--- Fail a response if a single JSON object was requested and not exactly one
--- was found.
-failNotSingular :: MediaType -> ResultSet -> DbHandler ()
-failNotSingular mediaType RSStandard{rsQueryTotal=queryTotal} =
-  when (elem mediaType [MTVndSingularJSON True, MTVndSingularJSON False] && queryTotal /= 1) $ do
-    lift SQL.condemn
-    throwError $ Error.ApiRequestError . Error.SingularityError $ toInteger queryTotal
-
-failExceedsMaxAffectedPref :: (Maybe PreferMaxAffected, Maybe PreferHandling) -> ResultSet -> DbHandler ()
-failExceedsMaxAffectedPref (Nothing,_) _ = pure ()
-failExceedsMaxAffectedPref (Just (PreferMaxAffected n), handling) RSStandard{rsQueryTotal=queryTotal} = when ((queryTotal > n) && (handling == Just Strict)) $ do
-  lift SQL.condemn
-  throwError $ Error.ApiRequestError . Error.MaxAffectedViolationError $ toInteger queryTotal
-
--- | Set a transaction to roll back if requested
-optionalRollback :: AppConfig -> ApiRequest -> DbHandler ()
-optionalRollback AppConfig{..} ApiRequest{iPreferences=Preferences{..}} = do
-  lift $ when (shouldRollback || (configDbTxRollbackAll && not shouldCommit)) $ do
-    SQL.sql "SET CONSTRAINTS ALL IMMEDIATE"
-    SQL.condemn
-  where
-    shouldCommit =
-      preferTransaction == Just Commit
-    shouldRollback =
-      preferTransaction == Just Rollback
-
--- | We use rowList because when doing EXPLAIN (FORMAT TEXT), the result comes as many rows. FORMAT JSON comes as one.
-planRow :: HD.Result BS.ByteString
-planRow = BS.unlines <$> HD.rowList (column HD.bytea)
-
-column :: HD.Value a -> HD.Row a
-column = HD.column . HD.nonNullable
-
-nullableColumn :: HD.Value a -> HD.Row (Maybe a)
-nullableColumn = HD.column . HD.nullable
-
-arrayColumn :: HD.Value a -> HD.Row [a]
-arrayColumn = column . HD.listArray . HD.nonNullable
-
-standardRow :: Bool -> HD.Row ResultSet
-standardRow noLocation =
-  RSStandard <$> nullableColumn HD.int8 <*> column HD.int8
-             <*> (if noLocation then pure mempty else fmap splitKeyValue <$> arrayColumn HD.bytea)
-             <*> (fromMaybe mempty <$> nullableColumn HD.bytea)
-             <*> nullableColumn HD.bytea
-             <*> nullableColumn HD.text
-             <*> nullableColumn HD.int8
-  where
-    splitKeyValue :: ByteString -> (ByteString, ByteString)
-    splitKeyValue kv =
-      let (k, v) = BS.break (== '=') kv in
-      (k, BS.tail v)

src/PostgREST/Metrics.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE RecordWildCards #-}
 {-|
 Module      : PostgREST.Logger
 Description : Metrics based on the Observation module. See Observation.hs.
@@ -20,36 +19,22 @@ import PostgREST.Observation
 import Protolude
 
 data MetricsState =
-  MetricsState {
+  MetricsState Counter Gauge Gauge Gauge (Vector Label1 Counter) Gauge
-    poolTimeouts         :: Counter,
-    poolAvailable        :: Gauge,
-    poolWaiting          :: Gauge,
-    poolMaxSize          :: Gauge,
-    schemaCacheLoads     :: Vector Label1 Counter,
-    schemaCacheQueryTime :: Gauge,
-    jwtCacheRequests     :: Counter,
-    jwtCacheHits         :: Counter,
-    jwtCacheEvictions    :: Counter
-  }
 
 init :: Int -> IO MetricsState
 init configDbPoolSize = do
-  metricState <- MetricsState <$>
+  poolTimeouts <- register $ counter (Info "pgrst_db_pool_timeouts_total" "The total number of pool connection timeouts")
-    register (counter (Info "pgrst_db_pool_timeouts_total" "The total number of pool connection timeouts")) <*>
+  poolAvailable <- register $ gauge (Info "pgrst_db_pool_available" "Available connections in the pool")
-    register (gauge (Info "pgrst_db_pool_available" "Available connections in the pool")) <*>
+  poolWaiting <- register $ gauge (Info "pgrst_db_pool_waiting" "Requests waiting to acquire a pool connection")
-    register (gauge (Info "pgrst_db_pool_waiting" "Requests waiting to acquire a pool connection")) <*>
+  poolMaxSize <- register $ gauge (Info "pgrst_db_pool_max" "Max pool connections")
-    register (gauge (Info "pgrst_db_pool_max" "Max pool connections")) <*>
+  schemaCacheLoads <- register $ vector "status" $ counter (Info "pgrst_schema_cache_loads_total" "The total number of times the schema cache was loaded")
-    register (vector "status" $ counter (Info "pgrst_schema_cache_loads_total" "The total number of times the schema cache was loaded")) <*>
+  schemaCacheQueryTime <- register $ gauge (Info "pgrst_schema_cache_query_time_seconds" "The query time in seconds of the last schema cache load")
-    register (gauge (Info "pgrst_schema_cache_query_time_seconds" "The query time in seconds of the last schema cache load")) <*>
+  setGauge poolMaxSize (fromIntegral configDbPoolSize)
-    register (counter (Info "pgrst_jwt_cache_requests_total" "The total number of JWT cache lookups")) <*>
+  pure $ MetricsState poolTimeouts poolAvailable poolWaiting poolMaxSize schemaCacheLoads schemaCacheQueryTime
-    register (counter (Info "pgrst_jwt_cache_hits_total" "The total number of JWT cache hits")) <*>
-    register (counter (Info "pgrst_jwt_cache_evictions_total" "The total number of JWT cache evictions"))
-  setGauge (poolMaxSize metricState) (fromIntegral configDbPoolSize)
-  pure metricState
 
 -- Only some observations are used as metrics
 observationMetrics :: MetricsState -> ObservationHandler
-observationMetrics MetricsState{..} obs = case obs of
+observationMetrics (MetricsState poolTimeouts poolAvailable poolWaiting _ schemaCacheLoads schemaCacheQueryTime) obs = case obs of
   (PoolAcqTimeoutObs _) -> do
     incCounter poolTimeouts
   (HasqlPoolObs (SQL.ConnectionObservation _ status)) -> case status of
@@ -69,9 +54,6 @@ observationMetrics MetricsState{..} obs = case obs of
     setGauge schemaCacheQueryTime resTime
   SchemaCacheErrorObs{} -> do
     withLabel schemaCacheLoads "FAIL" incCounter
-  JwtCacheLookup True -> incCounter jwtCacheRequests *> incCounter jwtCacheHits
-  JwtCacheLookup False -> incCounter jwtCacheRequests
-  JwtCacheEviction -> incCounter jwtCacheEvictions
   _ ->
     pure ()
 

src/PostgREST/Network.hs

@@ -1,61 +1,17 @@
 module PostgREST.Network
-  ( resolveSocketToAddress
+  ( resolveHost
-  , escapeHostName
-  , isSpecialHostName
   ) where
 
+import           Data.IP        (fromHostAddress, fromHostAddress6)
 import           Data.String    (IsString (..))
 import qualified Network.Socket as NS
 
 import Protolude
 
--- | Resolves the socket to an address depending on the socket type. The Show
+resolveHost :: NS.Socket -> IO (Maybe Text)
---   instance of the socket types automatically resolves it to the correct
+resolveHost sock = do
---   address. Example resolution:
--- -----------------------------------------------------
--- | IPv4         | IPv6             | Unix            |
--- -----------------------------------------------------
--- | 127.0.0.1:80 | [2001:db8::1]:80 | /tmp/pgrst.sock |
--- -----------------------------------------------------
-resolveSocketToAddress :: NS.Socket -> IO Text
-resolveSocketToAddress sock = do
   sn <- NS.getSocketName sock
-  return $ showSocketAddr sn
+  case sn of
-
+    NS.SockAddrInet _ hostAddr ->  pure $ Just $ fromString $ show $ fromHostAddress hostAddr
--- |
+    NS.SockAddrInet6 _ _ hostAddr6 _ -> pure $ Just $ fromString $ show $ fromHostAddress6 hostAddr6
--- >>> let addr_ipv4 = NS.SockAddrInet 80 (NS.tupleToHostAddress (127,0,0,1))
+    _ -> pure Nothing
--- >>> let addr_ipv6 = NS.SockAddrInet6 80 0 (0,0,0,1) 0
--- >>> let addr_unix = NS.SockAddrUnix "/tmp/pgrst.sock"
---
--- >>> showSocketAddr addr_ipv4
--- "127.0.0.1:80"
-
--- >>> showSocketAddr addr_ipv6
--- "[::1]:80"
---
--- >>> showSocketAddr addr_unix
--- "/tmp/pgrst.sock"
-showSocketAddr :: NS.SockAddr -> Text
-showSocketAddr = fromString . show
-
--- | When printing special addresses like !4 or *6, we use the following mapping.
---   These special addresses come from:
---     https://hackage.haskell.org/package/streaming-commons-0.2.3.0/docs/\
---     Data-Streaming-Network.html#t:HostPreference
--- TODO: "!6" should not be printed as "0.0.0.0" address.
-escapeHostName :: Text -> Text
-escapeHostName "*"  = "0.0.0.0"
-escapeHostName "*4" = "0.0.0.0"
-escapeHostName "!4" = "0.0.0.0"
-escapeHostName "*6" = "0.0.0.0"
-escapeHostName "!6" = "0.0.0.0"
-escapeHostName h    = h
-
--- | Check if a hostname is special
-isSpecialHostName :: Text -> Bool
-isSpecialHostName "*"  = True
-isSpecialHostName "*4" = True
-isSpecialHostName "!4" = True
-isSpecialHostName "*6" = True
-isSpecialHostName "!6" = True
-isSpecialHostName _    = False

src/PostgREST/Observation.hs

@@ -11,7 +11,6 @@ module PostgREST.Observation
   , ObsFatalError(..)
   , observationMessage
   , ObservationHandler
-  , showOnSingleLine
   ) where
 
 import qualified Data.ByteString.Lazy       as LBS
@@ -22,22 +21,23 @@ import qualified Hasql.Connection           as SQL
 import qualified Hasql.Pool                 as SQL
 import qualified Hasql.Pool.Observation     as SQL
 import           Network.HTTP.Types.Status  (Status)
+import qualified Network.Socket             as NS
 import           Numeric                    (showFFloat)
 import           PostgREST.Config.PgVersion
 import qualified PostgREST.Error            as Error
-import           PostgREST.Query            (MainQuery)
 
-import Protolude hiding (toList)
+import Protolude         hiding (toList)
+import Protolude.Partial (fromJust)
 
 data Observation
-  = AdminStartObs Text
+  = AdminStartObs (Maybe Text) (Maybe Int)
   | AppStartObs ByteString
-  | AppServerAddressObs Text
+  | AppServerPortObs Text NS.PortNumber
+  | AppServerUnixObs FilePath
   | ExitUnsupportedPgVersion PgVersion PgVersion
   | ExitDBNoRecoveryObs
   | ExitDBFatalError ObsFatalError SQL.UsageError
   | DBConnectedObs Text
-  | SchemaCacheEmptyObs
   | SchemaCacheErrorObs (NonEmpty Text) [Text] SQL.UsageError
   | SchemaCacheQueriedObs Double
   | SchemaCacheSummaryObs Text
@@ -48,7 +48,7 @@ data Observation
   | DBListenRetry Int
   | DBListenerGotSCacheMsg ByteString
   | DBListenerGotConfigMsg ByteString
-  | QueryObs MainQuery Status
+  | DBQuery ByteString Status
   | ConfigReadErrorObs SQL.UsageError
   | ConfigInvalidObs Text
   | ConfigSucceededObs
@@ -60,8 +60,6 @@ data Observation
   | HasqlPoolObs SQL.Observation
   | PoolRequest
   | PoolRequestFullfilled
-  | JwtCacheLookup Bool
-  | JwtCacheEviction
 
 data ObsFatalError = ServerAuthError | ServerPgrstBug | ServerError42P05 | ServerError08P01
 
@@ -69,12 +67,14 @@ type ObservationHandler = Observation -> IO ()
 
 observationMessage :: Observation -> Text
 observationMessage = \case
-  AdminStartObs address ->
+  AdminStartObs host port ->
-    "Admin server listening on " <> address
+    "Admin server listening on " <> fromJust host <> ":" <> show (fromIntegral (fromJust port) :: Integer)
   AppStartObs ver ->
     "Starting PostgREST " <> T.decodeUtf8 ver <> "..."
-  AppServerAddressObs address ->
+  AppServerPortObs host port ->
-    "API server listening on " <> address
+    "API server listening on " <> host <> ":" <> show port
+  AppServerUnixObs sock ->
+    "API server listening on unix socket " <> show sock
   DBConnectedObs ver ->
     "Successfully connected to " <> ver
   ExitUnsupportedPgVersion pgVer minPgVer ->
@@ -89,8 +89,6 @@ observationMessage = \case
     "If you are using connection poolers in transaction mode, try setting db-prepared-statements to false. " <> jsonMessage usageErr
   ExitDBFatalError ServerError08P01 usageErr ->
     "Connection poolers in statement mode are not supported." <> jsonMessage usageErr
-  SchemaCacheEmptyObs ->
-    T.decodeUtf8 . LBS.toStrict . Error.errorPayload $ Error.NoSchemaCacheError
   SchemaCacheErrorObs dbSchemas extraPaths usageErr ->
     "Failed to load the schema cache using "
       <> "db-schemas=" <> T.intercalate "," (toList dbSchemas)
@@ -110,16 +108,19 @@ observationMessage = \case
   DBListenStart channel -> do
     "Listening for database notifications on the " <> show channel <> " channel"
   DBListenFail channel listenErr ->
-    "Failed listening for database notifications on the " <> show channel <> " channel. " <>
+    "Failed listening for database notifications on the " <> show channel <> " channel. " <> (
-      either showListenerConnError showListenerException listenErr
+      case listenErr of
+        Left err  -> show err
+        Right err -> showListenerError err
+    )
   DBListenRetry delay ->
     "Retrying listening for database notifications in " <> (show delay::Text) <> " seconds..."
   DBListenerGotSCacheMsg channel ->
     "Received a schema cache reload message on the " <> show channel <> " channel"
   DBListenerGotConfigMsg channel ->
     "Received a config reload message on the " <> show channel <> " channel"
-  QueryObs{} ->
+  DBQuery sql _ ->
-    mempty -- TODO pending refactor: The logic for printing the query cannot be done here. Join the observationMessage function into observationLogger to avoid this mempty.
+    T.decodeUtf8 sql
   ConfigReadErrorObs usageErr ->
     "Failed to query database settings for the config parameters." <> jsonMessage usageErr
   QueryRoleSettingsErrorObs usageErr ->
@@ -150,24 +151,14 @@ observationMessage = \case
     "Trying to borrow a connection from pool"
   PoolRequestFullfilled ->
     "Borrowed a connection from the pool"
-  JwtCacheLookup _ ->
-    "Looked up a JWT in JWT cache"
-  JwtCacheEviction ->
-    "Evicted entry from JWT cache"
   where
     showMillis :: Double -> Text
-    showMillis x = toS $ showFFloat (Just 1) x ""
+    showMillis x = toS $ showFFloat (Just 1) (x * 1000) ""
 
     jsonMessage err = T.decodeUtf8 . LBS.toStrict . Error.errorPayload $ Error.PgError False err
 
-
+    showListenerError :: Either SomeException () -> Text
-    showListenerConnError :: SQL.ConnectionError -> Text
+    showListenerError (Right _) = "Failed getting notifications" -- should not happen as the listener will never finish (hasql-notifications uses `forever` internally) with a Right result
-    showListenerConnError = maybe "Connection error" (showOnSingleLine '\t' . T.decodeUtf8)
+    showListenerError (Left e)  =
-
+      let showOnSingleLine txt = T.intercalate " " $ T.filter (/= '\t') <$> T.lines txt in -- the errors from hasql-notifications come intercalated with "\t\n"
-    showListenerException :: Either SomeException () -> Text
+      showOnSingleLine $ show e
-    showListenerException (Right _) = "Failed getting notifications" -- should not happen as the listener will never finish (hasql-notifications uses `forever` internally) with a Right result
-    showListenerException (Left e)  = showOnSingleLine '\t' $ show e
-
-
-showOnSingleLine :: Char -> Text -> Text
-showOnSingleLine split txt = T.intercalate " " $ T.filter (/= split) <$> T.lines txt -- the errors from hasql-notifications come intercalated with "\t\n"

src/PostgREST/Plan.hs

@@ -4,8 +4,7 @@ Description : PostgREST Request Planner
 
 This module is in charge of building an intermediate
 representation between the HTTP request and the
-final response, which may or not result in SQL execution
+final resulting SQL query.
-(computing OpenAPI or OPTIONS requests don't require database interaction)
 
 A query tree is built in case of resource embedding. By inferring the
 relationship between tables, join conditions are added for every embedded
@@ -23,6 +22,7 @@ module PostgREST.Plan
   , InspectPlan(..)
   , InfoPlan(..)
   , CrudPlan(..)
+  , CallReadPlan(..)
   ) where
 
 import qualified Data.HashMap.Strict           as HM
@@ -37,7 +37,12 @@ import Data.List               (delete, lookup)
 import Data.Maybe              (fromJust)
 import Data.Tree               (Tree (..))
 
-import PostgREST.ApiRequest                  (ApiRequest (..))
+import PostgREST.ApiRequest                  (Action (..),
+                                              ApiRequest (..),
+                                              DbAction (..),
+                                              InvokeMethod (..),
+                                              Mutation (..),
+                                              Payload (..))
 import PostgREST.Config                      (AppConfig (..))
 import PostgREST.Error                       (ApiRequestError (..),
                                               Error (..),
@@ -65,9 +70,9 @@ import PostgREST.SchemaCache.Routine         (MediaHandler (..),
                                               Routine (..),
                                               RoutineMap,
                                               RoutineParam (..),
+                                              funcReturnsCompositeAlias,
                                               funcReturnsScalar,
-                                              funcReturnsSetOfScalar,
+                                              funcReturnsSetOfScalar)
-                                              funcReturnsSingle)
 import PostgREST.SchemaCache.Table           (Column (..), Table (..),
                                               TablesMap,
                                               tableColumnsList,
@@ -90,13 +95,12 @@ import Protolude hiding (from)
 -- Setup for doctests
 -- >>> import Data.Ranged.Ranges (fullRange)
 
--- Plan for reading or writing to the db
 data CrudPlan
   = WrappedReadPlan
   { wrReadPlan :: ReadPlanTree
   , pTxMode    :: SQL.Mode
   , wrHandler  :: MediaHandler
-  , pMedia     :: MediaType
+  , wrMedia    :: MediaType
   , wrHdrsOnly :: Bool
   , crudQi     :: QualifiedIdentifier
   }
@@ -105,22 +109,22 @@ data CrudPlan
   , mrMutatePlan :: MutatePlan
   , pTxMode      :: SQL.Mode
   , mrHandler    :: MediaHandler
-  , pMedia       :: MediaType
+  , mrMedia      :: MediaType
   , mrMutation   :: Mutation
   , crudQi       :: QualifiedIdentifier
   }
-  | CallReadPlan {
+
+data CallReadPlan = CallReadPlan {
     crReadPlan :: ReadPlanTree
   , crCallPlan :: CallPlan
-  , pTxMode    :: SQL.Mode
+  , crTxMode   :: SQL.Mode
   , crProc     :: Routine
   , crHandler  :: MediaHandler
-  , pMedia     :: MediaType
+  , crMedia    :: MediaType
   , crInvMthd  :: InvokeMethod
   , crQi       :: QualifiedIdentifier
   }
 
--- Plan for reading db object metadadta
 data InspectPlan = InspectPlan {
     ipMedia    :: MediaType
   , ipTxmode   :: SQL.Mode
@@ -128,47 +132,27 @@ data InspectPlan = InspectPlan {
   , ipSchema   :: Schema
   }
 
--- A Plan may use the the database or not
+data DbActionPlan = DbCrud CrudPlan | DbCall CallReadPlan | MaybeDb InspectPlan
-data ActionPlan
+data InfoPlan     = RelInfoPlan QualifiedIdentifier | RoutineInfoPlan CallReadPlan | SchemaInfoPlan
-  = Db DbActionPlan
+data ActionPlan   = Db DbActionPlan | NoDb InfoPlan
-  | NoDb InfoPlan
-
-type IsDbExplain = Bool
-
--- A db plan can consist on read/write, rpc call or reading metadata (which may use the db or just use cached objects)
-data DbActionPlan
-  = DbCrud   IsDbExplain CrudPlan
-  | MayUseDb InspectPlan
-
--- Plans that don't use the database
-data InfoPlan
-  = RelInfoPlan QualifiedIdentifier -- info about relation
-  | RoutineInfoPlan Routine -- info about function
-  | SchemaInfoPlan -- info about schema cache
 
 actionPlan :: Action -> AppConfig -> ApiRequest -> SchemaCache -> Either Error ActionPlan
 actionPlan act conf apiReq sCache = case act of
-  ActDb dbAct              -> Db <$> dbActionPlan dbAct conf apiReq sCache
+    ActDb dbAct              -> Db <$> dbActionPlan dbAct conf apiReq sCache
-  ActRelationInfo ident    -> pure . NoDb $ RelInfoPlan ident
+    ActRelationInfo ident    -> pure . NoDb $ RelInfoPlan ident
-  ActRoutineInfo ident inv ->
+    ActRoutineInfo ident inv -> NoDb . RoutineInfoPlan <$> callReadPlan ident conf sCache apiReq inv
-    let crPln = callReadPlan ident conf sCache apiReq inv in
+    ActSchemaInfo            -> pure $ NoDb SchemaInfoPlan
-    NoDb . RoutineInfoPlan . crProc <$> crPln
-  ActSchemaInfo            -> pure $ NoDb SchemaInfoPlan
 
 dbActionPlan :: DbAction -> AppConfig -> ApiRequest -> SchemaCache -> Either Error DbActionPlan
 dbActionPlan dbAct conf apiReq sCache = case dbAct of
   ActRelationRead identifier headersOnly ->
-    toDbActPlan <$> wrappedReadPlan identifier conf sCache apiReq headersOnly
+    DbCrud <$> wrappedReadPlan identifier conf sCache apiReq headersOnly
   ActRelationMut identifier mut ->
-    toDbActPlan <$> mutateReadPlan mut apiReq identifier conf sCache
+    DbCrud <$> mutateReadPlan mut apiReq identifier conf sCache
   ActRoutine identifier invMethod ->
-    toDbActPlan <$> callReadPlan identifier conf sCache apiReq invMethod
+    DbCall <$> callReadPlan identifier conf sCache apiReq invMethod
   ActSchemaRead tSchema headersOnly ->
-    MayUseDb <$> inspectPlan apiReq headersOnly tSchema
+    MaybeDb <$> inspectPlan apiReq headersOnly tSchema
-  where
-    toDbActPlan pl = case pMedia pl of
-      MTVndPlan{} -> DbCrud True pl
-      _           -> DbCrud False pl
 
 wrappedReadPlan :: QualifiedIdentifier -> AppConfig -> SchemaCache -> ApiRequest -> Bool -> Either Error CrudPlan
 wrappedReadPlan  identifier conf sCache apiRequest@ApiRequest{iPreferences=Preferences{..},..} headersOnly = do
@@ -187,8 +171,8 @@ mutateReadPlan  mutation apiRequest@ApiRequest{iPreferences=Preferences{..},..}
   (handler, mediaType)  <- mapLeft ApiRequestError $ negotiateContent conf apiRequest qi iAcceptMediaType (dbMediaHandlers sCache) (hasDefaultSelect rPlan)
   return $ MutateReadPlan rPlan mPlan SQL.Write handler mediaType mutation qi
 
-callReadPlan :: QualifiedIdentifier -> AppConfig -> SchemaCache -> ApiRequest -> InvokeMethod -> Either Error CrudPlan
+callReadPlan :: QualifiedIdentifier -> AppConfig -> SchemaCache -> ApiRequest -> InvokeMethod -> Either Error CallReadPlan
-callReadPlan identifier conf sCache apiRequest@ApiRequest{iPreferences=Preferences{preferHandling, invalidPrefs, preferMaxAffected},..} invMethod = do
+callReadPlan identifier conf sCache apiRequest@ApiRequest{iPreferences=Preferences{preferHandling, invalidPrefs},..} invMethod = do
   let paramKeys = case invMethod of
         InvRead _ -> S.fromList $ fst <$> qsParams'
         Inv       -> iColumns
@@ -208,15 +192,10 @@ callReadPlan identifier conf sCache apiRequest@ApiRequest{iPreferences=Preferenc
       cPlan = callPlan proc apiRequest paramKeys args rPlan
   (handler, mediaType)  <- mapLeft ApiRequestError $ negotiateContent conf apiRequest relIdentifier iAcceptMediaType (dbMediaHandlers sCache) (hasDefaultSelect rPlan)
   if not (null invalidPrefs) && preferHandling == Just Strict then Left $ ApiRequestError $ InvalidPreferences invalidPrefs else Right ()
-  failMaxAffectedRpcReturnsSingle (preferMaxAffected, preferHandling) proc
   return $ CallReadPlan rPlan cPlan txMode proc handler mediaType invMethod identifier
   where
     qsParams' = QueryParams.qsParams iQueryParams
 
-    failMaxAffectedRpcReturnsSingle :: (Maybe PreferMaxAffected, Maybe PreferHandling) -> Routine -> Either Error ()
-    failMaxAffectedRpcReturnsSingle (Just (PreferMaxAffected _), Just Strict) rout = if funcReturnsSingle rout then Left $ ApiRequestError MaxAffectedRpcViolation else Right ()
-    failMaxAffectedRpcReturnsSingle _ _ = Right ()
-
 hasDefaultSelect :: ReadPlanTree -> Bool
 hasDefaultSelect (Node ReadPlan{select=[CoercibleSelectField{csField=CoercibleField{cfName}}]} []) = cfName == "*"
 hasDefaultSelect _ = False
@@ -256,16 +235,14 @@ findProc qi argumentsKeys allProcs contentMediaType isInvPost =
       | hasSingleUnnamedParam proc = (ts,proc:fs)
       | otherwise                  = (ts,fs)
     -- If the function is called with post and has a single unnamed parameter
-    -- it can be called depending on content type and the parameter type.
+    -- it can be called depending on content type and the parameter type
-    -- The parameter must have no declared name (ppName == mempty).
+    hasSingleUnnamedParam Function{pdParams=[RoutineParam{ppType}]} = isInvPost && case (contentMediaType, ppType) of
-    hasSingleUnnamedParam Function{pdParams=[RoutineParam{ppName, ppType}]} =
+      (MTApplicationJSON, "json")  -> True
-      isInvPost && ppName == mempty && case (contentMediaType, ppType) of
+      (MTApplicationJSON, "jsonb") -> True
-        (MTApplicationJSON, "json")  -> True
+      (MTTextPlain, "text")        -> True
-        (MTApplicationJSON, "jsonb") -> True
+      (MTTextXML, "xml")           -> True
-        (MTTextPlain, "text")        -> True
+      (MTOctetStream, "bytea")     -> True
-        (MTTextXML, "xml")           -> True
+      _                            -> False
-        (MTOctetStream, "bytea")     -> True
-        _                            -> False
     hasSingleUnnamedParam _ = False
     matchesParams proc =
       let
@@ -295,7 +272,7 @@ data ResolverContext = ResolverContext
   }
 
 resolveColumnField :: Column -> Maybe ToTsVector -> CoercibleField
-resolveColumnField col toTsV = CoercibleField (colName col) mempty False toTsV (colNominalType col) (colType col) Nothing (colDefault col) False
+resolveColumnField col toTsV = CoercibleField (colName col) mempty False toTsV (colNominalType col) Nothing (colDefault col) False
 
 resolveTableFieldName :: Table -> FieldName -> Maybe ToTsVector -> CoercibleField
 resolveTableFieldName table fieldName toTsV=
@@ -308,12 +285,12 @@ resolveTypeOrUnknown ResolverContext{..} (fn, jp) toTsV =
   case res of
     -- types that are already json/jsonb don't need to be converted with `to_jsonb` for using arrow operators `data->attr`
     -- this prevents indexes not applying https://github.com/PostgREST/postgrest/issues/2594
-    cf@CoercibleField{cfIRType="json"}       -> cf{cfJsonPath=jp, cfToJson=False}
+    cf@CoercibleField{cfIRType="json"}     -> cf{cfJsonPath=jp, cfToJson=False}
-    cf@CoercibleField{cfIRType="jsonb"}      -> cf{cfJsonPath=jp, cfToJson=False}
+    cf@CoercibleField{cfIRType="jsonb"}    -> cf{cfJsonPath=jp, cfToJson=False}
     -- Do not apply to_tsvector to tsvector types
-    cf@CoercibleField{cfBaseType="tsvector"} -> cf{cfJsonPath=jp, cfToJson=True, cfToTsVector=Nothing}
+    cf@CoercibleField{cfIRType="tsvector"} -> cf{cfJsonPath=jp, cfToJson=True, cfToTsVector=Nothing}
     -- other types will get converted `to_jsonb(col)->attr`, even unknown types
-    cf                                       -> cf{cfJsonPath=jp, cfToJson=True}
+    cf                                     -> cf{cfJsonPath=jp, cfToJson=True}
   where
     res = fromMaybe (unknownField fn jp) $ HM.lookup qi tables >>=
           Just . (\t -> resolveTableFieldName t fn toTsV)
@@ -908,7 +885,7 @@ addRelatedOrders (Node rp@ReadPlan{order,from} forest) = do
 --       where_ = [
 --         CoercibleStmnt (
 --           CoercibleFilter {
---            field = CoercibleField {cfName = "projects", cfJsonPath = [], cfToJson=False, cfToTsVector = Nothing, cfIRType = "", cfBaseType = "", cfTransform = Nothing, cfDefault = Nothing, cfFullRow = False},
+--            field = CoercibleField {cfName = "projects", cfJsonPath = [], cfToJson=False, cfToTsVector = Nothing, cfIRType = "", cfTransform = Nothing, cfDefault = Nothing, cfFullRow = False},
 --            opExpr = op
 --           }
 --         )
@@ -924,7 +901,7 @@ addRelatedOrders (Node rp@ReadPlan{order,from} forest) = do
 -- Don't do anything to the filter if there's no embedding (a subtree) on projects. Assume it's a normal filter.
 --
 -- >>> ReadPlan.where_ . rootLabel <$> addNullEmbedFilters (readPlanTree nullOp [])
--- Right [CoercibleStmnt (CoercibleFilter {field = CoercibleField {cfName = "projects", cfJsonPath = [], cfToJson = False, cfToTsVector = Nothing, cfIRType = "", cfBaseType = "", cfTransform = Nothing, cfDefault = Nothing, cfFullRow = False}, opExpr = OpExpr True (Is IsNull)})]
+-- Right [CoercibleStmnt (CoercibleFilter {field = CoercibleField {cfName = "projects", cfJsonPath = [], cfToJson = False, cfToTsVector = Nothing, cfIRType = "", cfTransform = Nothing, cfDefault = Nothing, cfFullRow = False}, opExpr = OpExpr True (Is IsNull)})]
 --
 -- If there's an embedding on projects, then change the filter to use the internal aggregate name (`clients_projects_1`) so the filter can succeed later.
 --
@@ -943,7 +920,7 @@ addNullEmbedFilters (Node rp@ReadPlan{where_=curLogic} forest) = do
     newNullFilters rPlans = \case
       (CoercibleExpr b lOp trees) ->
         CoercibleExpr b lOp <$> (newNullFilters rPlans `traverse` trees)
-      flt@(CoercibleStmnt (CoercibleFilter CoercibleField{cfName=fld, cfJsonPath=[]} opExpr)) ->
+      flt@(CoercibleStmnt (CoercibleFilter (CoercibleField fld [] _ _ _ _ _ _) opExpr)) ->
         let foundRP = find (\ReadPlan{relName, relAlias} -> fld == fromMaybe relName relAlias) rPlans in
         case (foundRP, opExpr) of
           (Just ReadPlan{relAggAlias}, OpExpr b (Is IsNull)) -> Right $ CoercibleStmnt $ CoercibleFilterNullEmbed b relAggAlias
@@ -1041,6 +1018,7 @@ callPlan proc ApiRequest{} paramKeys args readReq = FunctionCall {
 , funCArgs = args
 , funCScalar = funcReturnsScalar proc
 , funCSetOfScalar = funcReturnsSetOfScalar proc
+, funCRetCompositeAlias = funcReturnsCompositeAlias proc
 , funCFilterFields = getFilterFieldNames readReq
 , funCReturning = inferColsEmbedNeeds readReq []
 }
@@ -1137,7 +1115,7 @@ negotiateContent conf ApiRequest{iAction=act, iPreferences=Preferences{preferRep
       m@(MTVndPlan (MTVndSingularJSON strip) _ _) -> mtPlanToNothing $ Just (BuiltinAggSingleJson strip, m)
       m@(MTVndPlan MTVndArrayJSONStrip _ _)       -> mtPlanToNothing $ Just (BuiltinAggArrayJsonStrip, m)
       -- TODO the plan should have its own MediaHandler instead of relying on MediaType
-      m@(MTVndPlan mType _ _)                     -> mtPlanToNothing $ ((,) . fst <$> lookupHandler mType) <*> pure m
+      m@(MTVndPlan mType _ _)                     -> mtPlanToNothing $ (,) <$> (fst <$> lookupHandler mType) <*> pure m
       -- all the other media types can be overridden
       x                                           -> lookupHandler x
     mtPlanToNothing x = if configDbPlanEnabled conf then x else Nothing -- don't find anything if the plan media type is not allowed

src/PostgREST/Plan/CallPlan.hs

@@ -19,13 +19,14 @@ import           PostgREST.SchemaCache.Routine     (Routine (..),
 import Protolude
 
 data CallPlan = FunctionCall
-  { funCQi           :: QualifiedIdentifier
+  { funCQi                :: QualifiedIdentifier
-  , funCParams       :: CallParams
+  , funCParams            :: CallParams
-  , funCArgs         :: CallArgs
+  , funCArgs              :: CallArgs
-  , funCScalar       :: Bool
+  , funCScalar            :: Bool
-  , funCSetOfScalar  :: Bool
+  , funCSetOfScalar       :: Bool
-  , funCFilterFields :: Set FieldName
+  , funCRetCompositeAlias :: Bool
-  , funCReturning    :: Set FieldName
+  , funCFilterFields      :: Set FieldName
+  , funCReturning         :: Set FieldName
   }
 
 data CallParams

src/PostgREST/Plan/Types.hs

@@ -44,14 +44,13 @@ data CoercibleField = CoercibleField
   , cfToJson     :: Bool
   , cfToTsVector :: Maybe ToTsVector      -- ^ If the field should be converted using to_tsvector(<language>, <field>)
   , cfIRType     :: Text                  -- ^ The native Postgres type of the field, the intermediate (IR) type before mapping.
-  , cfBaseType   :: Text                  -- ^ The base type of the field in case of domains, or just the type otherwise (without modifiers in case of pg_catalog types)
   , cfTransform  :: Maybe TransformerProc -- ^ The optional mapping from irType -> targetType.
   , cfDefault    :: Maybe Text
   , cfFullRow    :: Bool                  -- ^ True if the field represents the whole selected row. Used in spread rels: instead of COUNT(*), it does a COUNT(<row>) in order to not mix with other spreaded resources.
   } deriving (Eq, Show)
 
 unknownField :: FieldName -> JsonPath -> CoercibleField
-unknownField name path = CoercibleField name path False Nothing "" "" Nothing Nothing False
+unknownField name path = CoercibleField name path False Nothing "" Nothing Nothing False
 
 -- | Like an API request LogicTree, but with coercible field information.
 data CoercibleLogicTree

src/PostgREST/Query.hs

@@ -1,58 +1,304 @@
+{-# LANGUAGE NamedFieldPuns  #-}
 {-# LANGUAGE RecordWildCards #-}
-{-|
+-- TODO: This module shouldn't depend on SchemaCache
-Module      : PostgREST.Query
-Description : PostgREST query building
-
-TODO: This module shouldn't depend on SchemaCache: once OpenAPI is removed, this can be done
--}
 module PostgREST.Query
-  ( mainQuery
+  ( Query (..)
-  , MainQuery (..)
+  , QueryResult (..)
+  , query
+  , getSQLQuery
   ) where
 
-import qualified Hasql.DynamicStatements.Snippet as SQL hiding (sql)
+import qualified Data.Aeson                        as JSON
+import qualified Data.Aeson.KeyMap                 as KM
+import qualified Data.ByteString                   as BS
+import qualified Data.ByteString.Lazy.Char8        as LBS
+import qualified Data.HashMap.Strict               as HM
+import qualified Data.Set                          as S
+import qualified Hasql.Decoders                    as HD
+import qualified Hasql.DynamicStatements.Snippet   as SQL (Snippet)
+import qualified Hasql.DynamicStatements.Statement as SQL
+import qualified Hasql.Session                     as SQL (Session)
+import qualified Hasql.Transaction                 as SQL
+import qualified Hasql.Transaction.Sessions        as SQL
 
-import qualified PostgREST.Query.PreQuery     as PreQuery
+import qualified PostgREST.Error              as Error
 import qualified PostgREST.Query.QueryBuilder as QueryBuilder
-import qualified PostgREST.Query.SqlFragment  as SqlFragment
 import qualified PostgREST.Query.Statements   as Statements
+import qualified PostgREST.SchemaCache        as SchemaCache
 
 
-import PostgREST.ApiRequest              (ApiRequest (..))
+import PostgREST.ApiRequest              (ApiRequest (..),
-import PostgREST.ApiRequest.Preferences  (Preferences (..),
+                                          Mutation (..))
-                                          shouldExplainCount)
+import PostgREST.ApiRequest.Preferences  (PreferCount (..),
+                                          PreferHandling (..),
+                                          PreferMaxAffected (..),
+                                          PreferTimezone (..),
+                                          PreferTransaction (..),
+                                          Preferences (..),
+                                          shouldCount)
 import PostgREST.Auth.Types              (AuthResult (..))
-import PostgREST.Config                  (AppConfig (..))
+import PostgREST.Config                  (AppConfig (..),
+                                          OpenAPIMode (..))
+import PostgREST.Config.PgVersion        (PgVersion (..))
+import PostgREST.Error                   (Error)
+import PostgREST.MediaType               (MediaType (..))
 import PostgREST.Plan                    (ActionPlan (..),
+                                          CallReadPlan (..),
                                           CrudPlan (..),
                                           DbActionPlan (..),
+                                          InfoPlan (..),
                                           InspectPlan (..))
+import PostgREST.Plan.MutatePlan         (MutatePlan (..))
+import PostgREST.Query.SqlFragment       (escapeIdentList, fromQi,
+                                          intercalateSnippet,
+                                          setConfigWithConstantName,
+                                          setConfigWithConstantNameJSON,
+                                          setConfigWithDynamicName)
+import PostgREST.Query.Statements        (ResultSet (..))
+import PostgREST.SchemaCache             (SchemaCache (..))
 import PostgREST.SchemaCache.Identifiers (QualifiedIdentifier (..))
+import PostgREST.SchemaCache.Routine     (Routine (..), RoutineMap)
+import PostgREST.SchemaCache.Table       (TablesMap)
 
 import Protolude hiding (Handler)
 
--- The Queries that run on every request
+type DbHandler = ExceptT Error SQL.Transaction
-data MainQuery = MainQuery
-  { mqTxVars  :: SQL.Snippet       -- ^ the transaction variables that always run on each query
-  , mqPreReq  :: Maybe SQL.Snippet -- ^ the pre-request function that runs if enabled
-  -- TODO only one of the following queries actually runs on each request, once OpenAPI is removed from core it will be easier to refactor this
-  , mqMain    :: SQL.Snippet
-  , mqOpenAPI :: (SQL.Snippet, SQL.Snippet, SQL.Snippet)
-  , mqExplain :: Maybe SQL.Snippet     -- ^ the explain query that gets generated for the "Prefer: count=estimated" case
-  }
 
-mainQuery :: ActionPlan -> AppConfig -> ApiRequest -> AuthResult -> Maybe QualifiedIdentifier -> MainQuery
+data Query
-mainQuery (NoDb _) _ _ _ _ = MainQuery mempty Nothing mempty (mempty, mempty, mempty) mempty
+  = DbQuery {
-mainQuery (Db plan) conf@AppConfig{..} apiReq@ApiRequest{iPreferences=Preferences{..}} authRes preReq =
+      dqIsoLevel    :: SQL.IsolationLevel
-  let genQ = MainQuery (PreQuery.txVarQuery plan conf authRes apiReq) (PreQuery.preReqQuery <$> preReq) in
+    , dqTxMode      :: SQL.Mode
-  case plan of
+    , dqDbHandler   :: DbHandler QueryResult
-    DbCrud _ WrappedReadPlan{..} ->
+    , dqTransaction :: SQL.IsolationLevel -> SQL.Mode -> SQL.Transaction (Either Error QueryResult) -> SQL.Session (Either Error QueryResult)
-      let countQuery = QueryBuilder.readPlanToCountQuery wrReadPlan in
+    , dqSQL         :: ByteString
-      genQ (Statements.mainRead wrReadPlan countQuery preferCount configDbMaxRows pMedia wrHandler) (mempty, mempty, mempty)
+    }
-      (if shouldExplainCount preferCount then Just (Statements.postExplain countQuery) else Nothing)
+  | NoDbQuery QueryResult
-    DbCrud _ MutateReadPlan{..} ->
+
-      genQ (Statements.mainWrite mrReadPlan mrMutatePlan pMedia mrHandler preferRepresentation preferResolution) (mempty, mempty, mempty) mempty
+data QueryResult
-    DbCrud _ CallReadPlan{..} ->
+  = DbCrudResult  CrudPlan ResultSet
-      genQ (Statements.mainCall crProc crCallPlan crReadPlan preferCount pMedia crHandler) (mempty, mempty, mempty) mempty
+  | DbCallResult  CallReadPlan  ResultSet
-    MayUseDb InspectPlan{ipSchema=tSchema} ->
+  | MaybeDbResult InspectPlan  (Maybe (TablesMap, RoutineMap, Maybe Text))
-      genQ mempty (SqlFragment.accessibleTables tSchema, SqlFragment.accessibleFuncs tSchema, SqlFragment.schemaDescription tSchema) mempty
+  | NoDbResult    InfoPlan
+
+query :: AppConfig -> AuthResult -> ApiRequest -> ActionPlan -> SchemaCache -> PgVersion -> Query
+query _ _ _ (NoDb x) _ _ = NoDbQuery $ NoDbResult x
+query config AuthResult{..} apiReq (Db plan) sCache pgVer =
+  DbQuery isoLvl txMode dbHandler transaction mainSQLQuery
+  where
+    transaction = if prepared then SQL.transaction else SQL.unpreparedTransaction
+    prepared = configDbPreparedStatements config
+    isoLvl = planIsoLvl config authRole plan
+    txMode = planTxMode plan
+    (mainActionQuery, mainSQLQuery) = actionQuery plan config apiReq pgVer sCache
+    dbHandler = do
+      setPgLocals plan config authClaims authRole apiReq
+      runPreReq config
+      mainActionQuery
+
+planTxMode :: DbActionPlan -> SQL.Mode
+planTxMode (DbCrud x)  = pTxMode x
+planTxMode (DbCall x)  = crTxMode x
+planTxMode (MaybeDb x) = ipTxmode x
+
+planIsoLvl :: AppConfig -> ByteString -> DbActionPlan -> SQL.IsolationLevel
+planIsoLvl AppConfig{configRoleIsoLvl} role actPlan = case actPlan of
+  DbCall CallReadPlan{crProc} -> fromMaybe roleIsoLvl $ pdIsoLvl crProc
+  _                           -> roleIsoLvl
+  where
+    roleIsoLvl = HM.findWithDefault SQL.ReadCommitted role configRoleIsoLvl
+
+-- TODO: Generate the Hasql Statement in a diferent module after the OpenAPI functionality is removed
+actionQuery :: DbActionPlan -> AppConfig -> ApiRequest -> PgVersion -> SchemaCache -> (DbHandler QueryResult, ByteString)
+actionQuery (DbCrud plan@WrappedReadPlan{..}) conf@AppConfig{..} apiReq@ApiRequest{iPreferences=Preferences{..}} _ _ =
+  (mainActionQuery, mainSQLQuery)
+  where
+    countQuery = QueryBuilder.readPlanToCountQuery wrReadPlan
+    (result, mainSQLQuery) = Statements.prepareRead
+      (QueryBuilder.readPlanToQuery wrReadPlan)
+      (if preferCount == Just EstimatedCount then
+         -- LIMIT maxRows + 1 so we can determine below that maxRows was surpassed
+         QueryBuilder.limitedQuery countQuery ((+ 1) <$> configDbMaxRows)
+       else
+         countQuery
+      )
+      (shouldCount preferCount)
+      wrMedia
+      wrHandler
+      configDbPreparedStatements
+    mainActionQuery = do
+      resultSet <- lift $ SQL.statement mempty result
+      failNotSingular wrMedia resultSet
+      optionalRollback conf apiReq
+      DbCrudResult plan <$> resultSetWTotal conf apiReq resultSet countQuery
+
+actionQuery (DbCrud plan@MutateReadPlan{..}) conf@AppConfig{..} apiReq@ApiRequest{iPreferences=Preferences{..}} _ _ =
+  (mainActionQuery, mainSQLQuery)
+  where
+    (isPut, isInsert, pkCols) = case mrMutatePlan of {Insert{where_,insPkCols} -> ((not . null) where_, True, insPkCols); _ -> (False,False, mempty);}
+    (result, mainSQLQuery) = Statements.prepareWrite
+      (QueryBuilder.readPlanToQuery mrReadPlan)
+      (QueryBuilder.mutatePlanToQuery mrMutatePlan)
+      isInsert
+      isPut
+      mrMedia
+      mrHandler
+      preferRepresentation
+      preferResolution
+      pkCols
+      configDbPreparedStatements
+    failMutation resultSet = case mrMutation of
+      MutationCreate -> do
+        failNotSingular mrMedia resultSet
+      MutationUpdate -> do
+        failNotSingular mrMedia resultSet
+        failExceedsMaxAffectedPref (preferMaxAffected,preferHandling) resultSet
+      MutationSingleUpsert -> do
+        failPut resultSet
+      MutationDelete -> do
+        failNotSingular mrMedia resultSet
+        failExceedsMaxAffectedPref (preferMaxAffected,preferHandling) resultSet
+    mainActionQuery = do
+      resultSet <- lift $ SQL.statement mempty result
+      failMutation resultSet
+      optionalRollback conf apiReq
+      pure $ DbCrudResult plan resultSet
+
+actionQuery (DbCall plan@CallReadPlan{..}) conf@AppConfig{..} apiReq@ApiRequest{iPreferences=Preferences{..}} pgVer _ =
+  (mainActionQuery, mainSQLQuery)
+  where
+    (result, mainSQLQuery) = Statements.prepareCall
+      crProc
+      (QueryBuilder.callPlanToQuery crCallPlan pgVer)
+      (QueryBuilder.readPlanToQuery crReadPlan)
+      (QueryBuilder.readPlanToCountQuery crReadPlan)
+      (shouldCount preferCount)
+      crMedia
+      crHandler
+      configDbPreparedStatements
+    mainActionQuery = do
+      resultSet <- lift $ SQL.statement mempty result
+      optionalRollback conf apiReq
+      failNotSingular crMedia resultSet
+      failExceedsMaxAffectedPref (preferMaxAffected,preferHandling) resultSet
+      pure $ DbCallResult plan resultSet
+
+actionQuery (MaybeDb plan@InspectPlan{ipSchema=tSchema}) AppConfig{..} _ _ sCache =
+  (mainActionQuery, mempty)
+  where
+    mainActionQuery = lift $
+      case configOpenApiMode of
+        OAFollowPriv -> do
+          tableAccess <- SQL.statement [tSchema] (SchemaCache.accessibleTables configDbPreparedStatements)
+          MaybeDbResult plan . Just <$> ((,,)
+                (HM.filterWithKey (\qi _ -> S.member qi tableAccess) $ SchemaCache.dbTables sCache)
+            <$> SQL.statement ([tSchema], configDbHoistedTxSettings) (SchemaCache.accessibleFuncs configDbPreparedStatements)
+            <*> SQL.statement tSchema (SchemaCache.schemaDescription configDbPreparedStatements))
+        OAIgnorePriv ->
+          MaybeDbResult plan . Just <$> ((,,)
+                (HM.filterWithKey (\(QualifiedIdentifier sch _) _ ->  sch == tSchema) $ SchemaCache.dbTables sCache)
+                (HM.filterWithKey (\(QualifiedIdentifier sch _) _ ->  sch == tSchema) $ SchemaCache.dbRoutines sCache)
+            <$> SQL.statement tSchema (SchemaCache.schemaDescription configDbPreparedStatements))
+        OADisabled ->
+          pure $ MaybeDbResult plan Nothing
+
+-- Makes sure the querystring pk matches the payload pk
+-- e.g. PUT /items?id=eq.1 { "id" : 1, .. } is accepted,
+-- PUT /items?id=eq.14 { "id" : 2, .. } is rejected.
+-- If this condition is not satisfied then nothing is inserted,
+-- check the WHERE for INSERT in QueryBuilder.hs to see how it's done
+failPut :: ResultSet -> DbHandler ()
+failPut RSPlan{} = pure ()
+failPut RSStandard{rsQueryTotal=queryTotal} =
+  when (queryTotal /= 1) $ do
+    lift SQL.condemn
+    throwError $ Error.ApiRequestError Error.PutMatchingPkError
+
+resultSetWTotal :: AppConfig -> ApiRequest -> ResultSet -> SQL.Snippet -> DbHandler ResultSet
+resultSetWTotal _ _ rs@RSPlan{} _ = return rs
+resultSetWTotal AppConfig{..} ApiRequest{iPreferences=Preferences{..}} rs@RSStandard{rsTableTotal=tableTotal} countQuery =
+  case preferCount of
+    Just PlannedCount -> do
+      total <- explain
+      return rs{rsTableTotal=total}
+    Just EstimatedCount ->
+      if tableTotal > (fromIntegral <$> configDbMaxRows) then do
+        total <- max tableTotal <$> explain
+        return rs{rsTableTotal=total}
+      else
+        return rs
+    Just ExactCount ->
+      return rs
+    Nothing ->
+      return rs
+  where
+    explain =
+      lift . SQL.statement mempty . Statements.preparePlanRows countQuery $
+        configDbPreparedStatements
+
+-- |
+-- Fail a response if a single JSON object was requested and not exactly one
+-- was found.
+failNotSingular :: MediaType -> ResultSet -> DbHandler ()
+failNotSingular _ RSPlan{} = pure ()
+failNotSingular mediaType RSStandard{rsQueryTotal=queryTotal} =
+  when (elem mediaType [MTVndSingularJSON True, MTVndSingularJSON False] && queryTotal /= 1) $ do
+    lift SQL.condemn
+    throwError $ Error.ApiRequestError . Error.SingularityError $ toInteger queryTotal
+
+failExceedsMaxAffectedPref :: (Maybe PreferMaxAffected, Maybe PreferHandling) -> ResultSet -> DbHandler ()
+failExceedsMaxAffectedPref (Nothing,_) _ = pure ()
+failExceedsMaxAffectedPref _ RSPlan{} = pure ()
+failExceedsMaxAffectedPref (Just (PreferMaxAffected n), handling) RSStandard{rsQueryTotal=queryTotal} = when ((queryTotal > n) && (handling == Just Strict)) $ do
+  lift SQL.condemn
+  throwError $ Error.ApiRequestError . Error.MaxAffectedViolationError $ toInteger queryTotal
+
+-- | Set a transaction to roll back if requested
+optionalRollback :: AppConfig -> ApiRequest -> DbHandler ()
+optionalRollback AppConfig{..} ApiRequest{iPreferences=Preferences{..}} = do
+  lift $ when (shouldRollback || (configDbTxRollbackAll && not shouldCommit)) $ do
+    SQL.sql "SET CONSTRAINTS ALL IMMEDIATE"
+    SQL.condemn
+  where
+    shouldCommit =
+      preferTransaction == Just Commit
+    shouldRollback =
+      preferTransaction == Just Rollback
+
+-- | Set transaction scoped settings
+setPgLocals :: DbActionPlan -> AppConfig -> KM.KeyMap JSON.Value -> BS.ByteString -> ApiRequest -> DbHandler ()
+setPgLocals dbActPlan AppConfig{..} claims role ApiRequest{..} = lift $
+  SQL.statement mempty $ SQL.dynamicallyParameterized
+    -- To ensure `GRANT SET ON PARAMETER <superuser_setting> TO authenticator` works, the role settings must be set before the impersonated role.
+    -- Otherwise the GRANT SET would have to be applied to the impersonated role. See https://github.com/PostgREST/postgrest/issues/3045
+    ("select " <> intercalateSnippet ", " (searchPathSql : roleSettingsSql ++ roleSql ++ claimsSql ++ [methodSql, pathSql] ++ headersSql ++ cookiesSql ++ timezoneSql ++ funcSettingsSql ++ appSettingsSql))
+    HD.noResult configDbPreparedStatements
+  where
+    methodSql = setConfigWithConstantName ("request.method", iMethod)
+    pathSql = setConfigWithConstantName ("request.path", iPath)
+    headersSql = setConfigWithConstantNameJSON "request.headers" iHeaders
+    cookiesSql = setConfigWithConstantNameJSON "request.cookies" iCookies
+    claimsSql = [setConfigWithConstantName ("request.jwt.claims", LBS.toStrict $ JSON.encode claims)]
+    roleSql = [setConfigWithConstantName ("role", role)]
+    roleSettingsSql = setConfigWithDynamicName <$> HM.toList (fromMaybe mempty $ HM.lookup role configRoleSettings)
+    appSettingsSql = setConfigWithDynamicName <$> (join bimap toUtf8 <$> configAppSettings)
+    timezoneSql = maybe mempty (\(PreferTimezone tz) -> [setConfigWithConstantName ("timezone", tz)]) $ preferTimezone iPreferences
+    funcSettingsSql = setConfigWithDynamicName <$> (join bimap toUtf8 <$> funcSettings)
+    searchPathSql =
+      let schemas = escapeIdentList (iSchema : configDbExtraSearchPath) in
+      setConfigWithConstantName ("search_path", schemas)
+    funcSettings = case dbActPlan of
+      DbCall CallReadPlan{crProc} -> pdFuncSettings crProc
+      _                           -> mempty
+
+-- | Runs the pre-request function.
+runPreReq :: AppConfig -> DbHandler ()
+runPreReq conf = lift $ traverse_ (SQL.statement mempty . stmt) (configDbPreRequest conf)
+  where
+    stmt req = SQL.dynamicallyParameterized
+      ("select " <> fromQi req <> "()")
+      HD.noResult
+      (configDbPreparedStatements conf)
+
+getSQLQuery :: Query -> ByteString
+getSQLQuery DbQuery{dqSQL} = dqSQL
+getSQLQuery _              = mempty

src/PostgREST/Query/PreQuery.hs

@@ -1,64 +0,0 @@
-{-# LANGUAGE NamedFieldPuns  #-}
-{-# LANGUAGE RecordWildCards #-}
-{-|
-Module      : PostgREST.Query.PreQuery
-Description : Builds queries that run prior to the main query
--}
-module PostgREST.Query.PreQuery
-  ( txVarQuery
-  , preReqQuery
-  ) where
-
-import qualified Data.Aeson                      as JSON
-import qualified Data.ByteString.Lazy.Char8      as LBS
-import qualified Data.HashMap.Strict             as HM
-import qualified Hasql.DynamicStatements.Snippet as SQL hiding (sql)
-
-
-
-import PostgREST.ApiRequest              (ApiRequest (..))
-import PostgREST.ApiRequest.Preferences  (PreferTimezone (..),
-                                          Preferences (..))
-import PostgREST.Auth.Types              (AuthResult (..))
-import PostgREST.Config                  (AppConfig (..))
-import PostgREST.Plan                    (CrudPlan (..),
-                                          DbActionPlan (..))
-import PostgREST.Query.SqlFragment       (escapeIdentList, fromQi,
-                                          intercalateSnippet,
-                                          setConfigWithConstantName,
-                                          setConfigWithConstantNameJSON,
-                                          setConfigWithDynamicName)
-import PostgREST.SchemaCache.Identifiers (QualifiedIdentifier (..))
-import PostgREST.SchemaCache.Routine     (Routine (..))
-
-import Protolude hiding (Handler)
-
--- sets transaction variables
-txVarQuery :: DbActionPlan -> AppConfig -> AuthResult -> ApiRequest -> SQL.Snippet
-txVarQuery dbActPlan AppConfig{..} AuthResult{..} ApiRequest{..} =
-    -- To ensure `GRANT SET ON PARAMETER <superuser_setting> TO authenticator` works, the role settings must be set before the impersonated role.
-    -- Otherwise the GRANT SET would have to be applied to the impersonated role. See https://github.com/PostgREST/postgrest/issues/3045
-    "select " <> intercalateSnippet ", " (
-      searchPathSql : roleSettingsSql ++ roleSql ++ claimsSql ++ [methodSql, pathSql] ++ headersSql ++ cookiesSql ++ timezoneSql ++ funcSettingsSql ++ appSettingsSql
-    )
-  where
-    methodSql = setConfigWithConstantName ("request.method", iMethod)
-    pathSql = setConfigWithConstantName ("request.path", iPath)
-    headersSql = setConfigWithConstantNameJSON "request.headers" iHeaders
-    cookiesSql = setConfigWithConstantNameJSON "request.cookies" iCookies
-    claimsSql = [setConfigWithConstantName ("request.jwt.claims", LBS.toStrict $ JSON.encode authClaims)]
-    roleSql = [setConfigWithConstantName ("role", authRole)]
-    roleSettingsSql = setConfigWithDynamicName <$> HM.toList (fromMaybe mempty $ HM.lookup authRole configRoleSettings)
-    appSettingsSql = setConfigWithDynamicName . join bimap toUtf8 <$> configAppSettings
-    timezoneSql = maybe mempty (\(PreferTimezone tz) -> [setConfigWithConstantName ("timezone", tz)]) $ preferTimezone iPreferences
-    funcSettingsSql = setConfigWithDynamicName . join bimap toUtf8 <$> funcSettings
-    searchPathSql =
-      let schemas = escapeIdentList (iSchema : configDbExtraSearchPath) in
-      setConfigWithConstantName ("search_path", schemas)
-    funcSettings = case dbActPlan of
-      DbCrud _ CallReadPlan{crProc} -> pdFuncSettings crProc
-      _                             -> mempty
-
--- runs the pre-request function
-preReqQuery :: QualifiedIdentifier -> SQL.Snippet
-preReqQuery preRequest = "select " <> fromQi preRequest <> "()"

src/PostgREST/Query/QueryBuilder.hs

@@ -28,6 +28,7 @@ import Data.Maybe (fromJust)
 import Data.Tree  (Tree (..))
 
 import PostgREST.ApiRequest.Preferences   (PreferResolution (..))
+import PostgREST.Config.PgVersion         (PgVersion, pgVersion130)
 import PostgREST.SchemaCache.Identifiers  (QualifiedIdentifier (..))
 import PostgREST.SchemaCache.Relationship (Cardinality (..),
                                            Junction (..),
@@ -52,8 +53,8 @@ readPlanToQuery node@(Node ReadPlan{select,from=mainQi,fromAlias,where_=logicFor
   (if null logicForest && null relJoinConds
     then mempty
     else " WHERE " <> intercalateSnippet " AND " (map (pgFmtLogicTree qi) logicForest ++ map pgFmtJoinCondition relJoinConds)) <> " " <>
-  groupF qi select relSelect <> " " <>
+  groupF qi select relSelect <>
-  orderF qi order <> " " <>
+  orderF qi order <>
   limitOffsetF readRange
   where
     fromFrag = fromF relToParent mainQi fromAlias
@@ -69,21 +70,21 @@ readPlanToQuery node@(Node ReadPlan{select,from=mainQi,fromAlias,where_=logicFor
 
 getJoinSelects :: ReadPlanTree -> [SQL.Snippet]
 getJoinSelects (Node ReadPlan{relSelect} _) =
-  join $ map relSelectToSnippet relSelect
+  mapMaybe relSelectToSnippet relSelect
   where
-    relSelectToSnippet :: RelSelectField -> [SQL.Snippet]
+    relSelectToSnippet :: RelSelectField -> Maybe SQL.Snippet
     relSelectToSnippet fld =
       let aggAlias = pgFmtIdent $ rsAggAlias fld
       in
         case fld of
           JsonEmbed{rsEmptyEmbed = True} ->
-            []
+            Nothing
           JsonEmbed{rsSelName, rsEmbedMode = JsonObject} ->
-            ["row_to_json(" <> aggAlias <> ".*)::jsonb AS " <> pgFmtIdent rsSelName]
+            Just $ "row_to_json(" <> aggAlias <> ".*)::jsonb AS " <> pgFmtIdent rsSelName
           JsonEmbed{rsSelName, rsEmbedMode = JsonArray} ->
-            ["COALESCE( " <> aggAlias <> "." <> aggAlias <> ", '[]') AS " <> pgFmtIdent rsSelName]
+            Just $ "COALESCE( " <> aggAlias <> "." <> aggAlias <> ", '[]') AS " <> pgFmtIdent rsSelName
           Spread{rsSpreadSel, rsAggAlias} ->
-            pgFmtSpreadSelectItem rsAggAlias <$> rsSpreadSel
+            Just $ intercalateSnippet ", " (pgFmtSpreadSelectItem rsAggAlias <$> rsSpreadSel)
 
 getJoins :: ReadPlanTree -> [SQL.Snippet]
 getJoins (Node _ []) = []
@@ -168,8 +169,8 @@ mutatePlanToQuery (Delete mainQi logicForest returnings) =
   where
     whereLogic = if null logicForest then mempty else " WHERE " <> intercalateSnippet " AND " (pgFmtLogicTree mainQi <$> logicForest)
 
-callPlanToQuery :: CallPlan -> SQL.Snippet
+callPlanToQuery :: CallPlan -> PgVersion -> SQL.Snippet
-callPlanToQuery (FunctionCall qi params arguments returnsScalar returnsSetOfScalar filterFields returnings) =
+callPlanToQuery (FunctionCall qi params arguments returnsScalar returnsSetOfScalar returnsCompositeAlias filterFields returnings) pgVer =
   "SELECT " <> (if returnsScalar || returnsSetOfScalar then "pgrst_call.pgrst_scalar" else returnedColumns) <> " " <>
   fromCall
   where
@@ -181,12 +182,13 @@ callPlanToQuery (FunctionCall qi params arguments returnsScalar returnsSetOfScal
       KeyParams []    -> "FROM " <> callIt mempty
       KeyParams prms  -> case arguments of
         DirectArgs args -> "FROM " <> callIt (fmtArgs prms args)
-        JsonArgs json   -> fromJsonBodyF json ((\p -> CoercibleField (ppName p) mempty False Nothing (ppTypeMaxLength p) mempty Nothing Nothing False) <$> prms) False True False <> ", " <>
+        JsonArgs json   -> fromJsonBodyF json ((\p -> CoercibleField (ppName p) mempty False Nothing (ppTypeMaxLength p) Nothing Nothing False) <$> prms) False True False <> ", " <>
                          "LATERAL " <> callIt (fmtParams prms)
 
     callIt :: SQL.Snippet -> SQL.Snippet
-    callIt argument | returnsScalar || returnsSetOfScalar = "(SELECT " <> fromQi qi <> "(" <> argument <> ") pgrst_scalar) pgrst_call"
+    callIt argument | pgVer < pgVersion130 && returnsCompositeAlias = "(SELECT (" <> fromQi qi <> "(" <> argument <> ")).*) pgrst_call"
-                    | otherwise                           = fromQi qi <> "(" <> argument <> ") pgrst_call"
+                    | returnsScalar || returnsSetOfScalar           = "(SELECT " <> fromQi qi <> "(" <> argument <> ") pgrst_scalar) pgrst_call"
+                    | otherwise                                     = fromQi qi <> "(" <> argument <> ") pgrst_call"
 
     fmtParams :: [RoutineParam] -> SQL.Snippet
     fmtParams prms = intercalateSnippet ", "