Python v3.8 does not support parenthesized context expressions.

Pin Electron version to 33.3.2 as the versions above it fails to start on RHEL 8/Rocky 8
Use HKA registry key instead of HKLM/HKEY_LOCAL_MACHINE in Windows installer.iss.in file.
2026-10-28 07:30:05 -05:00 · 2025-02-06 14:42:29 +05:30 · 2025-02-05 19:10:39 +05:30 · 2025-02-05 15:47:59 +05:30 · 2025-02-05 10:26:51 +05:30 · 2025-02-05 10:17:46 +05:30
2224 changed files with 160368 additions and 94549 deletions
@@ -1,4 +1,3 @@
-.git
 web/node_modules
 web/*.log
 web/regression
@@ -3,7 +3,7 @@ updates:
  - package-ecosystem: "docker"
    directory: "/"
    schedule:
-      interval: "daily"
+      interval: "weekly"
    labels:
      - "Dependencies"
    commit-message:
@@ -12,7 +12,7 @@ updates:
  - package-ecosystem: "pip"
    directory: "/"
    schedule:
-      interval: "daily"
+      interval: "weekly"
    labels:
      - "Dependencies"
    commit-message:
@@ -21,7 +21,7 @@ updates:
  - package-ecosystem: "pip"
    directory: "/tools"
    schedule:
-      interval: "daily"
+      interval: "weekly"
    labels:
      - "Dependencies"
    commit-message:
@@ -30,7 +30,7 @@ updates:
  - package-ecosystem: "pip"
    directory: "/web/regression"
    schedule:
-      interval: "daily"
+      interval: "weekly"
    labels:
      - "Dependencies"
    commit-message:
@@ -39,7 +39,7 @@ updates:
  - package-ecosystem: "npm"
    directory: "/runtime"
    schedule:
-      interval: "daily"
+      interval: "weekly"
    labels:
      - "Dependencies"
    commit-message:
@@ -48,7 +48,7 @@ updates:
  - package-ecosystem: "npm"
    directory: "/web"
    schedule:
-      interval: "daily"
+      interval: "weekly"
    labels:
      - "Dependencies"
    commit-message:
@@ -14,10 +14,15 @@ concurrency:

 jobs:
  build-container:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2

      - name: Build the container
-        run: docker build .
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          context: .
@@ -14,10 +14,10 @@ concurrency:

 jobs:
  build-docs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Install platform dependencies
        run: |
@@ -33,7 +33,7 @@ jobs:
          make docs

      - name: Archive HTML
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: pgadmin4-html-build-output
          path: docs/en_US/_build/html/*
@@ -44,7 +44,7 @@ jobs:
          make docs-epub

      - name: Archive ePub
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: pgadmin4-epub-build-output
          path: docs/en_US/_build/epub/pgAdmin4.epub
@@ -55,7 +55,7 @@ jobs:
          make docs-pdf

      - name: Archive PDF
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: pgadmin4-pdf-build-output
          path: docs/en_US/_build/latex/pgadmin4.pdf
@@ -14,10 +14,10 @@ concurrency:

 jobs:
  check-javascript-style:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Upgrade yarn
        run: |
@@ -14,10 +14,10 @@ concurrency:

 jobs:
  build-python-package:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Install platform dependencies
        run: |
@@ -33,7 +33,7 @@ jobs:
          make pip

      - name: Archive Python wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: pgadmin4-python-build-output
          path: dist/*
@@ -14,10 +14,10 @@ concurrency:

 jobs:
  check-python-style:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Install Python dependencies
        run: |
@@ -14,10 +14,10 @@ concurrency:

 jobs:
  build-tarball:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Install platform dependencies
        run: |
@@ -33,7 +33,7 @@ jobs:
          make src

      - name: Archive source tarball
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: pgadmin4-tarball-build-output
          path: dist/*
@@ -14,10 +14,10 @@ concurrency:

 jobs:
  check-translations:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Install platform dependencies
        run: |
@@ -21,23 +21,26 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pgver: [12, 13, 14, 15, 16]
+        pgver: [13, 14, 15, 16, 17]

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup the EDB APT repo on Linux
        run: |
-          sudo su -c 'echo "deb [arch=amd64] https://apt.enterprisedb.com/$(lsb_release -cs)-edb/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/edb-$(lsb_release -cs).list'
-          sudo su -c 'echo "machine apt.enterprisedb.com login ${{ secrets.EDB_REPO_USERNAME }} password ${{ secrets.EDB_REPO_PASSWORD }}" > /etc/apt/auth.conf.d/edb.conf'
-          sudo wget -q -O - https://apt.enterprisedb.com/edb-deb.gpg.key | sudo apt-key add -
+          curl -1sLf 'https://downloads.enterprisedb.com/${{ secrets.CLOUDSMITH_TOKEN }}/enterprise/setup.deb.sh' | sudo -E bash

      - name: Install platform dependencies
        run: |
          sudo apt update
-          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger edb-as${{ matrix.pgver }}-pgagent
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger
+
+      - name: Install pgagent on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: |
+          sudo apt install -y edb-as${{ matrix.pgver }}-pgagent

      - name: Create the tablespace directory
        run: |
@@ -58,7 +61,9 @@ jobs:
            sleep 2
          done

-          psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
+      - name: Create pgagent extension on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'

      - name: Install Python dependencies
        run: make install-python-testing
@@ -157,21 +162,21 @@ jobs:

      - name: Archive server log
        if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: server-log-pg${{ matrix.pgver }}
          path: var/pgadmin4.log

      - name: Archive regression log
        if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: regression-log-pg${{ matrix.pgver }}
          path: web/regression/regression.log

      - name: Archive screenshots
        if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: screenshots-pg${{ matrix.pgver }}
          path: web/regression/screenshots
@@ -20,12 +20,12 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pgver: [12, 13, 14, 15, 16]
+        pgver: [13, 14, 15, 16, 17]

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup the PGDG APT repo
        run: |
@@ -160,21 +160,21 @@ jobs:

      - name: Archive server log
        if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: server-log-pg${{ matrix.pgver }}
          path: var/pgadmin4.log

      - name: Archive regression log
        if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: regression-log-pg${{ matrix.pgver }}
          path: web/regression/regression.log

      - name: Archive screenshots
        if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: screenshots-pg${{ matrix.pgver }}
          path: web/regression/screenshots
@@ -17,16 +17,16 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-22.04, windows-latest]

    runs-on: ${{ matrix.os }}

    steps:
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
-          node-version: '18.x'
+          node-version: '20.x'

-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Upgrade yarn
        run: |
@@ -32,25 +32,28 @@ jobs:
      fail-fast: false
      matrix:
        os: [ubuntu-22.04, windows-latest]
-        pgver: [12, 13, 14, 15, 16]
+        pgver: [13, 14, 15, 16, 17]

    runs-on: ${{ matrix.os }}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup the EDB APT repo on Linux
        if: ${{ matrix.os == 'ubuntu-22.04' }}
        run: |
-          sudo su -c 'echo "deb [arch=amd64] https://apt.enterprisedb.com/$(lsb_release -cs)-edb/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/edb-$(lsb_release -cs).list'
-          sudo su -c 'echo "machine apt.enterprisedb.com login ${{ secrets.EDB_REPO_USERNAME }} password ${{ secrets.EDB_REPO_PASSWORD }}" > /etc/apt/auth.conf.d/edb.conf'
-          sudo wget -q -O - https://apt.enterprisedb.com/edb-deb.gpg.key | sudo apt-key add -
+          curl -1sLf 'https://downloads.enterprisedb.com/${{ secrets.CLOUDSMITH_TOKEN }}/enterprise/setup.deb.sh' | sudo -E bash

      - name: Install platform dependencies on Linux
        if: ${{ matrix.os == 'ubuntu-22.04' }}
        run: |
          sudo apt update
-          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger edb-as${{ matrix.pgver }}-pgagent
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger
+
+      - name: Install pgagent on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: |
+          sudo apt install -y edb-as${{ matrix.pgver }}-pgagent

      - name: Install platform dependencies on Windows
        if: ${{ matrix.os == 'windows-latest' }}
@@ -78,6 +81,12 @@ jobs:
          icacls "C:\EPAS\${{ matrix.pgver }}\tablespaces" /grant "NETWORK SERVICE":(OI)(CI)F /T
        shell: cmd

+      - name: Add edb_job_scheduler into config file.
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver >= 16 }}
+        run: |
+          sudo sed -i "s/shared_preload_libraries = '/shared_preload_libraries = '\$libdir\/edb_job_scheduler,/g" /etc/edb-as/${{ matrix.pgver }}/main/postgresql.conf
+          sudo su -c "echo \"edb_job_scheduler.database_list = 'test_dbms_job_scheduler'\" >> /etc/edb-as/${{ matrix.pgver }}/main/postgresql.conf"
+
      - name: Start PostgreSQL on Linux
        if: ${{ matrix.os == 'ubuntu-22.04' }}
        run: |
@@ -92,8 +101,10 @@ jobs:
            >&2 echo "EPAS is unavailable - sleeping for 2 seconds"
            sleep 2
          done
-          
-          psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
+
+      - name: Create pgagent extension on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'

      - name: Install Python dependencies on Linux
        if: ${{ matrix.os == 'ubuntu-22.04' }}
@@ -272,14 +283,14 @@ jobs:

      - name: Archive server log
        if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
-          name: server-log-epas${{ matrix.pgver }}
+          name: server-log-epas-${{ matrix.os }}-pg${{ matrix.pgver }}
          path: var/pgadmin4.log

      - name: Archive regression log
        if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
-          name: regression-log-epas${{ matrix.pgver }}
+          name: regression-log-epas-${{ matrix.os }}-pg${{ matrix.pgver }}
          path: web/regression/regression.log
@@ -20,22 +20,22 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-        pgver: [12, 13, 14, 15, 16]
+        os: [macos-latest, ubuntu-22.04, windows-latest]
+        pgver: [13, 14, 15, 16, 17]

    runs-on: ${{ matrix.os }}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Setup the PGDG APT repo on Linux
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
        run: |
          sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
          wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -

      - name: Install platform dependencies on Linux
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
        run: |
          sudo apt update
          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent
@@ -44,6 +44,7 @@ jobs:
        if: ${{ matrix.os == 'macos-latest' }}
        run: |
          brew install postgresql@${{ matrix.pgver }}
+          echo "/opt/homebrew/opt/postgresql@${{ matrix.pgver }}/bin" >> $GITHUB_PATH

      - name: Uninstall PostgreSQL if already present
        if: ${{ matrix.os == 'windows-latest' }}
@@ -61,13 +62,13 @@ jobs:
          ECHO Running %INSTALLER_EXE%...
          %INSTALLER_EXE% --prefix C:\PostgreSQL\${{ matrix.pgver }} --datadir C:\PostgreSQL\${{ matrix.pgver }}\data --serverport 59${{ matrix.pgver }} --superpassword postgres --install_runtimes 0 --mode unattended --unattendedmodeui none --disable-components pgAdmin,stackbuilder --enable-components server,commandlinetools"
          choco install -y mitkerberos
-          
+
          REM Ignore error 3010 (reboot required)
          IF %ERRORLEVEL% EQU 3010 cmd /c "exit /b 0"
        shell: cmd

      - name: Create the tablespace directory on Linux
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
        run: |
          sudo mkdir -p /var/lib/postgresql/tablespaces/${{ matrix.pgver }}
          sudo chown postgres:postgres /var/lib/postgresql/tablespaces/${{ matrix.pgver }}
@@ -75,7 +76,7 @@ jobs:
      - name: Create the tablespace directory on macOS
        if: ${{ matrix.os == 'macos-latest' }}
        run: |
-          mkdir -p /usr/local/var/tablespaces/${{ matrix.pgver }}
+          mkdir -p /opt/homebrew/var/tablespaces/${{ matrix.pgver }}

      - name: Create the tablespace directory on Windows
        if: ${{ matrix.os == 'windows-latest' }}
@@ -85,37 +86,37 @@ jobs:
        shell: cmd

      - name: Start PostgreSQL on Linux
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
        run: |
          sudo su -c "echo local all all trust > /etc/postgresql/${{ matrix.pgver }}/main/pg_hba.conf"
          sudo sed -i "s/port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf
          sudo sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = '\$libdir\/plugin_debugger'/g" /etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf
          sudo su - postgres -c "/usr/lib/postgresql/${{ matrix.pgver }}/bin/postgres -D /var/lib/postgresql/${{ matrix.pgver }}/main -c config_file=/etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf &"
-          
+
          until sudo runuser -l postgres -c "pg_isready -p 59${{ matrix.pgver }}" 2>/dev/null; do
            >&2 echo "Postgres is unavailable - sleeping for 2 seconds"
            sleep 2
          done
-          
+
          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pgagent;'
          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pldbgapi;'

      - name: Start PostgreSQL on macOS
        if: ${{ matrix.os == 'macos-latest' }}
        run: |
-          echo local all all trust > /usr/local/var/postgresql@${{ matrix.pgver }}/pg_hba.conf
-          sed -i '' "s/#port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /usr/local/var/postgresql@${{ matrix.pgver }}/postgresql.conf
+          echo local all all trust > /opt/homebrew/var/postgresql@${{ matrix.pgver }}/pg_hba.conf
+          sed -i '' "s/#port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /opt/homebrew/var/postgresql@${{ matrix.pgver }}/postgresql.conf
          brew services restart postgresql@${{ matrix.pgver }}
-          
-          until /usr/local/opt/postgresql@${{ matrix.pgver }}/bin/pg_isready -p 59${{ matrix.pgver }} 2>/dev/null; do
+
+          until /opt/homebrew/opt/postgresql@${{ matrix.pgver }}/bin/pg_isready -p 59${{ matrix.pgver }} 2>/dev/null; do
            >&2 echo "Postgres is unavailable - sleeping for 2 seconds"
            sleep 2
          done
-          
+
          psql postgres -p 59${{ matrix.pgver }} -c 'CREATE ROLE postgres SUPERUSER LOGIN;'

      - name: Install Python dependencies on Linux and macOS
-        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-22.04' }}
        run: make install-python-testing

      - name: Install Python dependencies on Windows
@@ -130,25 +131,25 @@ jobs:
        shell: cmd

      - name: Create the test configuration on Linux and macOS
-        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-22.04' }}
        run: |
          cat <<EOF > web/config_local.py
          from config import *
-          
+
          # Debug mode
          DEBUG = True
-          
+
          # App mode
          SERVER_MODE = False
-          
+
          # Log
          CONSOLE_LOG_LEVEL = DEBUG
          FILE_LOG_LEVEL = DEBUG
-          
+
          DEFAULT_SERVER = '127.0.0.1'
-          
+
          UPGRADE_CHECK_ENABLED = False
-          
+
          LOG_FILE = "$(pwd)/var/pgadmin4.log"
          SESSION_DB_PATH = "$(pwd)/var/sessions"
          STORAGE_DIR = "$(pwd)/var/storage"
@@ -156,7 +157,7 @@ jobs:
          TEST_SQLITE_PATH = "$(pwd)/var/pgadmin4.db"
          AZURE_CREDENTIAL_CACHE_DIR = "$(pwd)/var/azurecredentialcache"
          EOF
-          
+
          cat <<EOF > web/regression/test_config.json
          {
            "pgAdmin4_login_credentials": {
@@ -180,15 +181,15 @@ jobs:
                "name": "PostgreSQL ${{ matrix.pgver }}",
                "comment": "PostgreSQL ${{ matrix.pgver }} Server",
                "db_username": "postgres",
-                "host": "${{ matrix.os == 'macos-latest' && '/tmp' || matrix.os == 'ubuntu-latest' && '/var/run/postgresql' || '127.0.0.1' }}",
+                "host": "${{ matrix.os == 'macos-latest' && '/tmp' || matrix.os == 'ubuntu-22.04' && '/var/run/postgresql' || '127.0.0.1' }}",
                "db_password": "postgres",
                "db_port": 59${{ matrix.pgver }},
                "maintenance_db": "postgres",
                "sslmode": "prefer",
-                "tablespace_path": "${{ matrix.os == 'macos-latest' && format('/usr/local/var/tablespaces/{0}', matrix.pgver) || format('/var/lib/postgresql/tablespaces/{0}', matrix.pgver) }}",
+                "tablespace_path": "${{ matrix.os == 'macos-latest' && format('/opt/homebrew/var/tablespaces/{0}', matrix.pgver) || format('/var/lib/postgresql/tablespaces/{0}', matrix.pgver) }}",
                "enabled": true,
                "default_binary_paths": {
-                  "pg": "${{ matrix.os == 'macos-latest' && format('/usr/local/opt/postgresql@{0}/bin', matrix.pgver) || format('/usr/lib/postgresql/{0}/bin', matrix.pgver) }}",
+                  "pg": "${{ matrix.os == 'macos-latest' && format('/opt/homebrew/opt/postgresql@{0}/bin', matrix.pgver) || format('/usr/lib/postgresql/{0}/bin', matrix.pgver) }}",
                  "ppas": ""
                }
              }
@@ -205,7 +206,7 @@ jobs:
        if: ${{ matrix.os == 'windows-latest' }}
        run: |
          FOR /f "delims=" %%D IN ('python -c "import os; print(os.getcwd().replace('\\', '\\\\'))"') DO SET WORKING_DIR=%%D
-          
+
          > web\config_local.py (
            @echo.from config import *
            @echo.
@@ -230,7 +231,7 @@ jobs:
            @echo.TEST_SQLITE_PATH = "%WORKING_DIR%\\var\\test_pgadmin4.db"
            @echo.AZURE_CREDENTIAL_CACHE_DIR = "%WORKING_DIR%\\var\\azurecredentialcache"
          )
-          
+
          > web\regression\test_config.json (
            @echo.{
            @echo.  "pgAdmin4_login_credentials": {
@@ -277,7 +278,7 @@ jobs:
        shell: cmd

      - name: Run the tests on Linux and macOS
-        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-22.04' }}
        run: |
          . venv/bin/activate
          make check-python
@@ -291,14 +292,14 @@ jobs:

      - name: Archive server log
        if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: server-log-${{ matrix.os }}-pg${{ matrix.pgver }}
          path: var/pgadmin4.log

      - name: Archive regression log
        if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: regression-log-${{ matrix.os }}-pg${{ matrix.pgver }}
          path: web/regression/regression.log
@@ -22,10 +22,10 @@ jobs:
    # Only run if the project key is set
    if: vars.SONARQUBE_PROJECT_KEY != null

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0

@@ -9,6 +9,7 @@
 .DS_Store
 .idea
 .vscode
+.sonarlint
 .yarn
 /*.diff
 /*.patch
@@ -38,6 +39,7 @@ runtime/pgAdmin4.app/
 runtime/pgAdmin4.pro.user*
 runtime/pgAdmin4_resource.rc
 runtime/release/
+runtime/dev_config.json
 runtime/ui_BrowserWindow.h
 web/config_local.py
 web/pgadmin/misc/themes/pgadmin.themes.json
@@ -48,6 +50,7 @@ node_modules/
 web/pgAdmin/static/js/generated
 web/pgadmin/static/js/generated
 web/yarn-error.log
+web/commit_hash
 /web/cacert.pem
 auditjs.html
 auditpy.txt
@@ -0,0 +1 @@
+3.8.0
@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2024, The pgAdmin Development Team
+# Copyright (C) 2013 - 2025, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
@@ -31,6 +31,7 @@ RUN apk add --no-cache \
    yarn \
    zlib-dev

+COPY .git .git
 # Create the /pgadmin4 directory and copy the source into it. Explicitly
 # remove the node_modules directory as we'll recreate a clean version, as well
 # as various other files we don't want
@@ -46,6 +47,8 @@ WORKDIR /pgadmin4/web

 # Build the JS vendor code in the app-builder, and then remove the vendor source.
 RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
+    npm install -g corepack && \
+    corepack enable && \
    yarn set version berry && \
    yarn set version 3 && \
    yarn install && \
@@ -58,7 +61,8 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
           webpack.* \
           jest.config.js \
           babel.* \
-           ./pgadmin/static/js/generated/.cache
+           ./pgadmin/static/js/generated/.cache \
+           /pgadmin4/.git

 #########################################################################
 # Next, create the base environment for Python
@@ -68,7 +72,7 @@ FROM alpine:latest AS env-builder

 # Install dependencies
 COPY requirements.txt /
-RUN     apk add --no-cache \
+RUN apk add --no-cache \
        make \
        python3 \
        py3-pip && \
@@ -121,6 +125,7 @@ FROM postgres:13-alpine AS pg13-builder
 FROM postgres:14-alpine AS pg14-builder
 FROM postgres:15-alpine AS pg15-builder
 FROM postgres:16-alpine AS pg16-builder
+FROM postgres:17-alpine AS pg17-builder

 FROM alpine:latest AS tool-builder

@@ -150,6 +155,11 @@ COPY --from=pg16-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-16/
 COPY --from=pg16-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-16/
 COPY --from=pg16-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-16/

+COPY --from=pg17-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-17/
+COPY --from=pg17-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-17/
+COPY --from=pg17-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-17/
+COPY --from=pg17-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-17/
+
 #########################################################################
 # Assemble everything into the final container.
 #########################################################################
@@ -161,14 +171,14 @@ COPY --from=env-builder /venv /venv

 # Copy in the tools
 COPY --from=tool-builder /usr/local/pgsql /usr/local/
-COPY --from=pg16-builder /usr/local/lib/libpq.so.5.16 /usr/lib/
-COPY --from=pg16-builder /usr/lib/libzstd.so.1.5.5 /usr/lib/
-COPY --from=pg16-builder /usr/lib/liblz4.so.1.9.4 /usr/lib/
+COPY --from=pg17-builder /usr/local/lib/libpq.so.5.17 /usr/lib/
+COPY --from=pg17-builder /usr/lib/libzstd.so.1.5.6 /usr/lib/
+COPY --from=pg17-builder /usr/lib/liblz4.so.1.10.0 /usr/lib/

-RUN ln -s libpq.so.5.16 /usr/lib/libpq.so.5 && \
-    ln -s libpq.so.5.16 /usr/lib/libpq.so && \
-    ln -s libzstd.so.1.5.5 /usr/lib/libzstd.so.1 && \
-    ln -s liblz4.so.1.9.4 /usr/lib/liblz4.so.1
+RUN ln -s libpq.so.5.17 /usr/lib/libpq.so.5 && \
+    ln -s libpq.so.5.17 /usr/lib/libpq.so && \
+    ln -s libzstd.so.1.5.6 /usr/lib/libzstd.so.1 && \
+    ln -s liblz4.so.1.10.0 /usr/lib/liblz4.so.1

 WORKDIR /pgadmin4
 ENV PYTHONPATH=/pgadmin4
@@ -185,8 +195,9 @@ COPY LICENSE /pgadmin4/LICENSE
 COPY DEPENDENCIES /pgadmin4/DEPENDENCIES

 # Install runtime dependencies and configure everything in one RUN step
-RUN apk add \
+RUN apk add --no-cache \
        python3 \
+        bash \
        py3-pip \
        postfix \
        krb5-libs \
@@ -197,17 +208,17 @@ RUN apk add \
        libedit \
        libldap \
        libcap && \
-    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==20.1.0 && \
+    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==22.0.0 && \
    find / -type d -name '__pycache__' -exec rm -rf {} + && \
    useradd -r -u 5050 -g root -s /sbin/nologin pgadmin && \
-    mkdir -p /var/lib/pgadmin && \
-    chown pgadmin:root /var/lib/pgadmin && \
+    mkdir -p /run/pgadmin /var/lib/pgadmin && \
+    chown pgadmin:root /run/pgadmin /var/lib/pgadmin && \
    chmod g=u /var/lib/pgadmin && \
    touch /pgadmin4/config_distro.py && \
    chown pgadmin:root /pgadmin4/config_distro.py && \
    chmod g=u /pgadmin4/config_distro.py && \
    chmod g=u /etc/passwd && \
-    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.11 && \
+    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.12 && \
    echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix && \
    echo "pgadminr ALL = NOPASSWD: /usr/sbin/postfix start" >> /etc/sudoers.d/postfix

@@ -4,7 +4,7 @@ pgAdmin 4
 This software is released under the PostgreSQL licence.

 -------------------------------------------------------------------------------
-Copyright (C) 2013 - 2024, The pgAdmin Development Team
+Copyright (C) 2013 - 2025, The pgAdmin Development Team

 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose, without fee, and without a written agreement is
@@ -52,24 +52,22 @@ REM Main build sequence Ends

 :SET_ENVIRONMENT
    ECHO Configuring the environment...
-    IF "%PGADMIN_PYTHON_DIR%" == ""   SET "PGADMIN_PYTHON_DIR=C:\Python38"
+    IF "%PGADMIN_PYTHON_DIR%" == ""   SET "PGADMIN_PYTHON_DIR=C:\Python313"
    IF "%PGADMIN_KRB5_DIR%" == ""     SET "PGADMIN_KRB5_DIR=C:\Program Files\MIT\Kerberos"
-    IF "%PGADMIN_POSTGRES_DIR%" == "" SET "PGADMIN_POSTGRES_DIR=C:\Program Files (x86)\PostgreSQL\12"
+    IF "%PGADMIN_POSTGRES_DIR%" == "" SET "PGADMIN_POSTGRES_DIR=C:\Program Files\PostgreSQL\17"
    IF "%PGADMIN_INNOTOOL_DIR%" == "" SET "PGADMIN_INNOTOOL_DIR=C:\Program Files (x86)\Inno Setup 6"
-    IF "%PGADMIN_VCREDIST_DIR%" == "" SET "PGADMIN_VCREDIST_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.16.27012"
-    IF "%PGADMIN_SIGNTOOL_DIR%" == "" SET "PGADMIN_SIGNTOOL_DIR=C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64"
-
-    REM Set REDIST_NAME (the filename)
-    set "VCREDIST_FILE=vcredist_x64.exe"
+    IF "%PGADMIN_VCREDIST_DIR%" == "" SET "PGADMIN_VCREDIST_DIR=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.40.33807"
+    IF "%PGADMIN_VCREDIST_FILE%" == "" SET "PGADMIN_VCREDIST_FILE=vc_redist.x64.exe"
+    IF "%PGADMIN_SIGNTOOL_DIR%" == "" SET "PGADMIN_SIGNTOOL_DIR=C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64"

    REM Set additional variables we need
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py')  DO SET APP_MAJOR=%%a
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\config.py') DO SET APP_MINOR=%%a
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\config.py')   DO SET APP_VERSION_SUFFIX=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\version.py')  DO SET APP_MAJOR=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\version.py') DO SET APP_MINOR=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\version.py')   DO SET APP_VERSION_SUFFIX=%%a
    REM remove single quote from the string
    SET APP_VERSION_SUFFIX=%APP_VERSION_SUFFIX:'=%
    SET APP_NAME=""
-    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\config.py') DO SET APP_NAME=%%a
+    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\branding.py') DO SET APP_NAME=%%a
    FOR /f "tokens=1 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c "print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G
    SET APP_VERSION=%APP_MAJOR%.%APP_MINOR%
    SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%APP_VERSION_SUFFIX%-x64.exe
@@ -98,7 +96,7 @@ REM Main build sequence Ends
    ECHO PostgreSQL directory:      %PGADMIN_POSTGRES_DIR%
    ECHO.
    ECHO VC++ redist directory:     %PGADMIN_VCREDIST_DIR%
-    ECHO VC++ redist file:          %VCREDIST_FILE%
+    ECHO VC++ redist file:          %PGADMIN_VCREDIST_FILE%
    ECHO InnoTool directory:        %PGADMIN_INNOTOOL_DIR%
    ECHO signtool directory:        %PGADMIN_SIGNTOOL_DIR%
    ECHO.
@@ -217,6 +215,8 @@ REM Main build sequence Ends

    ECHO Installing javascript dependencies...
    CD "%BUILDROOT%\web"
+    CALL yarn set version berry || EXIT /B 1
+    CALL yarn set version 3 || EXIT /B 1
    CALL yarn install || EXIT /B 1
    CALL npm rebuild || EXIT /B 1

@@ -231,6 +231,8 @@ REM Main build sequence Ends
    RD /Q /S "%BUILDROOT%\web\regression" 1> nul 2>&1
    ECHO Removing tools...
    RD /Q /S "%BUILDROOT%\web\tools" 1> nul 2>&1
+    ECHO Removing yarn cache...
+    RD /Q /S "%BUILDROOT%\web\.yarn" 1> nul 2>&1
    ECHO Removing any existing configurations...
    DEL /q "%BUILDROOT%\web\pgadmin4.db" 1> nul 2>&1
    DEL /q "%BUILDROOT%\web\config_local.py" 1> nul 2>&1
@@ -260,47 +262,54 @@ REM Main build sequence Ends
    RD /Q /S "%BUILDROOT%\docs\en_US\html\_sources" 1> nul 2>&1

    ECHO Staging runtime components...
-    XCOPY /S /I /E /H /Y "%WD%\runtime\assets" "%BUILDROOT%\runtime\assets" > nul || EXIT /B 1
-    XCOPY /S /I /E /H /Y "%WD%\runtime\src" "%BUILDROOT%\runtime\src" > nul || EXIT /B 1
+    MKDIR "%BUILDROOT%\runtime\resources\app"
+    XCOPY /S /I /E /H /Y "%WD%\runtime\assets" "%BUILDROOT%\runtime\resources\app\assets" > nul || EXIT /B 1
+    XCOPY /S /I /E /H /Y "%WD%\runtime\src" "%BUILDROOT%\runtime\resources\app\src" > nul || EXIT /B 1

-    COPY "%WD%\runtime\package.json" "%BUILDROOT%\runtime\" > nul || EXIT /B 1
-    CD "%BUILDROOT%\runtime\"
-    CALL yarn install --production=true || EXIT /B 1
+    COPY "%WD%\runtime\package.json" "%BUILDROOT%\runtime\resources\app\" > nul || EXIT /B 1
+    COPY "%WD%\runtime\.yarnrc.yml" "%BUILDROOT%\runtime\resources\app\" > nul || EXIT /B 1

-    ECHO Downloading NWjs to %TMPDIR%...
-    REM Get a fresh copy of nwjs.
-    REM NOTE: The nw download servers seem to be very unreliable, so at the moment we're using wget which retries
+    CD "%BUILDROOT%\runtime\resources\app\"

-    REM YARN
-    REM CALL yarn --cwd "%TMPDIR%" add nw || EXIT /B
-    REM YARN END
+    CALL yarn set version berry || EXIT /B 1
+    CALL yarn set version 3 || EXIT /B 1
+    CALL yarn plugin import workspace-tools || EXIT /B 1
+    CALL yarn workspaces focus --production || EXIT /B 1
+
+    ECHO Removing yarn cache...
+    RD /Q /S "%BUILDROOT%\runtime\resources\app\.yarn" 1> nul 2>&1
+
+    ECHO Downloading Electron to %TMPDIR%...
+    REM Get a fresh copy of electron.

    REM WGET
-    REM Comment out the below line as the latest version having some
-    REM problem https://github.com/nwjs/nw.js/issues/7964, so for the time being
-    REM hardcoded the version to 0.77.0
-    REM FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i"
-    REM :GET_NW
-    REM    wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
-    REM    IF %ERRORLEVEL% NEQ 0 GOTO GET_NW
+    FOR /f "tokens=*" %%i IN ('npm info electron version') DO SET "ELECTRON_VERSION=%%i"
+    SET ELECTRON_VERSION="33.3.2"
+    :GET_NW
+        wget https://github.com/electron/electron/releases/download/v%ELECTRON_VERSION%/electron-v%ELECTRON_VERSION%-win32-x64.zip -O "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64.zip"
+        IF %ERRORLEVEL% NEQ 0 GOTO GET_NW

-    SET "NW_VERSION=0.77.0"
-    wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
-
-    tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1
+    MKDIR "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64" || EXIT /B 1
+    tar -C "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64" -xvf "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64.zip" || EXIT /B 1
    REM WGET END

-    REM YARN
-    REM XCOPY /S /I /E /H /Y "%TMPDIR%\node_modules\nw\nwjs\*" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    REM YARN END
+    REM XCOPY
+    XCOPY /S /I /E /H /Y "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64\*" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    REM XCOPY END

-    REM WGET
-    XCOPY /S /I /E /H /Y "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64\*" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    REM WGET END
+    MOVE "%BUILDROOT%\runtime\electron.exe" "%BUILDROOT%\runtime\pgAdmin4.exe"
+
+    ECHO Downloading rcedit.exe...
+    wget https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe -O "%TMPDIR%\rcedit-x64.exe"
+
+    ECHO Replacing executable icon, description, version...
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-icon "%WD%\pkg\win32\Resources\pgAdmin4.ico"
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-version-string "FileDescription" "%APP_NAME%"
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-version-string "ProductName" "%APP_NAME%"
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-product-version "%APP_VERSION%""

-    MOVE "%BUILDROOT%\runtime\nw.exe" "%BUILDROOT%\runtime\pgAdmin4.exe"
    ECHO Attempting to sign the pgAdmin4.exe...
-    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /tr http://timestamp.digicert.com "%BUILDROOT%\runtime\pgAdmin4.exe"
+    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /fd certHash /tr http://timestamp.digicert.com /td SHA256 "%BUILDROOT%\runtime\pgAdmin4.exe"
    IF %ERRORLEVEL% NEQ 0 (
        ECHO.
        ECHO ************************************************************
@@ -309,17 +318,15 @@ REM Main build sequence Ends
        PAUSE
    )

-    ECHO Replacing executable icon...
-    CALL yarn --cwd "%TMPDIR%" add winresourcer || EXIT /B
-    "%TMPDIR%\node_modules\winresourcer\bin\Resourcer.exe" -op:upd -src:"%BUILDROOT%\runtime\pgAdmin4.exe" -type:Icongroup -name:IDR_MAINFRAME -file:"%WD%\pkg\win32\Resources\pgAdmin4.ico"
-
    ECHO Staging PostgreSQL components...
    COPY "%PGADMIN_POSTGRES_DIR%\bin\libpq.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
    COPY "%PGADMIN_POSTGRES_DIR%\bin\libcrypto-*-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
    COPY "%PGADMIN_POSTGRES_DIR%\bin\libssl-*-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" "%BUILDROOT%\runtime" > nul
    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" "%BUILDROOT%\runtime" > nul
-    COPY "%PGADMIN_POSTGRES_DIR%\bin\zlib.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\liblz4.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\liblz4.dll" "%BUILDROOT%\runtime" > nul
+    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libzstd.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libzstd.dll" "%BUILDROOT%\runtime" > nul
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\zlib1.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
    COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_dump.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
    COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_dumpall.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1L%
    COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_restore.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
@@ -327,7 +334,7 @@ REM Main build sequence Ends

    ECHO Staging VC++ runtime...
    MKDIR "%BUILDROOT%\installer" || EXIT /B 1
-    COPY "%PGADMIN_VCREDIST_DIR%\%VCREDIST_FILE%" "%BUILDROOT%\installer" > nul || EXIT /B 1
+    COPY "%PGADMIN_VCREDIST_DIR%\%PGADMIN_VCREDIST_FILE%" "%BUILDROOT%\installer" > nul || EXIT /B 1

    CD %WD%
    EXIT /B 0
@@ -345,7 +352,7 @@ REM Main build sequence Ends
    ECHO Processing installer configuration script...
    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%"""
    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_VERSION -r """v%APP_MAJOR%"""
-    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%PGADMIN_VCREDIST_DIRNAME%\%VCREDIST_FILE%"""
+    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%PGADMIN_VCREDIST_DIRNAME%\%PGADMIN_VCREDIST_FILE%"""

    ECHO Cleaning up...
    DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul
@@ -366,9 +373,11 @@ REM Main build sequence Ends
    ECHO Generating SBOM...
    CALL syft "%BUILDROOT%" -o cyclonedx-json > "%BUILDROOT%\sbom.json"

+    EXIT /B 0
+
 :SIGN_INSTALLER
    ECHO Attempting to sign the installer...
-    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /tr http://timestamp.digicert.com "%DISTROOT%\%INSTALLERNAME%"
+    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /fd certHash /tr http://timestamp.digicert.com /td SHA256 "%DISTROOT%\%INSTALLERNAME%"
    IF %ERRORLEVEL% NEQ 0 (
        ECHO.
        ECHO ************************************************************
@@ -2,16 +2,16 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2024, The pgAdmin Development Team
+# Copyright (C) 2013 - 2025, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################

 SHELL = /bin/sh

-APP_NAME := $(shell grep ^APP_NAME web/config.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]' | tr -d "'" | awk '{print tolower($$0)}')
-APP_RELEASE := $(shell grep ^APP_RELEASE web/config.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]')
-APP_REVISION := $(shell grep ^APP_REVISION web/config.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]')
+APP_NAME := $(shell grep ^APP_NAME web/branding.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]' | tr -d "'" | awk '{print tolower($$0)}')
+APP_RELEASE := $(shell grep ^APP_RELEASE web/version.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]')
+APP_REVISION := $(shell grep ^APP_REVISION web/version.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]')

 #########################################################################
 # High-level targets
@@ -118,6 +118,7 @@ debian:

 docker:
 	echo $(APP_NAME)
+	git checkout HEAD
 	docker build --pull -t ${APP_NAME} -t $(APP_NAME):latest -t $(APP_NAME):$(APP_RELEASE) -t $(APP_NAME):$(APP_RELEASE).$(APP_REVISION) .

 docs:
@@ -14,7 +14,7 @@ and ReactJS, HTML5 with CSS for the client side processing and UI.

 Although developed using web technologies, pgAdmin 4 can be deployed either on
 a web server using a browser, or standalone on a workstation. The runtime/
-subdirectory contains an NWjs based runtime application intended to allow this,
+subdirectory contains an Electron based runtime application intended to allow this,
 which will execute the Python server and display the UI.

 ## Building the Runtime
@@ -35,13 +35,7 @@ paths it would expect to find in the standard package for your platform.
 You can then execute the runtime by running something like:

 ```bash
-node_modules/nw/nwjs/nw .
-```
-
-or on macOS:
-
-```bash
-node_modules/nw/nwjs/nwjs.app/Contents/MacOS/nwjs .
+yarn run start
 ```

 # Configuring the Python Environment
@@ -200,11 +200,29 @@ tab related to tables that should be included in the backup.
     contents of the table that they have access to. This option is relevant
     only when dumping the contents of a table which has row security.

-   * Move the switch next to *With OIDs* towards right position to include object
-     identifiers as part of the table data for each table.
+   * Use the *Include table(s) and Children* field to dump the tables and any partitions 
+     or inheritance child tables of the tables matching the pattern.
+     **Note:** This option is visible only for database server greater than or
+     equal to 16.
+    
+   * The Exclude patterns field is utilized to exclude patterns in the following manner:

-   * Use the *Exclude table data* field to not dump data for any tables
-     matching the table pattern.
+   * Use the *Table(s)* field to not dump the tables matching the
+     pattern. Multiple patterns can be given separated by space.
+
+   * Use the *Table(s) data* field to not dump data for any tables
+     matching the pattern. Multiple patterns can be given separated by
+     spaces.
+
+   * Use the *Table(s) and children* field to not dump the tables and any
+     partitions or inheritance child tables of the tables matching the pattern.
+     **Note:** This option is visible only for database server greater than or
+     equal to 16.
+
+   * Use the *Table(s) data and children* field to not dump data for the
+     tables and any partitions or inheritance child tables of the tables matching 
+     the table pattern. **Note:** This option is visible only for database server
+     greater than or equal to 16.

 Click the *Options* tab to continue. Use the fields in the *Options*
 tab to provide other backup options.
@@ -136,9 +136,6 @@ tab related to tables that should be included in the backup.
     partition itself. **Note:** This option is visible only for database server
     greater than or equal to 11.

-   * Move the switch next to *With OIDs* towards right position to include object
-     identifiers as part of the table data for each table.
-
 Click the *Options* tab to continue. Use the fields in the *Options*
 tab to provide other backup options.

@@ -8,6 +8,7 @@ Use *Clear Saved Password* functionality to clear the saved password for the
 database server.

 .. image:: images/clear_saved_password.png
+    :alt: Clear saved password
    :align: center

 *Clear Saved Password* shows in the context menu for the selected server as well
@@ -17,6 +18,7 @@ Use *Clear SSH Tunnel Password* functionality to clear the saved password of SSH
 Tunnel to connect to the database server.

 .. image:: images/clear_tunnel_password.png
+    :alt: Clear SSH tunnel password
    :align: center

 *Clear SSH Tunnel Password* shows in the context menu for the selected server as
@@ -7,12 +7,12 @@
 The bulk of pgAdmin is a Python web application written using the Flask framework
 on the backend, and HTML5 with CSS3,ReactJS on the front end. A
 desktop runtime is also included for users that prefer a desktop application to
-a web application, which is written using NWjs (Node Webkit).
+a web application, which is written using Electron.

 Runtime
 *******

-The runtime is based on NWjs which integrates a browser and the Python server
+The runtime is based on Electron which integrates a browser and the Python server
 creating a standalone application. The source code can be found in the
 **/runtime** directory in the source tree.

