- Pin Electron to v35.4.0 as the v36 is not working on many OS.

- Pin html-to-image to v1.11.11 as latest version breaks ERD image downloads.

.github/dependabot.yml

@@ -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:

.github/workflows/check-container-build.yml

@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build-container:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/check-doc-builds.yml

@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build-docs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/check-javascript-style.yml

@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   check-javascript-style:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/check-python-build.yml

@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build-python-package:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/check-python-style.yml

@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   check-python-style:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/check-tarball-build.yml

@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build-tarball:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/check-translations.yml

@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   check-translations:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/run-feature-tests-epas.yml

@@ -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@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

.github/workflows/run-feature-tests-pg.yml

@@ -20,9 +20,9 @@ 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@v4
@@ -32,6 +32,18 @@ jobs:
           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: Uninstall PostgreSQL if already present
+        run: |
+          if [ -n "$(ls /etc/postgresql/*/*/postgresql.conf 2>/dev/null)" ]; then
+            # Extract the major version from pg_config
+            installed_pg_version=$( pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1 )
+            echo "Installed PostgreSQL version: $installed_pg_version"
+            if [ $installed_pg_version != ${{ matrix.pgver }} ]; then
+              sudo pg_dropcluster $installed_pg_version main --stop
+              sudo apt-get -y remove "postgresql-${installed_pg_version}"
+            fi
+          fi
+
       - name: Install platform dependencies
         run: |
           sudo apt update
@@ -119,7 +131,7 @@ jobs:
                 "comment": "PostgreSQL ${{ matrix.pgver }} Server",
                 "db_username": "postgres",
                 "host": "/var/run/postgresql",
-                "db_password": "postgres",
+                "db_password": "",
                 "db_port": 59${{ matrix.pgver }},
                 "maintenance_db": "postgres",
                 "sslmode": "prefer",

.github/workflows/run-javascript-tests.yml

@@ -17,7 +17,7 @@ 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 }}
 

.github/workflows/run-python-tests-epas.yml

@@ -32,7 +32,7 @@ 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 }}
 
@@ -42,15 +42,18 @@ jobs:
       - 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 edb-as${{ matrix.pgver }}-postgis34
+
+      - 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' }}
@@ -79,7 +82,7 @@ jobs:
         shell: cmd
 
       - name: Add edb_job_scheduler into config file.
-        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver == 16 }}
+        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"
@@ -98,8 +101,14 @@ 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: Create postgis extension on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
 
       - name: Install Python dependencies on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}

.github/workflows/run-python-tests-pg.yml

@@ -20,8 +20,8 @@ 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 }}
 
@@ -29,16 +29,29 @@ jobs:
       - 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: Uninstall PostgreSQL if already present on linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: |
+          if [ -n "$(ls /etc/postgresql/*/*/postgresql.conf 2>/dev/null)" ]; then
+            # Extract the major version from pg_config
+            installed_pg_version=$( pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1 )
+            echo "Installed PostgreSQL version: $installed_pg_version"
+            if [ $installed_pg_version != ${{ matrix.pgver }} ]; then
+              sudo pg_dropcluster $installed_pg_version main --stop
+              sudo apt-get -y remove "postgresql-${installed_pg_version}"
+            fi
+          fi
+
       - 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
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent postgresql-${{ matrix.pgver }}-postgis-3
 
       - name: Install platform dependencies on macOS
         if: ${{ matrix.os == 'macos-latest' }}
@@ -46,7 +59,7 @@ jobs:
           brew install postgresql@${{ matrix.pgver }}
           echo "/opt/homebrew/opt/postgresql@${{ matrix.pgver }}/bin" >> $GITHUB_PATH
 
-      - name: Uninstall PostgreSQL if already present
+      - name: Uninstall PostgreSQL if already present on windows
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
           if exist "C:\Program Files\PostgreSQL\{{ matrix.pgver }}\uninstall-postgresql.exe" (
@@ -62,13 +75,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 }}
@@ -86,20 +99,21 @@ 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;'
+          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION postgis;'
 
       - name: Start PostgreSQL on macOS
         if: ${{ matrix.os == 'macos-latest' }}
@@ -107,16 +121,16 @@ jobs:
           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 /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
@@ -131,25 +145,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"
@@ -157,7 +171,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": {
@@ -181,7 +195,7 @@ 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",
@@ -206,7 +220,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.
@@ -231,7 +245,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": {
@@ -278,7 +292,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

.github/workflows/sonarqube-scan.yml

