Fixed a security issue where the OAuth2 client ID and secret exposed through the web browser (CVE-2024-9014). #7945

Fixed the dynamic column updation in the Unique & Primary Keys while creating a table.
* Updated the columns for the unique and primary keys while creating a table. Use the 'editable' option for a Cell instead of 'disabled'. * Don't need to define the hidden member as fields in GridHeaderSchema * Updated the columns for the exclusion constraints while creating a table. * Signaled the relevant field, when column options have changed, for all the children of a table. * Use current snapshot of data for the GrigFormHeadeer * Fixed the styling for the search input box * Don't check for the 'colOptions.editable' flag, as it could be indirect call as well.
2026-10-28 23:50:04 -05:00 · 2024-09-20 08:45:37 +05:30 · 2024-09-19 18:57:09 +05:30 · 2024-09-19 18:54:38 +05:30 · 2024-09-19 14:03:43 +05:30 · 2024-09-19 10:51:06 +05:30
1028 changed files with 107724 additions and 74609 deletions
@@ -1,4 +1,3 @@
-.git
 web/node_modules
 web/*.log
 web/regression
@@ -17,7 +17,12 @@ jobs:
    runs-on: ubuntu-latest

    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: .
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest

    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
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest

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

      - name: Upgrade yarn
        run: |
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest

    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/*
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest

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

      - name: Install Python dependencies
        run: |
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest

    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/*
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest

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

      - name: Install platform dependencies
        run: |
@@ -26,7 +26,7 @@ jobs:
    runs-on: ubuntu-latest

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

      - name: Setup the EDB APT repo on Linux
        run: |
@@ -157,21 +157,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
@@ -25,7 +25,7 @@ jobs:
    runs-on: ubuntu-latest

    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
@@ -22,11 +22,11 @@ jobs:
    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: |
@@ -37,7 +37,7 @@ jobs:
    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' }}
@@ -78,6 +78,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: |
@@ -272,14 +278,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
@@ -26,7 +26,7 @@ jobs:
    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' }}
@@ -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' }}
@@ -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' }}
@@ -103,11 +104,11 @@ jobs:
      - 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
@@ -185,10 +186,10 @@ jobs:
                "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": ""
                }
              }
@@ -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
@@ -25,7 +25,7 @@ jobs:
    runs-on: ubuntu-latest

    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
@@ -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 && \
@@ -162,12 +166,12 @@ 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/libzstd.so.1.5.6 /usr/lib/
 COPY --from=pg16-builder /usr/lib/liblz4.so.1.9.4 /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 libzstd.so.1.5.6 /usr/lib/libzstd.so.1 && \
    ln -s liblz4.so.1.9.4 /usr/lib/liblz4.so.1

 WORKDIR /pgadmin4
@@ -185,7 +189,7 @@ 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 \
        py3-pip \
        postfix \
@@ -197,17 +201,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

@@ -217,6 +217,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 +233,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,45 +264,51 @@ 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"
+    :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"
    IF %ERRORLEVEL% NEQ 0 (
@@ -309,17 +319,13 @@ 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
+    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
@@ -366,6 +372,8 @@ 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%"
@@ -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.

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

@@ -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,7 +36,7 @@ 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
@@ -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