@@ -16,7 +16,7 @@ review process for any changes submitted for inclusion in pgAdmin.
  bulk updates every year). The start date should always be 2013, and the end year
  the current year, e.g.

-    Copyright (C) 2013 - 2024, The pgAdmin Development Team
+    Copyright (C) 2013 - 2025, The pgAdmin Development Team

 * Ensure there's a blank line immediately following any copyright headers.

@@ -120,7 +120,7 @@ with the required file header is shown below::
    #
    # pgAdmin 4 - PostgreSQL Tools
    #
-    # Copyright (C) 2013 - 2024, The pgAdmin Development Team
+    # Copyright (C) 2013 - 2025, The pgAdmin Development Team
    # This software is released under the PostgreSQL Licence
    #
    ##########################################################################
@@ -50,6 +50,16 @@ settings:
 * Use the *LC_CTYPE* field to specify a locale with specified character
  classification. The locale must be applicable to the current database encoding.
  (See CREATE DATABASE for details.)
+* Use the drop-down listbox next to *Locale Provider* to select a locale services associated
+  with the collation. Possible values are: icu, libc. libc is the default.
+* Move the switch next to *Deterministic* to *YES* to specify whether the collation should use
+  deterministic comparisons. By default, this option is set to true. In a
+  deterministic comparison, strings that are not byte-wise equal are considered
+  unequal, even if they are considered logically equal in the comparison.
+* Use the *Rules* field to specify a rules for customizing the behavior of the collation.
+  It includes considerations such as character ordering, case sensitivity, and accent
+  sensitivity.
+* Use the *Version* field to specify version string to store with the collation object.


 Click the *SQL* tab to continue.