@@ -22,7 +22,7 @@ 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@v4

Dockerfile

@@ -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
 #
 #########################################################################
@@ -125,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
 
@@ -154,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.
 #########################################################################
@@ -165,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.6 /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 && \
+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.9.4 /usr/lib/liblz4.so.1
+    ln -s liblz4.so.1.10.0 /usr/lib/liblz4.so.1
 
 WORKDIR /pgadmin4
 ENV PYTHONPATH=/pgadmin4
@@ -191,6 +197,7 @@ COPY DEPENDENCIES /pgadmin4/DEPENDENCIES
 # Install runtime dependencies and configure everything in one RUN step
 RUN apk add --no-cache \
         python3 \
+        bash \
         py3-pip \
         postfix \
         krb5-libs \
@@ -201,7 +208,7 @@ RUN apk add --no-cache \
         libedit \
         libldap \
         libcap && \
-    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==22.0.0 && \
+    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==23.0.0 && \
     find / -type d -name '__pycache__' -exec rm -rf {} + && \
     useradd -r -u 5050 -g root -s /sbin/nologin pgadmin && \
     mkdir -p /run/pgadmin /var/lib/pgadmin && \
@@ -215,7 +222,7 @@ RUN apk add --no-cache \
     echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix && \
     echo "pgadminr ALL = NOPASSWD: /usr/sbin/postfix start" >> /etc/sudoers.d/postfix
 
-USER pgadmin
+USER 5050
 
 # Finish up
 VOLUME /var/lib/pgadmin

LICENSE

@@ -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

Make.bat

@@ -52,15 +52,13 @@ 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\version.py')  DO SET APP_MAJOR=%%a
@@ -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.
@@ -286,6 +284,7 @@ REM Main build sequence Ends
 
     REM WGET
     FOR /f "tokens=*" %%i IN ('npm info electron version') DO SET "ELECTRON_VERSION=%%i"
+    SET ELECTRON_VERSION="35.4.0"
     :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
@@ -310,7 +309,7 @@ REM Main build sequence Ends
     %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-product-version "%APP_VERSION%""
 
     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 ************************************************************
@@ -325,6 +324,8 @@ REM Main build sequence Ends
     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
+    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%
@@ -333,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
@@ -351,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
@@ -376,7 +377,7 @@ REM Main build sequence Ends
 
 :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 ************************************************************

Makefile

@@ -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
 #
 #########################################################################

README.md

@@ -15,33 +15,51 @@ 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 Electron based runtime application intended to allow this,
-which will execute the Python server and display the UI.
+which will fork a Python server process and display the UI.
 