@@ -11,6 +11,7 @@ and select *Connect Server...* from the context menu.

 .. image:: images/connect_to_server.png
    :alt: Connect to server dialog
+    :align: center

 Provide authentication information for the selected server:

@@ -26,6 +27,7 @@ Tunnel and Database server passwords if not already saved.

 .. image:: images/connect_to_tunneled_server.png
    :alt: Connect to server dialog
+    :align: center

 Provide authentication information for the selected server:

@@ -26,9 +26,9 @@ where *<tag name>* is one of the following:
   +==========+===============================================================================+
   | latest   | The most recent release.                                                      |
   +----------+-------------------------------------------------------------------------------+
-   | 7.4      | A specific version (7.4 in this case).                                        |
+   | 8.4      | A specific version (8.4 in this case).                                        |
   +----------+-------------------------------------------------------------------------------+
-   | 7        | the latest release of a specific major version (major version 7 in this case).|
+   | 8        | the latest release of a specific major version (major version 8 in this case).|
   +----------+-------------------------------------------------------------------------------+
   | snapshot | The latest nightly test build.                                                |
   +----------+-------------------------------------------------------------------------------+
@@ -42,22 +42,22 @@ maintenance functions to be executed. Multiple versions are included in the
 following directories to allow use with different versions of the database
 server:

-* PostgreSQL 11: */usr/local/pgsql-11*
 * PostgreSQL 12: */usr/local/pgsql-12*
 * PostgreSQL 13: */usr/local/pgsql-13*
 * PostgreSQL 14: */usr/local/pgsql-14*
 * PostgreSQL 15: */usr/local/pgsql-15*
+* PostgreSQL 16: */usr/local/pgsql-16*

 The default binary paths set in the container are as follows:

 .. code-block:: bash

    DEFAULT_BINARY_PATHS = {
+        'pg-17': '/usr/local/pgsql-17',
        'pg-16': '/usr/local/pgsql-16',
        'pg-15': '/usr/local/pgsql-15',
        'pg-14': '/usr/local/pgsql-14',
-        'pg-13': '/usr/local/pgsql-13',
-        'pg-12': '/usr/local/pgsql-12'
+        'pg-13': '/usr/local/pgsql-13'
    }

 this may be changed in the :ref:`preferences`.
@@ -132,7 +132,30 @@ than using the default.

 Override the default file path for the server definition list. See the
 /pgadmin4/servers.json mapped file below for more information. See the format
-of the `JSON file <https://www.pgadmin.org/docs/pgadmin4/latest/import_export_servers.html#json-format>`_.
+of the `Servers JSON file <https://www.pgadmin.org/docs/pgadmin4/latest/import_export_servers.html#json-format>`_.
+
+**PGADMIN_PREFERENCES_JSON_FILE**
+
+*Default: /pgadmin4/preferences.json*
+
+Override the default file path for the preferences customization at the container creation. See the
+/pgadmin4/preferences.json mapped file below for more information. See the format
+of the `Preferences JSON file <https://www.pgadmin.org/docs/pgadmin4/latest/preferences.html#json-format>`_.
+
+**PGADMIN_CUSTOM_CONFIG_DISTRO_FILE**
+
+*Default: /pgadmin4/config_distro.py*
+
+Override the default file path for the pgadmin configurations file.This can be used while provisioning
+container with read only root file system to achieve a more secure pgadmin4 deployment for kubernetes.
+Note that if you are externally mapping this file, then environment variables passed using *PGADMIN_CONFIG_*
+suffix will be ignored.
+
+**PGPASS_FILE**
+
+*Default: <null>*
+This varible should be set to if you want to pass password using pgpass
+file for the servers added in pgadmin.

 **GUNICORN_ACCESS_LOGFILE**