-## Building the Runtime
+## Prerequisites
+1. Install Node.js 20 and above (https://nodejs.org/en/download)
+2. yarn (https://yarnpkg.com/getting-started/install)
+3. Python 3.8 and above (https://www.python.org/downloads/)
+4. PostgreSQL server (https://www.postgresql.org/download)
 
-To build the runtime, the following packages must be installed:
+Start by enabling Corepack, if it isn't already;
+this will add the yarn binary to your PATH:
+```bash
+corepack enable
+```
 
-* NodeJS 16+
-* Yarn
+# Building the Web Assets
 
-Change into the runtime directory, and run *yarn install*. This will install the
-dependencies required.
+pgAdmin is dependent on a number of third party Javascript libraries. These,
+along with it's own Javascript code, CSS code and images must be
+compiled into a "bundle" which is transferred to the browser for execution
+and rendering. This is far more efficient than simply requesting each
+asset as it's needed by the client.
 
-In order to use the runtime in a development environment, you'll need to copy
-*dev_config.json.in* file to *dev_config.json*, and edit the paths to the Python
-executable and *pgAdmin.py* file, otherwise the runtime will use the default
-paths it would expect to find in the standard package for your platform.
-
-You can then execute the runtime by running something like:
+To create the bundle, you will need the 'yarn' package management tool to be
+installed. Then, you can run the following commands on a *nix system to
+download the required packages and build the bundle:
 
 ```bash
-yarn run start
+$ cd $PGADMIN4_SRC
+$ make install-node
+$ make bundle
+```
+
+On Windows systems (where "make" is not available), the following commands
+can be used:
+
+```
+C:\> cd $PGADMIN4_SRC\web
+C:\$PGADMIN4_SRC\web> yarn install
+C:\$PGADMIN4_SRC\web> yarn run bundle
 ```
 
 # Configuring the Python Environment
 
 In order to run the Python code, a suitable runtime environment is required.
-Python version 3.7 and later are currently supported. It is recommended that a
+Python version 3.8 and later are currently supported. It is recommended that a
 Python Virtual Environment is setup for this purpose, rather than using the
 system Python environment. On Linux and Mac systems, the process is fairly
 simple - adapt as required for your distribution:
@@ -63,7 +81,7 @@ simple - adapt as required for your distribution:
    so update that to the latest:
 
    ```bash
-   $ pip install --upgrade pip
+   (venv) $ pip install --upgrade pip
    ```
 
 4. Ensure that a PostgreSQL installation's bin/ directory is in the path (so
@@ -88,36 +106,44 @@ simple - adapt as required for your distribution:
    configuration may look like:
 
     ```python
-    from config import *
+   import os
+   import logging
 
-    # Debug mode
-    DEBUG = True
+   # Change pgAdmin data directory
+   DATA_DIR = '/Users/myuser/.pgadmin_dev'
 
-    # App mode
-    SERVER_MODE = True
+   #Change pgAdmin server and port
+   DEFAULT_SERVER = '127.0.0.1'
+   DEFAULT_SERVER_PORT = 5051
 
-    # Enable the test module
-    MODULE_BLACKLIST.remove('test')
+   # Switch between server and desktop mode
+   SERVER_MODE = True
 
-    # Log
-    CONSOLE_LOG_LEVEL = DEBUG
-    FILE_LOG_LEVEL = DEBUG
+   #Change pgAdmin config DB path in case external DB is used.
+   CONFIG_DATABASE_URI="postgresql://postgres:postgres@localhost:5436/pgadmin"
 
-    DEFAULT_SERVER = '127.0.0.1'
+   #Setup SMTP
+   MAIL_SERVER = 'smtp.gmail.com'
+   MAIL_PORT = 465
+   MAIL_USE_SSL = True
+   MAIL_USERNAME = 'user@gmail.com'
+   MAIL_PASSWORD = 'xxxxxxxxxx'
 
-    UPGRADE_CHECK_ENABLED = True
+   # Change log level
+   CONSOLE_LOG_LEVEL = logging.INFO
+   FILE_LOG_LEVEL = logging.INFO
 
-    # Use a different config DB for each server mode.
-    if SERVER_MODE == False:
-        SQLITE_PATH = os.path.join(
-            DATA_DIR,
-            'pgadmin4-desktop.db'
-        )
-    else:
-        SQLITE_PATH = os.path.join(
-            DATA_DIR,
-            'pgadmin4-server.db'
-        )
+   # Use a different config DB for each server mode.
+   if SERVER_MODE == False:
+     SQLITE_PATH = os.path.join(
+         DATA_DIR,
+         'pgadmin4-desktop.db'
+     )
+   else:
+     SQLITE_PATH = os.path.join(
+         DATA_DIR,
+         'pgadmin4-server.db'
+     )
    ```
 
    This configuration allows easy switching between server and desktop modes
@@ -137,9 +163,9 @@ simple - adapt as required for your distribution:
    (venv) $ python3 $PGADMIN4_SRC/web/pgAdmin4.py
    ```
 
-   Whilst it is possible to automatically run setup in desktop mode by running
-   the runtime, that will not work in server mode as the runtime doesn't allow
-   command line interaction with the setup program.
+Whilst it is possible to automatically run setup in desktop mode by running
+the runtime, that will not work in server mode as the runtime doesn't allow
+command line interaction with the setup program.
 
 At this point you will be able to run pgAdmin 4 from the command line in either
 server or desktop mode, and access it from a web browser using the URL shown in
@@ -148,49 +174,6 @@ the terminal once pgAdmin has started up.
 Setup of an environment on Windows is somewhat more complicated unfortunately,
 please see *pkg/win32/README.txt* for complete details.
 
-# Building the Web Assets
-
-pgAdmin is dependent on a number of third party Javascript libraries. These,
-along with it's own Javascript code, SCSS/CSS code and images must be
-compiled into a "bundle" which is transferred to the browser for execution
-and rendering. This is far more efficient than simply requesting each
-asset as it's needed by the client.
-
-To create the bundle, you will need the 'yarn' package management tool to be
-installed. Then, you can run the following commands on a *nix system to
-download the required packages and build the bundle:
-
-```bash
-(venv) $ cd $PGADMIN4_SRC
-(venv) $ make install-node
-(venv) $ make bundle
-```
-
-On Windows systems (where "make" is not available), the following commands
-can be used:
-
-```
-C:\> cd $PGADMIN4_SRC\web
-C:\$PGADMIN4_SRC\web> yarn install
-C:\$PGADMIN4_SRC\web> yarn run bundle
-```
-
-# Creating pgAdmin themes
-
-To create a pgAdmin theme, you need to create a directory under
-*web/pgadmin/static/scss/resources*.
-Copy the sample file *_theme.variables.scss.sample* to the new directory and
-rename it to *_theme.variables.scss*. Change the desired hexadecimal values of
-the colors and bundle pgAdmin. You can also add a preview image in the theme
-directory with the name as *\<dir name>_preview.png*. It is recommended that the
-preview image should not be larger in size as it may take time to load on slow
-networks. Run the *yarn run bundle* and you're good to go. No other changes are
-required, pgAdmin bundle will read the directory and create other required
-entries to make them available in preferences.
-
-The name of the theme is derived from the directory name. Underscores (_) and
-hyphens (-) will be replaced with spaces and the result will be camel cased.
-
 # Building the documentation
 
 In order to build the docs, an additional Python package is required in the
@@ -210,6 +193,21 @@ The docs can then be built using the Makefile in *$PGADMIN4_SRC*, e.g.
 
 The output can be found in *$PGADMIN4_SRC/docs/en_US/_build/html/index.html*
 
+## Building the Runtime
+Change into the runtime directory, and run *yarn install*. This will install the
+dependencies required.
+
+In order to use the runtime in a development environment, you'll need to copy
+*dev_config.json.in* file to *dev_config.json*, and edit the paths to the Python
+executable and *pgAdmin.py* file, otherwise the runtime will use the default
+paths it would expect to find in the standard package for your platform.
+
+You can then execute the runtime by running something like:
+
+```bash
+yarn run start
+```
+
 # Building packages
 
 Most packages can be built using the Makefile in $PGADMIN4_SRC, provided all

SECURITY.md

@@ -0,0 +1,82 @@
+# Security Policy
+
+## Supported Versions
+
+Only the latest version receives security updates. Users are encouraged to upgrade to the latest stable release.
+
+
+## Reporting a Vulnerability
+
+We take security seriously and appreciate your efforts to responsibly disclose vulnerabilities. If you believe you have found a vulnerability, please follow the guidelines below to submit a report.
+
+### **What to Include in Your Report**
+To help us quickly understand and address the issue, please include the following sections in your report:
+
+#### 1. **Summary**
+   - A brief description of the vulnerability.
+
+#### 2. **Affected Versions**
+   - The version(s) of the project affected by the vulnerability.
+   - Example: "Affects versions 3.4.0 to 3.6.23."
+
+#### 3. **Details**
+   - A detailed explanation of the vulnerability, including:
+     - How to reproduce the issue (step-by-step instructions).
+     - The code or component where the vulnerability exists.
+     - The expected vs. actual behavior.
+
+#### 4. **Proof of Concept (PoC)**
+   - Provide a proof of concept to demonstrate the vulnerability. This could be:
+     - Code snippets.
+     - Screenshots or videos.
+     - A minimal reproducible example.
+
+#### 5. **Patches (if applicable)**
+   - If you have a suggested fix or patch, include it in your report.
+   - Example: "Sanitize user input using `DOMPurify`."
+
+#### 6. **Impact**
+   - Describe the potential impact of the vulnerability, such as:
+     - Remote Code Execution.
+     - CSRF.
+     - Data exposure.
+     - Denial of service.
+
+
+
+### **What to Expect**
+- **Acknowledgement**: You will receive an acknowledgement of your report within **48 hours**.
+- **Timeline**: We will provide a timeline for investigating and addressing the issue.
+- **Updates**: You will receive regular updates on the progress of the vulnerability resolution.
+- **CVE ID**: If the vulnerability is confirmed, we will request a CVE ID to acknowledge the issue officially and include it in the release notes.
+
+
+### **Out of Scope**
+The following issues are considered out of scope for security reports:
+- Vulnerabilities in outdated or unsupported versions.
+- Issues related to non-security-impacting bugs or feature requests.
+- Vulnerabilities requiring physical access to the device or social engineering.
+
+
+
+## Security Updates
+
+We are committed to providing timely security updates for supported versions. Here’s our process:
+1. **Assessment**:
+   - All reported vulnerabilities are assessed for severity and impact.
+2. **Patch Development**:
+   - Patches are developed and tested in a private repository to prevent premature disclosure.
+3. **Release**:
+   - Security patches are released as soon as possible, along with a detailed advisory.
+
+
+
+## Acknowledgments
+
+We deeply appreciate the efforts of security researchers and users who help us improve the security of our project.
+
+
+
+## Contact
+
+For any questions or concerns regarding security, please contact us at `security@pgadmin.org`.

docs/en_US/code_review.rst

@@ -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.
 

docs/en_US/coding_standards.rst

@@ -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
     #
     ##########################################################################

docs/en_US/container_deployment.rst

@@ -53,11 +53,11 @@ 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`.
@@ -134,6 +134,14 @@ 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 `Servers JSON file <https://www.pgadmin.org/docs/pgadmin4/latest/import_export_servers.html#json-format>`_.
 
+**PGADMIN_REPLACE_SERVERS_ON_STARTUP**
+
+*Default: null*
+
+By default, the server definitions are only loaded on first launch, i.e. when initializing the configuration database. See PGADMIN_SERVER_JSON_FILE above.
+
+If this variable is set to True, the server definitions will be replaced on every launch. This can be used to declaratively manage the server definitions.
+
 **PGADMIN_PREFERENCES_JSON_FILE**
 
 *Default: /pgadmin4/preferences.json*
@@ -142,6 +150,21 @@ Override the default file path for the preferences customization at the containe
 /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**
 
 *Default: -* (stdout)

docs/en_US/database_dialog.rst

@@ -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.

docs/en_US/desktop_deployment.rst

@@ -43,36 +43,27 @@ browser and the Python server creating a standalone application.
     :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

docs/en_US/directory_dialog.rst

@@ -0,0 +1,87 @@
+.. _directory_dialog:
+
+*************************
+`Directory Dialog`:index:
+*************************
+
+Use the Directory dialog to create an alias for a file system directory path.
+To create directories, you must have the CREATE ANY DIRECTORY system privilege.
+When you create a directory, you are automatically granted READ and WRITE privileges
+on the directory, and you can grant READ and WRITE privileges to other users and roles.
+The superuser can also grant these privileges to other users and roles.
+
+Please note that directories are supported when connected to EDB Postgres Advanced Server.
+For more information about using directories, please see the EDB Postgres Advanced Server Guide, available at:
+
+   https://www.enterprisedb.com/docs/epas/latest/epas_compat_sql/
+
+
+The *Directory* dialog organizes the definition of a directory through the
+following tabs: *General*, *Definition*, *Security*, and *SQL*.
+The *SQL* tab displays the SQL code generated by dialog selections.
+
+.. image:: images/directory_general.png
+    :alt: Directory general tab
+    :align: center
+
+Use the fields on the *General* tab to specify directory attributes:
+
+* Use the *Name* field to add a directory alias name. This name will be displayed in the object explorer.
+* Select the owner of the directory from the drop-down listbox in the *Owner*
+  field.
+
+Click the *Definition* tab to continue.
+
+.. image:: images/directory_definition.png
+    :alt: Directory dialog definition tab
+    :align: center
+
+* Use the *Location* field to specify a fully qualified directory path represented
+  by the alias name. The CREATE DIRECTORY command doesn't create the operating system directory.
+  The physical directory must be created independently using operating system commands.
+
+Click the *Security* tab to continue.
+
+.. image:: images/directory_security.png
+    :alt: Directory dialog security tab
+    :align: center
+
+NOTE:- This *Security* tab will be only available for EPAS 17.
+
+Use the *Security* tab to assign privileges for the directory.
+
+Use the *Privileges* panel to assign security privileges. Click the *Add* icon
+(+) to assign a set of privileges:
+
+* Select the name of the role from the drop-down listbox in the *Grantee* field.
+* The current user, who is the default grantor for granting the privilege, is displayed in the *Grantor* field.
+* Click inside the *Privileges* field. Check the boxes to the left of one or
+  more privileges to grant the selected privileges to the specified user.
+
+Click the *Add* icon to assign additional sets of privileges; to discard a
+privilege, click the trash icon to the left of the row and confirm deletion in
+the *Delete Row* popup.
+
+Click the *SQL* tab to continue.
+
+Your entries in the *Directory* 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 *Directory* dialog:
+
+.. image:: images/directory_sql.png
+    :alt: Directory dialog sql tab
+    :align: center
+
+The example shown demonstrates creating a directory named *test1*. It has a
+*location* value equal to */home/test_dir*.
+
+* Click the *Info* button (i) to access online 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.

docs/en_US/editgrid.rst

@@ -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.
 

docs/en_US/erd_tool.rst

@@ -207,6 +207,22 @@ The table node shows table details in a graphical representation:
 * you can click on the node and drag to move on the canvas.
 * Upon double click on the table node or by clicking the edit button from the toolbar, the table dialog opens where you can change the table details. Refer :ref:`table dialog <table_dialog>` for information on different fields.
 
+The One to One Link Dialog
+***************************
+
+.. image:: images/erd_11_dialog.png
+    :alt: ERD tool 1-1 dialog
+    :align: center
+
+The one to one link dialog allows you to:
+
+* Add a one to one relationship between two tables.
+* *Local Table* is the table that references a table and has the *one* end point.
+* *Local Column* the column that references.
+* *Select Constraint* To implement one to one relationship, the *Local Column* must have primaty key or unique constraint. The default is a unique constraint. Please note that this field is visible only when the selected *Local Column* does not have either of the mentioned constraints.
+* *Referenced Table* is the table that is being referred and has the *one* end point.
+* *Referenced Column* the column that is being referred.
+
 The One to Many Link Dialog
 ***************************
 

docs/en_US/export_data_using_query.rst

@@ -0,0 +1,91 @@
+.. _export_data_using_query:
+
+***************************************
+`Export Data Using Query Dialog`:index:
+***************************************
+
+Use the *Export Data Using Query* dialog to copy data to a file.
+
+The *Export Data Using Query* dialog organizes the export of data through the
+*General*, *Options* and *Query* tabs.
+
+.. image:: images/export_query_general.png
+    :alt: Export data using query dialog general tab
+    :align: center
+
+Use the fields in the *General* tab to specify export preferences:
+
+* Enter the name of the target file in the *Filename* field.
+  Optionally, select the *Browse* icon (ellipsis) to the right to navigate
+  into a directory and select a file.
+
+* Use the drop-down listbox in the *Format* field to specify the file type.
+  Select:
+
+  * *binary* for a .bin file.
+  * *csv* for a .csv file.
+  * *text* for a .txt file.
+
+* Use the drop-down listbox in the *Encoding* field to specify the type of
+  character encoding.
+
+.. image:: images/export_query_options.png
+    :alt: Export data using query dialog options tab
+    :align: center
+
+* Use the fields in the *Options* tab to specify additional information:
+
+   * Move the *Header* switch to the *Yes* position to include the table header
+     with the data rows. If you include the table header, the first row of the
+     file will contain the column names.
+   * If you are exporting data, specify the delimiter that will separate the
+     columns within the target file in the *Delimiter* field. The separating
+     character can be a colon, semicolon, a vertical bar, or a tab.
+   * Specify a quoting character used in the *Quote* field. Quoting can be
+     applied to string columns only (i.e. numeric columns will not be quoted)
+     or all columns regardless of data type. The character used for quoting can
+     be a single quote or a double quote.
+   * Specify a character that should appear before a data character that matches
+     the *QUOTE* value in the *Escape* field.
+   * Use the *NULL String* field to specify a string that will represent a null
+     value within the source or target file.
+
+Click the *Query* tab to continue.
+
+.. image:: images/export_query.png
+    :alt: Export data using query dialog query tab
+    :align: center
+
+Use the fields in the *Query* tab to write the query that will be exported:
+
+* Use the *Export Data Query* field to specifies A SELECT, VALUES, INSERT, UPDATE,
+  DELETE, or MERGE command whose results are to be copied .
+
+* Use *Force Quote columns* field to forces quoting to be used for all non-NULL
+  values in each specified column. NULL output is never quoted. This is a creatable
+  select control. If you would like to quote all columns then provide only '*' in
+  the field.
+
+After completing the *Export Data Using Query* dialog, click the *OK* button to
+perform the export. pgAdmin will notify you when the background
+process completes:
+
+.. image:: images/export_query_complete.png
+    :alt: Export data using query completion notification
+    :align: center
+
+
+Use the *View Processes* button on the notification to open the *Process
+Watcher* and review detailed information about the execution of the command
+that performed the export:
+
+Use the **End Process** button to end the Export process.
+
+.. image:: images/export_query_pw.png
+    :alt: Export data using query process watcher
+    :align: center
+
+.. note:: If you are running *pgAdmin* in *Server Mode* you can click on the |sm_icon| icon in the process watcher window to open the file location in the Storage Manager. You can use the :ref:`Storage Manager <storage_manager>` to download the exported file on the client machine .
+
+
+.. |sm_icon| image:: images/sm_icon.png