@@ -228,6 +251,14 @@ pgAdmin in the container. Note that server definitions are only loaded on first
 launch, i.e. when the configuration database is created, and not on subsequent
 launches using the same configuration database.

+**/pgadmin4/preferences.json**
+
+If this file is mapped, preferences defined in it will be updated at launch
+time. This allows customization of preferences settings into the instance of
+pgAdmin in the container. Note that preferences are only set on first
+launch, i.e. when the configuration database is created, and not on subsequent
+launches using the same configuration database.
+
 **/certs/server.cert**

 If TLS is enabled, this file will be used as the servers TLS certificate.
@@ -44,8 +44,9 @@ Use the *Definition* tab to set properties for the database:
 * Select the strategy from the drop-down listbox in the *Strategy* field while
  creating a new database. This option is available from v15 and above.
 * Select the locale provider from the drop-down listbox in the *Locale Provider*
-  field to set the default collation for this database. Possible values are: icu, libc.
-  This option is available from v15 and above.
+  field to set the default collation for this database. Possible values are: icu, libc and builtin.
+  This option is available from v15 and above. **Note:** The icu and libc options are available
+  from v15 and builtin option is available from v17 onwards.
 * Select the collation order from the drop-down listbox in the *Collation* field.
 * Select the character classification from the drop-down listbox in the
  *Character Type* field. This affects the categorization of characters, e.g.
@@ -57,6 +58,8 @@ Use the *Definition* tab to set properties for the database:
 * Specify the icu rules in the *ICU Rules* field as additional collation
  rules to customize the behavior of the default collation of this database.
  This option is available from v16 and above.
+* Select the builtin locale from the drop-down listbox in the *Builtin Locale* if the
+  builtin locale provider is used. This option is available from v17 and above.
 * Specify a connection limit in the *Connection Limit* field to configure the
  maximum number of connection requests. The default value (*-1*) allows
  unlimited connections to the database.
@@ -0,0 +1,108 @@
+.. _dbms_job:
+
+*****************
+`DBMS Job`:index:
+*****************
+
+Use the *DBMS Job* dialog to create a DBMS Job.
+
+.. image:: images/dbms_job_general.png
+    :alt: DBMS Job dialog general tab
+    :align: center
+
+Use the fields in the *General* tab to create job:
+
+* Use the *Name* field to add a descriptive name for the job. The name will
+  be displayed in the *pgAdmin* object explorer.
+* Use the *Enabled?* switch to indicate that job should be enabled or disabled.
+* Use the *Job Type* field to select the type of the job. Type could be SELF-CONTAINED or PRE-DEFINED.
+  If the Job Type is Self-Contained you need to specify the action and repeat interval in the Action and Repeat tabs respectively.
+  If the Job Type is Pre-Defined you need to specify the existing Program and Schedule names in the Pre-Defined tab.
+* Store notes about the job in the *Comment* field.
+
+Click the *Action* tab to continue.
+
+.. image:: images/dbms_job_action.png
+    :alt: DBMS Job dialog action tab
+    :align: center
+
+Use the *Action* tab to select the action for the job. This tab is only enabled when the job type is 'SELF-CONTAINED'.
+
+* Use the *Type* field to select the type of the job. Type could be PLSQL BLOCK or STORED PROCEDURE.
+* Use the *Procedure* field to select an existing procedure that executes when the job is invoked.
+* *Number of Arguments* field is read-only and indicates the quantity of arguments necessary for the chosen procedure.
+
+Click the *Code* tab to continue.
+
+.. image:: images/dbms_job_code.png
+    :alt: DBMS Job dialog code tab
+    :align: center
+
+* Use the *Code* field to write the code that executes when the job is invoked.
+  This tab is only enabled when the job type is 'SELF-CONTAINED' and type of the action is set to 'PLSQL BLOCK'.
+
+
+Click the *Arguments* tab to continue.
+
+.. image:: images/dbms_job_arguments.png
+    :alt: DBMS Job dialog arguments tab
+    :align: center
+
+* *Arguments* tab outlines the arguments required by the selected procedure in the 'Action' tab. This tab is only enabled when the job type is 'SELF-CONTAINED'.
+
+
+Click the *Repeat* tab to continue.
+
+.. image:: images/dbms_job_repeat.png
+    :alt: DBMS Job dialog repeat tab
+    :align: center
+
+Use the *Repeat* tab to select the repeat interval for the job. This tab is only enabled when the job type is 'SELF-CONTAINED'.
+
+* Use the calendar selector in the *Start* field to specify the starting date
+  and time for the job.
+* Use the calendar selector in the *End* field to specify the ending date and
+  time for the job.
+* Use the *Frequency* field to select the frequency. Frequency is one of the following:
+  YEARLY, MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY.
+* Use the *Date* field to select the date on which job will execute.Date is YYYYMMDD.
+* Use the *Months* field to select the months in which the job will execute.
+* Use the *Week Days* field to select the days on which the job will execute.
+* Use the *Month Days* field to select the numeric days on which the job will
+  execute.
+* Use the *Hours* field to select the hour at which the job will execute.
+* Use the *Minutes* field to select the minute at which the job will execute.
+
+Click the *Pre-Defined* tab to continue.
+
+.. image:: images/dbms_job_predefined.png
+    :alt: DBMS Job dialog predefined tab
+    :align: center
+
+Use the *Pre-Defined* tab to select the existing program and schedule to create the job.
+This tab is only enabled when the job type is 'PRE-DEFINED'.
+
+* Use the *Program Name* field to select the existing program.
+* Use the *Schedule Name* field to select an existing schedule.
+
+
+Click the *SQL* tab to continue.
+
+Your entries in the *DBMS Job* dialog generate a SQL command (see an example below).
+Use the *SQL* tab for review; revisit or switch tabs to make any changes to the
+SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by user selections in
+the *DBMS Job* dialog:
+
+.. image:: images/dbms_job_sql.png
+    :alt: DBMS Job dialog sql tab
+    :align: center
+
+* Click the *Info* button (i) to access online help.
+* Click the *Help* button (?) to access dialog help.
+* Click the *Save* button to save work.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
@@ -0,0 +1,45 @@
+.. _dbms_job_scheduler:
+
+********************************
+`Using EDB Job Scheduler`:index:
+********************************
+
+In the past versions of EPAS, DBMS_SCHEDULER or DBMS_JOBS required the configuration
+of pgAgent, an essential service for their functionality. Maintaining pgAgent in a
+production environment is cumbersome. The need for correct configuration, regular updates,
+and ensuring the service’s health added complexity.
+
+EPAS 16 revolutionizes job scheduling by eliminating the need for the pgAgent component.
+The new version introduces EDB Job Scheduler which is an extension that runs the job scheduler
+as a background process for the DBMS_SCHEDULER and DBMS_JOB packages.
+
+The EDB Job Scheduler has a scheduler process that starts when the database cluster starts.
+To start the scheduler process, load the EDB Job Scheduler extension using the **shared_preload_libraries**
+parameter. After you load the extension, create the extension **'edb_job_scheduler'** and **'dbms_scheduler'** using
+the CREATE EXTENSION command. The database in which you're creating the extension must be listed in the
+**edb_job_scheduler.database_list** parameter.
+
+Instructions for configuring the EDB Job Scheduler can be found in the
+`Configuring EDB Job Scheduler <https://www.enterprisedb.com/docs/pg_extensions/edb_job_scheduler/configuring/>`_.
+
+.. image:: images/dbms_job_scheduler.png
+    :alt: DBMS Job Scheduler Object Browser
+    :align: center
+
+Check the status of all the jobs
+********************************
+
+To check the running status of all the jobs select the 'DBMS Job Scheduler' collection node from the object
+explorer and select the Properties tab.
+
+.. image:: images/dbms_job_details.png
+    :alt: DBMS Job Details
+    :align: center
+
+
+.. toctree::
+   :maxdepth: 1
+
+   dbms_job
+   dbms_program
+   dbms_schedule
@@ -0,0 +1,71 @@
+.. _dbms_program:
+
+*********************
+`DBMS Program`:index:
+*********************
+
+Use the *DBMS Program* dialog to create a DBMS Program.
+
+.. image:: images/dbms_program_general.png
+    :alt: DBMS Program dialog general tab
+    :align: center
+
+Use the fields in the *General* tab to create program:
+
+* Use the *Name* field to add a descriptive name for the program. The name will
+  be displayed in the *pgAdmin* object explorer.
+* Use the *Enabled?* switch to indicate that program should be enabled or disabled.
+* Store notes about the program in the *Comment* field.
+
+Click the *Action* tab to continue.
+
+.. image:: images/dbms_program_action.png
+    :alt: DBMS Program dialog action tab
+    :align: center
+
+Use the *Action* tab to select the action for the program:
+
+* Use the *Type* field to select the type of the program. Type could be PLSQL BLOCK or STORED PROCEDURE.
+* Use the *Procedure* field to select an existing procedure that executes when the program is invoked.
+* *Number of Arguments* field is read-only and indicates the quantity of arguments necessary for the chosen procedure.
+
+Click the *Code* tab to continue.
+
+.. image:: images/dbms_program_code.png
+    :alt: DBMS Program dialog code tab
+    :align: center
+
+* Use the *Code* field to write the code that executes when the program is invoked.
+  This tab is only enabled when the type of the program is set to 'PLSQL BLOCK'.
+
+
+Click the *Arguments* tab to continue.
+
+.. image:: images/dbms_program_arguments.png
+    :alt: DBMS Program dialog arguments tab
+    :align: center
+
+* *Arguments* tab is a read-only section that outlines the arguments required by the selected procedure in the 'Action' tab.
+
+
+Click the *SQL* tab to continue.
+
+Your entries in the *DBMS Program* dialog generate a SQL command (see an example below).
+Use the *SQL* tab for review; revisit or switch tabs to make any changes to the
+SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by user selections in
+the *DBMS Program* dialog:
+
+.. image:: images/dbms_program_sql.png
+    :alt: DBMS Program dialog sql tab
+    :align: center
+
+* Click the *Info* button (i) to access online help.
+* Click the *Help* button (?) to access dialog help.
+* Click the *Save* button to save work.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
+
@@ -0,0 +1,61 @@
+.. _dbms_schedule:
+
+**********************
+`DBMS Schedule`:index:
+**********************
+
+Use the *DBMS Schedule* dialog to create a DBMS Schedule.
+
+.. image:: images/dbms_schedule_general.png
+    :alt: DBMS Schedule dialog general tab
+    :align: center
+
+Use the fields in the *General* tab to create schedule:
+
+* Use the *Name* field to add a descriptive name for the schedule. The name will
+  be displayed in the *pgAdmin* object explorer.
+* Store notes about the schedule in the *Comment* field.
+
+Click the *Repeat* tab to continue.
+
+.. image:: images/dbms_schedule_repeat.png
+    :alt: DBMS Schedule dialog repeat tab
+    :align: center
+
+Use the *Repeat* tab to select the repeat interval for the schedule:
+
+* Use the calendar selector in the *Start* field to specify the starting date
+  and time for the schedule.
+* Use the calendar selector in the *End* field to specify the ending date and
+  time for the schedule.
+* Use the *Frequency* field to select the frequency. Frequency is one of the following:
+  YEARLY, MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY.
+* Use the *Date* field to select the date on which schedule will execute.Date is YYYYMMDD.
+* Use the *Months* field to select the months in which the schedule will execute.
+* Use the *Week Days* field to select the days on which the schedule will execute.
+* Use the *Month Days* field to select the numeric days on which the schedule will
+  execute.
+* Use the *Hours* field to select the hour at which the schedule will execute.
+* Use the *Minutes* field to select the minute at which the schedule will execute.
+
+
+Click the *SQL* tab to continue.
+
+Your entries in the *DBMS Schedule* dialog generate a SQL command (see an example below).
+Use the *SQL* tab for review; revisit or switch tabs to make any changes to the
+SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by user selections in
+the *DBMS Schedule* dialog:
+
+.. image:: images/dbms_schedule_sql.png
+    :alt: DBMS Schedule dialog sql tab
+    :align: center
+
+* Click the *Info* button (i) to access online help.
+* Click the *Help* button (?) to access dialog help.
+* Click the *Save* button to save work.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
@@ -61,6 +61,7 @@ values required by the program:

 .. image:: images/debug_params.png
    :alt: Debugger parameter dialog
+    :align: center

 Use the fields on the *Debugger* dialog to provide a value for each parameter:

@@ -100,25 +101,29 @@ The toolbar options are:
    :alt: Debugger navigation toolbar
    :align: center

-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| Option                  | Action                                                                                                    |
-+=========================+===========================================================================================================+
-| *Step into*             | Click the *Step into* icon to execute the currently highlighted line of code.                             |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Step over*             | Click the *Step over* icon to execute a line of code, stepping over any sub-functions invoked by the code.|
-|                         | The sub-function executes, but is not debugged unless it contains a breakpoint.                           |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Continue/Start*        | Click the *Continue/Start* icon to execute the highlighted code, and continue until the program           |
-|                         | encounters a breakpoint or completes.                                                                     |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Toggle breakpoint*     | Use the *Toggle breakpoint* icon to enable or disable a breakpoint (without removing the breakpoint).     |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Clear all breakpoints* | Click the *Clear all breakpoints* icon to remove all breakpoints from the program.                        |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Stop*                  | Click the *Stop* icon to halt the execution of a program.                                                 |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Help*                  | Click the *Help* icon to open debugger documentation.                                                     |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
+.. table::
+    :class: longtable
+    :widths: 1 4 1
+
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | Option                  | Action                                                                                                    | Shortcut               |
+    +=========================+===========================================================================================================+========================+
+    | *Step into*             | Click the *Step into* icon to execute the currently highlighted line of code.                             | Option/Alt + Shift + I |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Step over*             | Click the *Step over* icon to execute a line of code, stepping over any sub-functions invoked by the code.| Option/Alt + Shift + O |
+    |                         | The sub-function executes, but is not debugged unless it contains a breakpoint.                           |                        |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Continue/Start*        | Click the *Continue/Start* icon to execute the highlighted code, and continue until the program           | Option/Alt + Shift + C |
+    |                         | encounters a breakpoint or completes.                                                                     |                        |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Toggle breakpoint*     | Use the *Toggle breakpoint* icon to enable or disable a breakpoint (without removing the breakpoint).     | Option/Alt + Shift + T |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Clear all breakpoints* | Click the *Clear all breakpoints* icon to remove all breakpoints from the program.                        | Option/Alt + Shift + X |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Stop*                  | Click the *Stop* icon to halt the execution of a program.                                                 | Option/Alt + Shift + S |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Help*                  | Click the *Help* icon to open debugger documentation.                                                     |                        |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+

 The top panel of the debugger window displays the program body; click in the
 grey margin next to a line number to add a breakpoint.  The highlighted line in
@@ -36,43 +36,34 @@ See :ref:`config_py` for more information on configuration settings.
 Desktop Runtime Standalone Application
 ======================================

-The Desktop Runtime is based on `NWjs <https://nwjs.io/>`_ which integrates a
+The Desktop Runtime is based on `Electron <https://www.electronjs.org/>`_ which integrates a
 browser and the Python server creating a standalone application.

 .. image:: images/runtime_standalone.png
    :alt: Runtime Standalone
    :align: center

-Runtime Menu
------------
+Runtime Menu Items
+------------------

 .. image:: images/runtime_menu.png
    :alt: Runtime Menu
    :align: center

-Use the *File Menu* to access the *Runtime Menu*:
+Use the *File Menu* to access the runtime menu items:

 +-------------------------+---------------------------------------------------------------------------------------------------------+
 | Option                  | Action                                                                                                  |
 +=========================+=========================================================================================================+
-| *Configure...*          | Click to open configuration dialog to configure fixed port, port number and connection timeout.         |
+| *View logs...*          | Click to open the view log dialog to view the pgAdmin 4 logs.                                           |
 +-------------------------+---------------------------------------------------------------------------------------------------------+
-| *View log...*           | Click to open the view log dialog to view the pgAdmin 4 logs.                                           |
-+-------------------------+---------------------------------------------------------------------------------------------------------+
-| *Enter Full Screen*     | Click to enter/exit the full screen mode. Keyboard Shortcuts: OSX (Cmd + Ctrl + F), Other OS (F10).     |
-+-------------------------+---------------------------------------------------------------------------------------------------------+
-| *Actual Size*           | Click to change the window size to it original size. Keyboard Shortcuts: OSX (Cmd + 0),                 |
-|                         | Other OS (Ctrl + 0).                                                                                    |
-+-------------------------+---------------------------------------------------------------------------------------------------------+
-| *Zoom In*               | Click to increase the zoom level. Keyboard Shortcuts: OSX (Cmd + +), Other OS (Ctrl + +).               |
-+-------------------------+---------------------------------------------------------------------------------------------------------+
-| *Zoom Out*              | Click to decrease the zoom level. Keyboard Shortcuts: OSX (Cmd + -), Other OS (Ctrl + -).               |
+| *Configure runtime...*  | Click to open configuration dialog to configure fixed port, port number and connection timeout.         |
 +-------------------------+---------------------------------------------------------------------------------------------------------+

 Configuration Dialog
 --------------------

-Use the *Runtime Menu* to access the *Configuration* dialog:
+Use the *Configure runtime...* option to access the *Configuration* dialog:

 .. image:: images/runtime_configuration.png
    :alt: Runtime Configuration
@@ -101,7 +92,7 @@ Timeout*, and 'Open Documentation in Default Browser?' configuration parameters:
 Log dialog
 ----------

-Use the *Runtime Menu* to access the *Log* dialog:
+Use the *File Menu* to access the *View Logs* dialog:

 .. image:: images/runtime_view_log.png
    :alt: Runtime View Log
@@ -212,6 +212,7 @@ To add new column(s) in data sorting grid, click on the [+] icon.

 * Use the drop-down *Column* to select the column you want to sort.
 * Use the drop-down *Order* to select the sort order for the column.
+* Use the drop-down *NULLs* to select the NULL values order for the column.

 To delete a row from the grid, click the trash icon.

@@ -48,9 +48,9 @@ File Options
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | Icon                 | Behavior                                                                                          | Shortcut       |
   +======================+===================================================================================================+================+
-   | *Open File*          | Click the *Open File* icon to load a previously saved diagram.                                    | Ctrl + O       |
+   | *Open File*          | Click the *Open File* icon to load a previously saved diagram.                                    | Cmd/Ctrl + O   |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Save*               | Click the *Save* icon to perform a quick-save of a previously saved diagram, or to save the       | Ctrl + S       |
+   | *Save*               | Click the *Save* icon to perform a quick-save of a previously saved diagram, or to save the       | Cmd/Ctrl + S   |
   |                      | diagram to a file.                                                                                |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | *Save as*            | Click the *Save As* to open a new browser dialog and specify a new location to save the diagram.  | Ctrl + Shift + |
@@ -67,13 +67,13 @@ Export Options
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | Icon                 | Behavior                                                                                          | Shortcut       |
   +======================+===================================================================================================+================+
-   | *Generate SQL*       | Click the *Generate SQL* icon to generate the DDL SQL for the diagram and open a query tool       | Option + Ctrl +|
-   |                      | with the generated SQL ready for execution.                                                       | S              |
+   | *Generate SQL*       | Click the *Generate SQL* icon to generate the DDL SQL for the diagram and open a query tool       | Option/Alt +   |
+   |                      | with the generated SQL ready for execution.                                                       | Ctrl + S       |
   |                      | You can select the option *With DROP Table* if you wish to have DROP Table DDL statements before  |                |
   |                      | each CREATE Table DDL. You can see the option by clicking the down arrow beside the SQL button.   |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Download image*     | Click the *Download image* icon to save the ERD diagram in a image formate                        | Option + Ctrl +|
-   |                      |                                                                                                   | I              |
+   | *Download image*     | Click the *Download image* icon to save the ERD diagram in a image formate                        | Option/Alt +   |
+   |                      |                                                                                                   | Ctrl + I       |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+

 Editing Options