Fixed Windows issue with the combination of Python 3.8, bcrypt 3.1.7, and Cryptography 3.0

2. Updated the create "pldbgapi" extension for the debugger.

refs #5343

.gitignore

@@ -41,6 +41,7 @@ web/config_local.py
 web/pgadmin/misc/themes/pgadmin.themes.json
 web/geckodriver.log
 web/regression/test_config.json
+web/regression/.coveragerc
 node_modules/
 web/pgAdmin/static/js/generated
 web/pgadmin/static/js/generated
@@ -48,3 +49,10 @@ web/yarn-error.log
 /web/cacert.pem
 auditjs.html
 auditpy.txt
+/venv/
+.scannerwork/
+web/coverage/
+web/.coverage
+web/regression/.coverage
+web/regression/covhtml/
+web/regression/htmlcov/

Dockerfile

@@ -12,7 +12,7 @@
 # and clean up the web/ source code
 #########################################################################
 
-FROM node:10-alpine AS app-builder
+FROM node:12-alpine3.11 AS app-builder
 
 RUN apk add --no-cache \
     autoconf \
@@ -45,12 +45,10 @@ RUN npm install && \
 	npm audit fix && \
 	rm -f yarn.lock && \
 	yarn import && \
-# Commented the below line to avoid vulnerability in decompress package and
-# audit only dependencies folder. Refer https://www.npmjs.com/advisories/1217.
-# Pull request is already been send https://github.com/kevva/decompress/pull/73,
-# once fixed we will uncomment it.
+# Commented the below line to avoid vulnerability in lodash package.
+# Refer https://www.npmjs.com/advisories/1523.
+# Once fixed we will uncomment it.
 #	yarn audit && \
-	yarn audit --groups dependencies && \
 	rm -f package-lock.json && \
     yarn run bundle && \
     rm -rf node_modules \
@@ -66,7 +64,7 @@ RUN npm install && \
 # Now, create a documentation build container for the Sphinx docs
 #########################################################################
 
-FROM python:3.7-alpine3.10 as docs-builder
+FROM python:3.8-alpine3.11 as docs-builder
 
 # Install only dependencies absolutely required for documentation building
 RUN apk add --no-cache \
@@ -98,21 +96,15 @@ RUN LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 make -C /pgadmin4/docs/en_US -f Makefile
 # Create additional builders to get all of the PostgreSQL utilities
 #########################################################################
 
-FROM postgres:9.4-alpine as pg94-builder
 FROM postgres:9.5-alpine as pg95-builder
 FROM postgres:9.6-alpine as pg96-builder
 FROM postgres:10-alpine as pg10-builder
 FROM postgres:11-alpine as pg11-builder
 FROM postgres:12-alpine as pg12-builder
 
-FROM alpine:3.10 as tool-builder
+FROM alpine:3.11 as tool-builder
 
 # Copy the PG binaries
-COPY --from=pg94-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.4/
-COPY --from=pg94-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-9.4/
-COPY --from=pg94-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-9.4/
-COPY --from=pg94-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-9.4/
-
 COPY --from=pg95-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.5/
 COPY --from=pg95-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-9.5/
 COPY --from=pg95-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-9.5/
@@ -142,7 +134,7 @@ COPY --from=pg12-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-12/
 # Assemble everything into the final container.
 #########################################################################
 
-FROM python:3.7-alpine3.10
+FROM python:3.8-alpine3.11
 
 COPY --from=tool-builder /usr/local/pgsql /usr/local/
 
@@ -154,6 +146,10 @@ COPY --from=app-builder /pgadmin4/web /pgadmin4
 COPY --from=docs-builder /pgadmin4/docs/en_US/_build/html/ /pgadmin4/docs
 COPY requirements.txt /pgadmin4/requirements.txt
 
+# License files
+COPY LICENSE /pgadmin4/LICENSE
+COPY DEPENDENCIES /pgadmin4/DEPENDENCIES
+
 # Install build-dependencies, build & install C extensions and purge deps in
 # one RUN step
 RUN apk add --no-cache --virtual \
@@ -181,6 +177,7 @@ RUN ln -sf /usr/lib/libpq.so.5.12 /usr/lib/libpq.so.5
 
 # Copy the runner script
 COPY pkg/docker/run_pgadmin.py /pgadmin4
+COPY pkg/docker/gunicorn_config.py /pgadmin4
 COPY pkg/docker/entrypoint.sh /entrypoint.sh
 
 # Precompile and optimize python code to save time and space on startup
@@ -194,7 +191,7 @@ RUN groupadd -g 5050 pgadmin && \
     chown pgadmin:pgadmin /var/log/pgadmin && \
     touch /pgadmin4/config_distro.py && \
     chown pgadmin:pgadmin /pgadmin4/config_distro.py && \
-    setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/python3.7
+    setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/python3.8
 USER pgadmin
 
 # Finish up

Make.bat

@@ -2,23 +2,26 @@
 SETLOCAL
 
 SET WD=%CD%
-SET "PGBUILDPATH=%WD%\win-build"
+SET "BUILDROOT=%WD%\win-build"
+SET "DISTROOT=%WD%\dist"
 
-SET CMDOPTION=""
-IF "%1" == "clean"  SET CMDOPTION="VALID"
-IF "%1" == "x86"    SET CMDOPTION="VALID"
+SET CMDOPTIONS=""
+IF "%1" == "clean" SET CMDOPTIONS="VALID"
+IF "%1" == ""      SET CMDOPTIONS="VALID"
 
-IF NOT %CMDOPTION%=="VALID" (
+IF NOT %CMDOPTIONS%=="VALID" (
     GOTO USAGE
 )
 
-SET ARCHITECTURE=%1
-
-IF "%ARCHITECTURE%"=="clean" (
+IF "%1" == "clean" (
     CALL :CLEAN
     EXIT /B %ERRORLEVEL%
 )
 
+set "ARCHITECTURE=x64"
+if "%Platform%" == "X86" (
+    set "ARCHITECTURE=x86"
+)
 
 REM Main build sequence
 CALL :SET_ENVIRONMENT
@@ -37,7 +40,7 @@ REM Main build sequence Ends
 
 :CLEAN
     ECHO Removing build directory...
-    IF EXIST "%PGBUILDPATH%" RD "%PGBUILDPATH%" /S /Q > nul || EXIT /B 1
+    IF EXIST "%BUILDROOT%" RD "%BUILDROOT%" /S /Q > nul || EXIT /B 1
 
     ECHO Removing temp build directory...
     IF EXIST "%WD%\pkg\win32\Output" rd "%WD%\pkg\win32\Output" /S /Q > nul || EXIT /B 1
@@ -50,40 +53,32 @@ REM Main build sequence Ends
 
 :SET_ENVIRONMENT
     ECHO Configuring the environment...
-    IF "%PYTHON_HOME%" == ""   SET "PYTHON_HOME=C:\Python27"
-    IF "%PYTHON_DLL%" == ""    SET "PYTHON_DLL=C:\Windows\SysWOW64\python27.dll"
-    IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\5.9.1\mingw53_32"
-    IF "%MAKE%" == ""          SET "MAKE=mingw32-make.exe"
-    IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files (x86)\PostgreSQL\10"
-    IF "%INNOTOOL%" == ""      SET "INNOTOOL=C:\Program Files (x86)\Inno Setup 5"
-    IF "%VCREDIST%" == ""      SET "VCREDIST=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\vcredist_x86.exe"
-    IF "%SIGNTOOL%" == ""      SET "SIGNTOOL=C:\Program Files\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe"
+    IF "%PGADMIN_PYTHON_DIR%" == ""   SET "PGADMIN_PYTHON_DIR=C:\Python38"
+    IF "%PGADMIN_QT_DIR%" == ""       SET "PGADMIN_QT_DIR=C:\Qt\5.14.2\msvc2017_64"
+    IF "%PGADMIN_POSTGRES_DIR%" == "" SET "PGADMIN_POSTGRES_DIR=C:\Program Files (x86)\PostgreSQL\12"
+    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 VCREDISTNAME (the filename)
-    for /f "delims=" %%i in ("%VCREDIST%") do set "VCREDISTNAME=%%~nxi"
+    REM Set REDIST_NAME (the filename)
+    set "VCREDIST_FILE=vcredist_%ARCHITECTURE%.exe"
 
     REM Set additional variables we need
-    SET "QMAKE=%QTDIR%\bin\qmake.exe"
-    FOR /F "tokens=4,5 delims=. " %%a IN ('%QMAKE% -v ^| findstr /B /C:"Using Qt version "') DO SET QT_VERSION=%%a.%%b
-
-    SET "VIRTUALENV=venv"
-    SET "TARGET_DIR=%WD%\dist"
-
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py')    DO SET APP_MAJOR=%%a
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\config.py')   DO SET APP_MINOR=%%a
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\config.py')     DO SET APP_VERSION_SUFFIX=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py')  DO SET APP_MAJOR=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\config.py') DO SET APP_MINOR=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\config.py')   DO SET APP_VERSION_SUFFIX=%%a
     REM remove single quote from the string
     SET APP_VERSION_SUFFIX=%APP_VERSION_SUFFIX:'=%
     SET APP_NAME=""
-    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\config.py')   DO SET APP_NAME=%%a
-    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G
+    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\config.py') DO SET APP_NAME=%%a
+    FOR /f "tokens=1 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c "print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G
     SET APP_VERSION=%APP_MAJOR%.%APP_MINOR%
     SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%APP_VERSION_SUFFIX%-%ARCHITECTURE%.exe
     IF "%APP_VERSION_SUFFIX%" == "" SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%ARCHITECTURE%.exe
 
     REM get Python version for the runtime build ex. 2.7.1 will be 27
-    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MAJOR=%%G
-    FOR /f "tokens=2 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MINOR=%%G
+    FOR /f "tokens=1 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MAJOR=%%G
+    FOR /f "tokens=2 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MINOR=%%G
     SET "PYTHON_VERSION=%PYTHON_MAJOR%%PYTHON_MINOR%"
 
     EXIT /B 0
@@ -91,32 +86,24 @@ REM Main build sequence Ends
 
 :VALIDATE_ENVIRONMENT
     ECHO ****************************************************************
-    ECHO                        S U M M A R Y
+    ECHO * Build summary
     ECHO ****************************************************************
-    ECHO Build path:                %PGBUILDPATH%
-    ECHO Output directory:          %TARGET_DIR%
+    ECHO Build path:                %BUILDROOT%
+    ECHO Output directory:          %DISTROOT%
     ECHO Installer name:            %INSTALLERNAME%
     ECHO.
-    ECHO Python home:               %PYTHON_HOME%
-    ECHO Python DLL:                %PYTHON_DLL%
-    ECHO Python version:            %PYTHON_VERSION%
-    ECHO Python major version:      %PYTHON_MAJOR%
-    ECHO Python minor version:      %PYTHON_MINOR%
+    ECHO Python directory:          %PGADMIN_PYTHON_DIR%
+    ECHO Python DLL:                %PGADMIN_PYTHON_DIR%\Python%PYTHON_VERSION%.dll
+    ECHO Python version:            %PYTHON_MAJOR%.%PYTHON_MINOR%
     ECHO.
-    ECHO Qt home:                   %QTDIR%
-    ECHO qmake executable:          %QMAKE%
-    ECHO Qt version:                %QT_VERSION%
+    ECHO Qt directory:              %PGADMIN_QT_DIR%
+    ECHO PostgreSQL directory:      %PGADMIN_POSTGRES_DIR%
     ECHO.
-    ECHO PostgreSQL home:           %PGDIR%
+    ECHO VC++ redist directory:     %PGADMIN_VCREDIST_DIR%
+    ECHO VC++ redist file:          %VCREDIST_FILE%
+    ECHO InnoTool directory:        %PGADMIN_INNOTOOL_DIR%
+    ECHO signtool directory:        %PGADMIN_SIGNTOOL_DIR%
     ECHO.
-    ECHO VC++ redistributable:      %VCREDIST%
-    ECHO VC++ redistributable file: %VCREDISTNAME%
-    ECHO.
-    ECHO innotool executable:       %INNOTOOL%
-    ECHO signtool executable:       %SIGNTOOL%
-    ECHO.
-    ECHO App major version:         %APP_MAJOR%
-    ECHO App minor version:         %APP_MINOR%
     ECHO App version:               %APP_VERSION%
     ECHO App version suffix:        %APP_VERSION_SUFFIX%
     ECHO App short name:            %APP_SHORTNAME%
@@ -124,88 +111,87 @@ REM Main build sequence Ends
     ECHO ****************************************************************
 
     ECHO Checking the environment...
-    IF NOT EXIST "%INNOTOOL%" (
-        ECHO !INNOTOOL! does not exist
-        ECHO Please install Innotool and set the INNOTOOL environment variable.
+    IF NOT EXIST "%PGADMIN_INNOTOOL_DIR%" (
+        ECHO !PGADMIN_INNOTOOL_DIR! does not exist
+        ECHO Please install InnoTool and set the PGADMIN_INNOTOOL_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%VCREDIST%" (
-        ECHO !VCREDIST! does not exist
-        ECHO Please install Microsoft Visual studio and set the VCREDIST environment variable.
+    IF NOT EXIST "%PGADMIN_VCREDIST_DIR%" (
+        ECHO !PGADMIN_VCREDIST_DIR! does not exist
+        ECHO Please install Microsoft Visual studio and set the PGADMIN_VCREDIST_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%QTDIR%" (
-        ECHO !QTDIR! does not exist.
-        ECHO Please install Qt and set the QTDIR environment variable.
+    IF NOT EXIST "%PGADMIN_QT_DIR%" (
+        ECHO !PGADMIN_QT_DIR! does not exist.
+        ECHO Please install Qt and set the PGADMIN_QT_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%QMAKE%" (
+    IF NOT EXIST "%PGADMIN_QT_DIR%\bin\qmake.exe" (
         ECHO !QMAKE! does not exist.
-        ECHO Please install Qt and set the QTDIR environment variable.
+        ECHO Please install Qt and set the PGADMIN_QT_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%PYTHON_HOME%" (
-        ECHO !PYTHON_HOME! does not exist.
-        ECHO Please install Python and set the PYTHON_HOME environment variable.
+    IF NOT EXIST "%PGADMIN_PYTHON_DIR%" (
+        ECHO !PGADMIN_PYTHON_DIR! does not exist.
+        ECHO Please install Python and set the PGADMIN_PYTHON_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%PYTHON_DLL%" (
-        ECHO !PYTHON_DLL! does not exist.
-        ECHO Please install Python and set the PYTHON_DLL environment variable.
+    IF NOT EXIST "%PGADMIN_PYTHON_DIR%\Python%PYTHON_VERSION%.dll" (
+        ECHO !PGADMIN_PYTHON_DIR!\Python!PYTHON_VERSION!.dll does not exist.
+        ECHO Please check your Python installation is complete.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%PGDIR%" (
-        ECHO !PGDIR! does not exist.
-        ECHO Please install PostgreSQL and set the PGDIR environment variable.
+    IF NOT EXIST "%PGADMIN_POSTGRES_DIR%" (
+        ECHO !PGADMIN_POSTGRES_DIR! does not exist.
+        ECHO Please install PostgreSQL and set the PGADMIN_POSTGRES_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%PYTHON_HOME%\Scripts\virtualenv.exe" (
-        ECHO !PYTHON_HOME!\Scripts\virtualenv.exe does not exist.
+    IF NOT EXIST "%PGADMIN_PYTHON_DIR%\Scripts\virtualenv.exe" (
+        ECHO !PGADMIN_PYTHON_DIR!\Scripts\virtualenv.exe does not exist.
         ECHO Please install the virtualenv package in Python.
         EXIT /B 1
     )
 
-    SET "PATH=%PGDIR%\bin;%PATH%"
+    SET "PATH=%PGADMIN_POSTGRES_DIR%\bin;%PATH%"
 
     EXIT /B 0
 
 
 :CREATE_VIRTUAL_ENV
     ECHO Creating virtual environment...
-    IF NOT EXIST "%PGBUILDPATH%"  MKDIR "%PGBUILDPATH%"
+    IF NOT EXIST "%BUILDROOT%"  MKDIR "%BUILDROOT%"
     
-    CD "%PGBUILDPATH%"
-    "%PYTHON_HOME%\Scripts\virtualenv.exe" "%VIRTUALENV%"
+    CD "%BUILDROOT%"
 
-    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\DLLs" "%PGBUILDPATH%\%VIRTUALENV%\DLLs" > nul || EXIT /B 1
-    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\Lib" "%PGBUILDPATH%\%VIRTUALENV%\Lib" > nul || EXIT /B 1
+    REM Note that we must use virtualenv.exe here, as the venv module doesn't allow python.exe to relocate.
+    "%PGADMIN_PYTHON_DIR%\Scripts\virtualenv.exe" venv
 
-    ECHO Activating virtual environment -  %PGBUILDPATH%\%VIRTUALENV%...
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\activate" || EXIT /B 1
+    XCOPY /S /I /E /H /Y "%PGADMIN_PYTHON_DIR%\DLLs" "%BUILDROOT%\venv\DLLs" > nul || EXIT /B 1
+    XCOPY /S /I /E /H /Y "%PGADMIN_PYTHON_DIR%\Lib" "%BUILDROOT%\venv\Lib" > nul || EXIT /B 1
+
+    ECHO Activating virtual environment -  %BUILDROOT%\venv...
+    CALL "%BUILDROOT%\venv\Scripts\activate" || EXIT /B 1
 
     ECHO Installing dependencies...
     CALL pip install -r "%WD%\requirements.txt" || EXIT /B 1
     CALL pip install sphinx || EXIT /B 1
 
-    REM If we're using VC++, and this is Python 3.6+, we need to remove the hack
-    REM above or it will break qmake. Sigh.
-    IF "%MAKE%" == "nmake" (
-        IF %PYTHON_VERSION% GEQ 36 SET CL=
-    )
+    REM If this is Python 3.6+, we need to remove the hack above or it will break qmake. Sigh.
+    IF %PYTHON_VERSION% GEQ 36 SET CL=
 
     CD %WD%
     EXIT /B 0
 
 
 :CREATE_RUNTIME_ENV
-    MKDIR "%PGBUILDPATH%\runtime"
+    MKDIR "%BUILDROOT%\runtime"
 
     CD "%WD%\web"
 
@@ -219,33 +205,37 @@ REM Main build sequence Ends
     RD /Q /S "%WD%\web\pgadmin\static\js\generated\.cache" 1> nul 2>&1
 
     ECHO Copying web directory...
-    XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul || EXIT /B 1
+    XCOPY /S /I /E /H /Y "%WD%\web" "%BUILDROOT%\web" > nul || EXIT /B 1
 
     ECHO Cleaning up unnecessary .pyc and .pyo files...
-    FOR /R "%PGBUILDPATH%\web" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
+    FOR /R "%BUILDROOT%\web" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
     ECHO Removing tests, Python caches and node modules...
-    FOR /R "%PGBUILDPATH%\web" %%f in (tests feature_tests __pycache__ node_modules) do RD /Q /S "%%f" 1> nul 2>&1
+    FOR /R "%BUILDROOT%\web" %%f in (tests feature_tests __pycache__ node_modules) do RD /Q /S "%%f" 1> nul 2>&1
     ECHO Removing the test framework...
-    RD /Q /S "%PGBUILDPATH%\web\regression" 1> nul 2>&1
+    RD /Q /S "%BUILDROOT%\web\regression" 1> nul 2>&1
     ECHO Removing tools...
-    RD /Q /S "%PGBUILDPATH%\web\tools" 1> nul 2>&1
+    RD /Q /S "%BUILDROOT%\web\tools" 1> nul 2>&1
     ECHO Removing any existing configurations...
-    DEL /q "%PGBUILDPATH%\web\pgadmin4.db" 1> nul 2>&1
-    DEL /q "%PGBUILDPATH%\web\config_local.py" 1> nul 2>&1
-    
+    DEL /q "%BUILDROOT%\web\pgadmin4.db" 1> nul 2>&1
+    DEL /q "%BUILDROOT%\web\config_local.py" 1> nul 2>&1
+
+    ECHO Staging license files...
+    COPY "%WD%\LICENSE" "%BUILDROOT%\" > nul || EXIT /B 1
+    COPY "%WD%\DEPENDENCIES" "%BUILDROOT%\" > nul || EXIT /B 1
+
     ECHO Creating config_distro.py
-    ECHO SERVER_MODE = False > "%PGBUILDPATH%\web\config_distro.py"
-    ECHO HELP_PATH = '../../../docs/en_US/html/' >> "%PGBUILDPATH%\web\config_distro.py"
-    ECHO DEFAULT_BINARY_PATHS = { >> "%PGBUILDPATH%\web\config_distro.py"
-    ECHO     'pg':   '$DIR/../runtime', >> "%PGBUILDPATH%\web\config_distro.py"
-    ECHO     'ppas': '' >> "%PGBUILDPATH%\web\config_distro.py"
-    ECHO } >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO SERVER_MODE = False > "%BUILDROOT%\web\config_distro.py"
+    ECHO HELP_PATH = '../../../docs/en_US/html/' >> "%BUILDROOT%\web\config_distro.py"
+    ECHO DEFAULT_BINARY_PATHS = { >> "%BUILDROOT%\web\config_distro.py"
+    ECHO     'pg':   '$DIR/../runtime', >> "%BUILDROOT%\web\config_distro.py"
+    ECHO     'ppas': '' >> "%BUILDROOT%\web\config_distro.py"
+    ECHO } >> "%BUILDROOT%\web\config_distro.py"
 
     ECHO Building docs...
-    MKDIR "%PGBUILDPATH%\docs\en_US\html"
+    MKDIR "%BUILDROOT%\docs\en_US\html"
     CD "%WD%\docs\en_US"
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\python.exe" build_code_snippet.py || EXIT /B 1
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\sphinx-build.exe"   "%WD%\docs\en_US" "%PGBUILDPATH%\docs\en_US\html" || EXIT /B 1
+    CALL "%BUILDROOT%\venv\Scripts\python.exe" build_code_snippet.py || EXIT /B 1
+    CALL "%BUILDROOT%\venv\Scripts\sphinx-build.exe"   "%WD%\docs\en_US" "%BUILDROOT%\docs\en_US\html" || EXIT /B 1
 
     ECHO Removing Sphinx
     CALL pip uninstall -y sphinx Pygments alabaster colorama docutils imagesize requests snowballstemmer
@@ -254,56 +244,50 @@ REM Main build sequence Ends
     CD "%WD%\runtime"
 
     ECHO Running qmake...
-    CALL "%QMAKE%" || EXIT /B 1
+    CALL set "PGADMIN_PYTHON_DIR=%PGADMIN_PYTHON_DIR%" && "%PGADMIN_QT_DIR%\bin\qmake.exe" || EXIT /B 1
 
     ECHO Cleaning the build directory...
-    CALL %MAKE% clean || EXIT /B 1
+    CALL nmake clean || EXIT /B 1
 
     ECHO Running make...
-    CALL %MAKE% || EXIT /B 1
+    CALL nmake || EXIT /B 1
 
     ECHO Staging pgAdmin4.exe...
-    COPY "%WD%\runtime\release\pgAdmin4.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%WD%\runtime\release\pgAdmin4.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
 
     ECHO Staging Qt components...
-    COPY "%QTDIR%\bin\Qt5Core.dll"   "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%QTDIR%\bin\Qt5Gui.dll"    "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%QTDIR%\bin\Qt5Widgets.dll" "%PGBUILDPATH%\runtime" > nul  || EXIT /B 1
-    COPY "%QTDIR%\bin\Qt5Network.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%QTDIR%\bin\Qt5Svg.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%QTDIR%\bin\libgcc_s_dw2-1.dll" COPY "%QTDIR%\bin\libgcc_s_dw2-1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%QTDIR%\bin\libstdc++-6.dll" COPY "%QTDIR%\bin\libstdc++-6.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%QTDIR%\bin\libwinpthread-1.dll" COPY "%QTDIR%\bin\libwinpthread-1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    MKDIR "%PGBUILDPATH%\runtime\platforms" > nul || EXIT /B 1
-    COPY "%QTDIR%\plugins\platforms\qwindows.dll" "%PGBUILDPATH%\runtime\platforms" > nul || EXIT /B 1
-    MKDIR "%PGBUILDPATH%\runtime\imageformats" > nul || EXIT /B 1
-    COPY "%QTDIR%\plugins\imageformats\qsvg.dll" "%PGBUILDPATH%\runtime\imageformats" > nul || EXIT /B 1
-    ECHO [Paths] > "%PGBUILDPATH%\runtime\qt.conf"
-    ECHO Plugins=plugins >> "%PGBUILDPATH%\runtime\qt.conf"
+    COPY "%PGADMIN_QT_DIR%\bin\Qt5Core.dll"   "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\bin\Qt5Gui.dll"    "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\bin\Qt5Widgets.dll" "%BUILDROOT%\runtime" > nul  || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\bin\Qt5Network.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\bin\Qt5Svg.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    MKDIR "%BUILDROOT%\runtime\platforms" > nul || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\plugins\platforms\qwindows.dll" "%BUILDROOT%\runtime\platforms" > nul || EXIT /B 1
+    MKDIR "%BUILDROOT%\runtime\imageformats" > nul || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\plugins\imageformats\qsvg.dll" "%BUILDROOT%\runtime\imageformats" > nul || EXIT /B 1
+    ECHO [Paths] > "%BUILDROOT%\runtime\qt.conf"
+    ECHO Plugins=plugins >> "%BUILDROOT%\runtime\qt.conf"
 
     ECHO Staging PostgreSQL components...
-    COPY "%PGDIR%\bin\libpq.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%PGDIR%\bin\libcrypto-1_1.dll" (
-        REM OpenSSL 1.1.1
-        COPY "%PGDIR%\bin\libcrypto-1_1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-        COPY "%PGDIR%\bin\libssl-1_1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\libpq.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    IF "%ARCHITECTURE%" == "x64" (
+        COPY "%PGADMIN_POSTGRES_DIR%\bin\libcrypto-1_1-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+        COPY "%PGADMIN_POSTGRES_DIR%\bin\libssl-1_1-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
     ) ELSE (
-        REM OpenSSL 1.0.2
-        COPY "%PGDIR%\bin\ssleay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-        COPY "%PGDIR%\bin\libeay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+        COPY "%PGADMIN_POSTGRES_DIR%\bin\libcrypto-1_1.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+        COPY "%PGADMIN_POSTGRES_DIR%\bin\libssl-1_1.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
     )
-    IF EXIST "%PGDIR%\bin\libintl-*.dll" COPY "%PGDIR%\bin\libintl-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%PGDIR%\bin\libiconv-*.dll" COPY "%PGDIR%\bin\libiconv-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%PGDIR%\bin\zlib.dll" COPY "%PGDIR%\bin\zlib.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    IF EXIST "%PGDIR%\bin\zlib1.dll" COPY "%PGDIR%\bin\zlib1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\pg_dump.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\pg_dumpall.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1L%
-    COPY "%PGDIR%\bin\pg_restore.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\psql.exe" "%PGBUILDPATH%\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\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
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\psql.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
 
     ECHO Staging VC++ runtime...
-    MKDIR "%PGBUILDPATH%\installer" || EXIT /B 1
-    COPY "%VCREDIST%" "%PGBUILDPATH%\installer" > nul || EXIT /B 1
+    MKDIR "%BUILDROOT%\installer" || EXIT /B 1
+    COPY "%PGADMIN_VCREDIST_DIR%\%VCREDIST_FILE%" "%BUILDROOT%\installer" > nul || EXIT /B 1
 
     CD %WD%
     EXIT /B 0
@@ -311,51 +295,51 @@ REM Main build sequence Ends
 
 :CREATE_PYTHON_ENV
     ECHO Staging Python...
-    COPY %PYTHON_DLL% "%PGBUILDPATH%\runtime"  > nul || EXIT /B 1
-    COPY %PYTHON_HOME%\python.exe "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY %PYTHON_HOME%\pythonw.exe "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY %PGADMIN_PYTHON_DIR%\python%PYTHON_VERSION%.dll "%BUILDROOT%\runtime"  > nul || EXIT /B 1
+    COPY %PGADMIN_PYTHON_DIR%\python.exe "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    COPY %PGADMIN_PYTHON_DIR%\pythonw.exe "%BUILDROOT%\runtime" > nul || EXIT /B 1
 
     ECHO Cleaning up unnecessary .pyc and .pyo files...
-    FOR /R "%PGBUILDPATH%\%VIRTUALENV%" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
+    FOR /R "%BUILDROOT%\venv" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
     ECHO Removing tests...
-    FOR /R "%PGBUILDPATH%\%VIRTUALENV%\Lib" %%f in (test tests) do RD /Q /S "%%f" 1> nul 2>&1
+    FOR /R "%BUILDROOT%\venv\Lib" %%f in (test tests) do RD /Q /S "%%f" 1> nul 2>&1
     ECHO Removing TCL...
-    RD /Q /S "%PGBUILDPATH%\%VIRTUALENV%\tcl" 1> nul 2>&1
+    RD /Q /S "%BUILDROOT%\venv\tcl" 1> nul 2>&1
 
     EXIT /B 0
 
 
 :CREATE_INSTALLER
     ECHO Preparing for creation of windows installer...
-    IF NOT EXIST "%TARGET_DIR%" MKDIR "%TARGET_DIR%"
+    IF NOT EXIST "%DISTROOT%" MKDIR "%DISTROOT%"
 
     ECHO Copying icon file...
-    COPY "%WD%\pkg\win32\Resources\pgAdmin4.ico" "%PGBUILDPATH%" > nul || EXIT /B 1
+    COPY "%WD%\pkg\win32\Resources\pgAdmin4.ico" "%BUILDROOT%" > nul || EXIT /B 1
 
     CD "%WD%\pkg\win32"
 
     ECHO Processing installer configuration script...
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_NAME -r """%APP_NAME%"""
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%"""
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """v%APP_MAJOR%"""
+    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_NAME -r """%APP_NAME%"""
+    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_FULLVERSION -r """%APP_VERSION%"""
+    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """v%APP_MAJOR%"""
 
     SET ARCMODE=
-    IF "%ARCHITECTURE%"=="amd64" (
+    IF "%ARCHITECTURE%" == "x64" (
         set ARCMODE="x64"
     )
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage3" "-o" "%WD%\pkg\win32\installer.iss.in_stage4" "-s" MYAPP_ARCHITECTURESMODE -r """%ARCMODE%"""
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage4" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%VCREDISTNAME%"""
+    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage3" "-o" "%WD%\pkg\win32\installer.iss.in_stage4" "-s" MYAPP_ARCHITECTURESMODE -r """%ARCMODE%"""
+    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage4" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%PGADMIN_VCREDIST_DIRNAME%\%VCREDIST_FILE%"""
 
     ECHO Cleaning up...
     DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul
 
     ECHO Creating windows installer using INNO tool...
-    CALL "%INNOTOOL%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss" || EXIT /B 1
+    CALL "%PGADMIN_INNOTOOL_DIR%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss" || EXIT /B 1
 
     ECHO Renaming installer...
-    MOVE "%WD%\pkg\win32\Output\Setup.exe" "%TARGET_DIR%\%INSTALLERNAME%" > nul || EXIT /B 1
+    MOVE "%WD%\pkg\win32\Output\Setup.exe" "%DISTROOT%\%INSTALLERNAME%" > nul || EXIT /B 1
 
-    ECHO Location - %TARGET_DIR%\%INSTALLERNAME%
+    ECHO Location - %DISTROOT%\%INSTALLERNAME%
     ECHO Installer generated successfully.
 
     CD %WD%
@@ -364,7 +348,7 @@ REM Main build sequence Ends
 
 :SIGN_INSTALLER
     ECHO Attempting to sign the installer...
-    CALL "%SIGNTOOL%" sign  /t http://timestamp.verisign.com/scripts/timstamp.dll "%TARGET_DIR%\%INSTALLERNAME%"
+    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign  /t http://timestamp.verisign.com/scripts/timstamp.dll "%DISTROOT%\%INSTALLERNAME%"
     IF %ERRORLEVEL% NEQ 0 (
         ECHO.
         ECHO ************************************************************
@@ -378,15 +362,15 @@ REM Main build sequence Ends
 
 :CLEANUP_ENV
     ECHO Cleaning the build environment...
-    RD "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q 1> nul 2>&1
-    DEL /s "%PGBUILDPATH%\%VIRTUALENV%\pip-selfcheck.json" 1> nul 2>&1
+    RD "%BUILDROOT%\venv\Include" /S /Q 1> nul 2>&1
+    DEL /s "%BUILDROOT%\venv\pip-selfcheck.json" 1> nul 2>&1
 
     EXIT /B 0
 
 
 :USAGE
     ECHO Invalid command line options.
-    ECHO Usage: "Make.bat <x86 | clean>"
+    ECHO Usage: "Make.bat [clean]"
     ECHO.
 
     EXIT /B 1

Makefile

@@ -28,12 +28,10 @@ install-node:
 	cd web && npm audit fix
 	rm -f web/yarn.lock
 	cd web && yarn import
-# Commented the below line to avoid vulnerability in decompress package and
-# audit only dependencies folder. Refer https://www.npmjs.com/advisories/1217.
-# Pull request is already been send https://github.com/kevva/decompress/pull/73,
-# once fixed we will uncomment it.
+# Commented the below line to avoid vulnerability in lodash package.
+# Refer https://www.npmjs.com/advisories/1523.
+# Once fixed we will uncomment it.
 #	cd web && yarn audit
-	cd web && yarn audit --groups dependencies
 	rm -f package-lock.json
 	rm -f web/package-lock.json
 
@@ -84,6 +82,9 @@ check-feature: install-node bundle
 check-js: install-node linter
 	cd web && yarn run karma start --single-run
 
+check-js-coverage:
+    cd web && yarn run test:karma-coverage
+
 runtime-debug:
 	cd runtime && qmake CONFIG+=debug && make
 

README

@@ -1,4 +1,4 @@
-pgAdmin 4
+pgAdmin 4 
 =========
 
 pgAdmin 4 is a rewrite of the popular pgAdmin3 management tool for the
@@ -26,42 +26,46 @@ Building the Runtime
 
 To build the runtime, the following packages must be installed:
 
-- QT 4.6 or above (Use the VC++ build on Windows, not MinGW).
-- Python 2.7 or 3.4+
+- QT 5 (Use the VC++ build on Windows, not MinGW).
+- Python 3.4+
 
-Assuming both qmake and python-config are in the path:
+An environment variable named PGADMIN_PYTHON_DIR must be set to the directory
+in which Python has been installed, for example:
 
-   $ cd $PGADMIN4_SRC/runtime
-    $ qmake
-    Project MESSAGE: Building for QT5+...
-    Project MESSAGE: Building for Linux/Mac...
-    Project MESSAGE: Using /usr/bin/python-config
-    Project MESSAGE: Python2 detected.
-    $ make
-    ...
+- /usr
+- /usr/local/python-3.8
+- C:\Python38
 
-To build the runtime in debug mode, use the option below with qmake
+Assuming both qmake is in the path:
+
+  dpage@hal:~/git/pgadmin4$ cd runtime
+  dpage@hal:~/git/pgadmin4/runtime$ export PGADMIN_PYTHON_DIR=/opt/local
+  dpage@hal:~/git/pgadmin4/runtime$ qmake
+  Project MESSAGE: ==================================
+  Project MESSAGE: Configuring the pgAdmin 4 runtime.
+  Project MESSAGE: ==================================
+  Project MESSAGE: Qt version: 5
+  Project MESSAGE: Platform: macOS
+  Project MESSAGE: Python executable: /opt/local/bin/python3
+  Project MESSAGE: Python version: 3.8 (38)
+  Project MESSAGE: Python config: /opt/local/bin/python3-config
+  Project MESSAGE: CXXFLAGS: -pipe -stdlib=libc++ -I/opt/local/Library/Frameworks/Python.framework/Versions/3.8/include/python3.8 -I/opt/local/Library/Frameworks/Python.framework/Versions/3.8/include/python3.8
+  Project MESSAGE: LDFLAGS: -stdlib=libc++ -L/opt/local/Library/Frameworks/Python.framework/Versions/3.8/lib/python3.8/config-3.8-darwin -ldl -framework CoreFoundation
+  Project MESSAGE: LIBS: -lpython3.8 -ldl -framework CoreFoundation
+  dpage@hal:~/git/pgadmin4/runtime$ make
+  ...
+
+To build the runtime in debug mode, use the option below with qmake:
 $ qmake CONFIG+=debug
 
-To build the runtime in release mode, use the option below with qmake
+To build the runtime in release mode, use the option below with qmake:
 $ qmake CONFIG+=release
 
 By default, the runtime application will be built in release mode.
 
-On Linux, an executable called 'pgAdmin4' will be built, and on Mac OS X, an
-app bundle called pgAdmin4.app will be created.
-
-To build the runtime on a Windows system, export PYTHON_HOME and PYTHON_VERSION 
-variables in the System environment. Specify the PYTHON_VERSION with the major 
-and minor number. Do not specify micro level version.
-
-For example, given a Python version of A.B.C; A - Major number, B - Minor
-number, C - Micro level (Bug fix releases).
-
-If Python version is 2.7.12 than specify PYTHON_VERSION=27
-
- e.g. PYTHON_HOME=C:\Python27\
-      PYTHON_VERSION=27
+On Linux, an executable called 'pgAdmin4' will be built, on Windows,
+'pgAdmin4.exe', and on Mac OS X, an app bundle called pgAdmin4.app will be
+created.
 
 You can also use Qt Creator to build, develop and debug the runtime. Simply
 open the $PGADMIN4_SRC/runtime/pgAdmin4.pro project file in Qt Creator and
@@ -88,10 +92,10 @@ Configuring the Python Environment
 ----------------------------------
 
 In order to run the Python code, a suitable runtime environment is required.
-Python versions - Python 2.7 or 3.4+ 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:
+Python version 3.4 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:
 
 1) Install the virtualenv packages into the system Python environment
 
@@ -181,16 +185,7 @@ server or desktop mode, and access it from a web browser using the URL shown in
 the terminal once pgAdmin has started up.
 
 Setup of an environment on Windows is somewhat more complicated unfortunately,
-largely due to the lack of a native compiler toolset. Thankfully, Microsoft
-supply a free compiler specifically for Python 2.7 users. Download and install
-it from:
-
-https://www.microsoft.com/en-gb/download/details.aspx?id=44266
-
-A blog detailing the setup of Virtual Environments on Windows can be found
-here:
-
-http://www.tylerbutler.com/2012/05/how-to-install-python-pip-and-virtualenv-on-windows-with-powershell/
+please see pkg/win32/README.txt for complete details.
 
 Once a virtual environment has been created and enabled, setup can continue
 from step 4 above.
@@ -252,7 +247,7 @@ icon and select the Configuration option to open the configuration dialogue.
 On a Linux/Mac system, the Python Path will typically consist of a single path
 to the virtual environment's site-packages directory, e.g.
 
-    /Users/<USERNAME>/.virtualenvs/pgadmin4/lib/python2.7/site-packages
+    /Users/<USERNAME>/.virtualenvs/pgadmin4/lib/python3.8/site-packages
 
 On Windows, multiple paths are likely to be required, e.g.
 
@@ -294,49 +289,9 @@ run:
 
     (pgadmin4) $ make pip
 
-On a Mac, build an application bundle in a disk image (DMG file) with:
+To build the macOS AppBundle, please see pkg/mac/README.
 
-    (pgadmin4) $ make appbundle
-
-Configure the framework.conf to match the QT and Python versions the app is
-being built with:
-
-    $ cp $PGADMIN4_SRC/pkg/mac/framework.conf.in $PGADMIN4_SRC/pkg/mac/framework.conf
-    $ vi $PGADMIN4_SRC/pkg/mac/framework.conf
-
-If you have an Apple code signing certificate, both the app bundle and disk
-image can be automatically signed by configuring signing:
-
-    $ cp $PGADMIN4_SRC/pkg/mac/codesign.conf.in $PGADMIN4_SRC/pkg/mac/codesign.conf
-    $ vi $PGADMIN4_SRC/pkg/mac/codesign.conf
-
-Edit the file as appropriate, ensuring the various version numbers are correct
-and that the appropriate developer ID is specified.
-
-On Windows, the InnoSetup tool is required to create an installer. Download the
-Unicode version from:
-
-http://www.jrsoftware.org/isdl.php
-
-A number of environment variables may need to be set to enable the build script
-to function. The defaults will usually work on a typical 64 bit system with
-Qt 5.5.1, Python 2.7 and Visual Studio 2013. The examples below are for a
-similar 32 bit system:
-
-INNOTOOL=C:\Program Files\Inno Setup 5
-PGDIR=C:\Program Files\PostgreSQL\10
-PYTHON_DLL=C:\Windows\System32\Python27.dll
-PYTHON_HOME=C:\Python27
-PYTHON_VERSION=27
-QTDIR=C:\Qt\5.9\msvc2013
-VCDIR=C:\Program Files\Microsoft Visual Studio 12.0\VC
-
-To build the installer:
-
-    C:\$PGADMIN4_SRC> make x86
-
-If you have a code signing certificate, this will automatically be used if
-found in the Windows Certificate Store to sign the installer.
+To build the Windows installer, please see pkg/win32/README.txt.
 
 Support
 -------

docs/en_US/backup_dialog.rst

@@ -4,7 +4,7 @@
 `Backup Dialog`:index:
 **********************
 
-Using the *pg_dump* utility, *pgAdmin* provides an easy way to create a backup
+*pgAdmin* uses the *pg_dump* utility to provide an easy way to create a backup
 in a plain-text or archived format.  You can then use a client application (like
 *psql* or the *Query Tool*) to restore a plain-text backup file, or use the
 Postgres *pg_restore* utility to restore an archived backup. The *pg_dump*
@@ -205,14 +205,15 @@ command:
 
 Use the **Stop Process** button to stop the Backup process.
 
-If the backup is successful, a popup window will confirm success. Click *Click
-here for details* on the popup window to launch the *Process Watcher*. The
-*Process Watcher* logs all the activity associated with the backup and provides
-additional information for troubleshooting.
+If the backup is successful, a popup window will confirm success. Click *More details* on the popup window to launch the *Process Watcher*. The *Process Watcher* logs all the activity associated with the backup and provides additional information for troubleshooting.
 
 .. image:: images/backup_process_watcher.png
     :alt:  Backup process watcher
     :align: center
 
 If the backup is unsuccessful, you can review the error messages returned by the
-backup command on the *Process Watcher*.
+backup command on the *Process Watcher*.
+
+.. 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 backup file on the client machine .
+
+.. |sm_icon| image:: images/sm_icon.png

docs/en_US/backup_globals_dialog.rst

@@ -50,4 +50,8 @@ additional information for troubleshooting.
     :align: center
 
 If the backup is unsuccessful, review the error message returned by the
-*Process Watcher* to resolve any issue.
+*Process Watcher* to resolve any issue.
+
+.. 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 backup file on the client machine .
+
+.. |sm_icon| image:: images/sm_icon.png

docs/en_US/backup_server_dialog.rst

@@ -135,4 +135,8 @@ additional information for troubleshooting.
     :align: center
 
 If the backup is unsuccessful, review the error message returned by the
-*Process Watcher* to resolve any issue.
+*Process Watcher* to resolve any issue.
+
+.. 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 backup file on the client machine .
+
+.. |sm_icon| image:: images/sm_icon.png

docs/en_US/build_code_snippet.py

@@ -1,11 +1,7 @@
 import os
 import sys
 import inspect
-
-if sys.version_info[0] >= 3:
-    import builtins
-else:
-    import __builtin__ as builtins
+import builtins
 
 # Ensure the global server mode is set.
 builtins.SERVER_MODE = None
@@ -63,7 +59,7 @@ def print_code(outstream, name, module, info=None):
 print_code(
     target, "PgAdminModule", PgAdminModule,
     """
-PgAdminModule is inherted from Flask.Blueprint module.
+PgAdminModule is inherited from Flask.Blueprint module.
 This module defines a set of methods, properties and attributes,
 that every module should implement.
 """)

docs/en_US/code_overview.rst

@@ -29,9 +29,10 @@ Configuration
 
 The core application configuration is found in **config.py**. This file includes
 all configurable settings for the application, along with descriptions of their
-use. It is essential that various settings are configured prior to deployent on
-a web server; these can be overriden in **config_local.py** to avoid modifying
-the main configuration file.
+use. It is essential that various settings are configured prior to deployment on
+a web server; these can be overridden in **config_local.py** or
+**config_system.py** (see the :ref:`config.py <config_py>` documentation) to
+avoid modifying the main configuration file.
 
 User Settings
 =============
@@ -108,7 +109,7 @@ PgAdminModule class. This is responsible for providing hook points to integrate
 the module into the rest of the application - for example, a hook might tell
 the caller what CSS files need to be included on the rendered page, or what menu
 options to include and what they should do. Hook points need not exist if they
-are not required. It is the responsiblity of the caller to ensure they are
+are not required. It is the responsibility of the caller to ensure they are
 present before attempting to utilise them.
 
 Hooks currently implemented are:
@@ -210,6 +211,6 @@ bootstrap for UI look and feel, Backbone for data manipulation of a node,
 Backform for generating properties/create dialog for selected node. We have
 divided each module in small chunks as much as possible. Not all javascript
 modules are required to be loaded (i.e. loading a javascript module for
-database will make sense only when a server node is loaded competely.) Please
+database will make sense only when a server node is loaded completely.) Please
 look at the the javascript files node.js, browser.js, menu.js, panel.js, etc for
 better understanding of the code.

docs/en_US/conf.py

@@ -14,11 +14,7 @@
 
 import os
 import sys
-
-if sys.version_info[0] >= 3:
-    import builtins
-else:
-    import __builtin__ as builtins
+import builtins
 
 # Ensure the global server mode is set.
 builtins.SERVER_MODE = None
@@ -212,8 +208,8 @@ htmlhelp_basename = 'pgadmin4'
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
-    ('index', 'pgadmin4.tex', u'pgAdmin 4 Documentation',
-     u'The pgAdmin Development Team', 'manual'),
+    ('index', 'pgadmin4.tex', 'pgAdmin 4 Documentation',
+     'The pgAdmin Development Team', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -251,6 +247,6 @@ latex_elements = {
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'pgadmin4', u'pgAdmin 4 Documentation',
-     [u'The pgAdmin Development Team'], 1)
+    ('index', 'pgadmin4', 'pgAdmin 4 Documentation',
+     ['The pgAdmin Development Team'], 1)
 ]

docs/en_US/config_py.rst

@@ -23,10 +23,21 @@ are as follows:
   and may be created by users in the same directory as ``config.py`` if
   needed.
 
-.. note:: If the SERVER_MODE setting is changed in ``config_distro.py`` or ``config_local.py``,
-     you will most likely need to re-set the LOG_FILE, SQLITE_PATH, SESSION_DB_PATH
-     and STORAGE_DIR values as well as they will have been set based on the default
-     configuration or overridden by the runtime.
+* ``config_system.py``: This file is read after ``config_local.py`` and is
+  intended for system administrators to include settings that are configured
+  system-wide from a secure location that users cannot normally modify and that
+  is outside of the pgAdmin installation. The location for this file varies
+  based on the platform, and only needs to be created if desired:
+
+  * Linux: ``/etc/pgadmin/config_system.py``
+  * macOS: ``/Library/Preferences/pgadmin/config_system.py``
+  * Windows: ``%CommonProgramFiles%\pgadmin\config_system.py``
+
+.. note:: If the SERVER_MODE setting is changed in ``config_distro.py``,
+     ``config_local.py``, or ``config_system.py`` you will most likely need to
+     re-set the LOG_FILE, SQLITE_PATH, SESSION_DB_PATH and STORAGE_DIR values
+     as well as they will have been set based on the default configuration or
+     overridden by the runtime.
 
 The default ``config.py`` file is shown below for reference:
 

docs/en_US/container_deployment.rst

@@ -17,7 +17,6 @@ maintenance functions to be executed. Multiple versions are included in the
 following directories to allow use with different versions of the database
 server:
 
-* PostgreSQL 9.4: */usr/local/pgsql-9.4*
 * PostgreSQL 9.5: */usr/local/pgsql-9.5*
 * PostgreSQL 9.6: */usr/local/pgsql-9.6*
 * PostgreSQL 10: */usr/local/pgsql-10*
@@ -52,7 +51,7 @@ connections.
 
 When TLS is enabled, a certificate and key must be provided. Typically these
 should be stored on the host file system and mounted from the container. The
-expected paths are /certs/server.crt and /certs/server.key
+expected paths are /certs/server.cert and /certs/server.key
 
 **PGADMIN_LISTEN_ADDRESS**
 
@@ -60,7 +59,7 @@ expected paths are /certs/server.crt and /certs/server.key
 
 Specify the local address that the servers listens on. The default should work
 for most users - in IPv4-only environments, this may need to be set to
-127.0.0.1.
+0.0.0.0.
 
 **PGADMIN_LISTEN_PORT**
 
@@ -319,7 +318,7 @@ adjusted as appropriate to the specific deployment:
         listen 443;
         server_name _;
 
-        ssl_certificate /etc/nginx/server.crt;
+        ssl_certificate /etc/nginx/server.cert;
         ssl_certificate_key /etc/nginx/server.key;
 
         ssl on;

docs/en_US/database_dialog.rst

@@ -97,6 +97,19 @@ Follow these steps to add additional parameter value definitions; to discard a
 parameter, click the trash icon to the left of the row and confirm deletion in
 the *Delete Row* popup.
 
+Click the *Advanced* tab to continue.
+
+.. image:: images/database_advanced.png
+   :alt: Database dialog advanced tab
+   :align: center
+
+Use the *Advanced* tab to set advanced parameters for the database.
+
+* Use *Schema restriction* field to provide a SQL restriction that will be used
+  against the pg_namespace table to limit the schemas that you see.
+  For example, you might enter: *public* so that only *public* are shown in
+  the pgAdmin browser.Separate entries with a comma or tab as you type.
+
 Click the *SQL* tab to continue.
 
 Your entries in the *Database* dialog generate a SQL command (see an example

docs/en_US/debugger.rst

@@ -16,9 +16,9 @@ superuser privileges to use the debugger.
 
 Before using the debugger, you must modify the *postgresql.conf* file, adding
 the server-side debugger components to the the value of the
-*shared_preload_libraries* parameter:
+*shared_preload_libraries* parameter, for example:
 
-  shared_preload_libraries = '$libdir/*other_libraries*/plugin_debugger'
+  shared_preload_libraries = '$libdir/plugin_debugger'
 
 After modifying the *shared_preload_libraries* parameter, restart the server to
 apply the changes.

docs/en_US/enabling_ldap_authentication.rst

@@ -5,9 +5,19 @@
 **************************************************
 
 To enable LDAP authentication for pgAdmin, you must configure the LDAP
-settings in the *config_local.py* or *config_distro.py* file on the system where
-pgAdmin is installed in Server mode. You can copy these settings from *config.py*
-file and modify the values for the following parameters:
+settings in the *config_local.py* or *config_system.py* file (see the
+:ref:`config.py <config_py>` documentation) on the system where pgAdmin is
+installed in Server mode. You can copy these settings from *config.py* file
+and modify the values for the following parameters:
+
+There are 3 ways to configure LDAP:
+
+* Bind as pgAdmin user
+
+* Anonymous bind
+
+* Dedicated user bind
+
 
 .. csv-table::
    :header: "**Parameter**", "**Description**"
@@ -21,9 +31,12 @@ file and modify the values for the following parameters:
    * [‘ldap’]: pgAdmin will use only LDAP authentication.
 
    * [‘ldap’, ‘internal’]: pgAdmin will first try to authenticate the user through
-     LDAP. If that authentication fails, then internal user entries of pgAdmin will be used for authentication.
+     LDAP. If that authentication fails, then internal user entries of pgAdmin
+     will be used for authentication.
 
-   * [‘internal’, ‘ldap’]: pgAdmin will first try to authenticate the user through internal user entries. If that authentication fails, then LDAP authentication will be used."
+   * [‘internal’, ‘ldap’]: pgAdmin will first try to authenticate the user
+     through internal user entries. If that authentication fails, then LDAP
+     authentication will be used."
    "LDAP_AUTO_CREATE_USER", "Specifies if you want to automatically create a pgAdmin
    user corresponding to the LDAP user credentials. Please note that LDAP password
    is not stored in the pgAdmin database."
@@ -34,10 +47,6 @@ file and modify the values for the following parameters:
    want to connect to. For example, 'ldap://172.16.209.35:389' is a valid
    LDAP_SERVER_URI where ldap is the connection protocol, 172.16.209.35 is the IP
    address and 389 is the port. Port 636 is used for the ldaps communication protocol."
-   "LDAP_BASE_DN","Specifies the base DN from where a server will start the search
-   for users. For example, an LDAP search for any user will be performed by the server
-   starting at the base DN (dc=example,dc=com). When the base DN matches, the full
-   DN (cn=admin,dc=example,dc=com) is used to bind with the supplied password."
    "LDAP_USERNAME_ATTRIBUTE","Specifies the LDAP attribute that contains the
    usernames. For LDAP authentication, you need to enter the value of that
    particular attribute as username. For example, if you set the value of
@@ -45,10 +54,16 @@ file and modify the values for the following parameters:
    entries, you should be able to authenticate by entering ‘admin’ in the 
    *Email Address / Username* field and its corresponding password in the *Password* 
    field."
-   "LDAP_SEARCH_BASE_DN","Specifies an element of the search request that works in
-   conjunction with the LDAP search scope to define the subtree of entries that
-   should be considered when processing the search request. You can use this parameter
-   for limiting the search request to a specific group of users."
+   "LDAP_SEARCH_BASE_DN","Specifies the distinguished name (DN) for the top-most user
+   directory that you want to search. You can use this parameter for limiting the search
+   request to a specific group of users. For example, if you want to search only within
+   the Organizational Unit named sales, you can define the value for LDAP_SEARCH_BASE_DN
+   parameter as following:
+   LDAP_SEARCH_BASE_DN = ‘ou=sales,dc=example,dc=com'
+
+   This is an optional parameter only while binding as pgAdmin user.
+   If you do not specify any value for LDAP_SEARCH_BASE_DN, then the value for
+   LDAP_BASE_DN will be considered for the same."
    "LDAP_SEARCH_FILTER","Defines the criteria to retrieve matching entries in an
    LDAP search request. For example, LDAP_SEARCH_FILTER = '(objectclass=HR)’ setting
    searches only for users having HR as their objectClass attribute."
@@ -70,3 +85,21 @@ file and modify the values for the following parameters:
    "LDAP_KEY_FILE","Specifies the path to the server private key file. This parameter
    is applicable only if you are using *ldaps* as connection protocol and you have
    set *LDAP_USE_STARTTLS* parameter to *True*."
+   "**Bind as pgAdmin user**"
+   "LDAP_BASE_DN","Specifies the base DN from where a server will start the search
+   for users. For example, an LDAP search for any user will be performed by the server
+   starting at the base DN (dc=example,dc=com). When the base DN matches, the full
+   DN (cn=admin,dc=example,dc=com) is used to bind with the supplied password."
+   "**Anonymous bind**"
+   "LDAP_ANONYMOUS_BIND","Set this parameter to *True* for anonymous binding.
+   After the connection is made, the pgadmin login user will be further authenticated
+   by the username and password provided at the login screen."
+   "**Dedicated user bind**"
+   "LDAP_BIND_USER", "The account of the user to log in for simple bind.
+   Set this parameter to allow the connection to bind using a dedicated user.
+   After the connection is made, the pgadmin login user will be further
+   authenticated by the username and password provided at the login screen.
+   at the login screen."
+   "LDAP_BIND_PASSWORD", "Password for simple bind.
+   Specify the value if you have set the LDAP_BIND_USER parameter."
+

docs/en_US/import_export_data.rst

@@ -94,3 +94,8 @@ that performed the import or export:
 .. image:: images/import_export_pw.png
     :alt: Import Export data 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 backup file on the client machine .
+
+
+.. |sm_icon| image:: images/sm_icon.png

docs/en_US/import_export_servers.rst

@@ -23,7 +23,11 @@ the ``--dump-servers`` command line option, followed by the name (and if require
 path) to the desired output file. By default, servers owned by the desktop mode
 user will be dumped (pgadmin4@pgadmin.org by default - see the DESKTOP_USER
 setting in ``config.py``). This can be overridden with the ``--user`` command
-line option. For example:
+line option. There can be multiple configuations of pgAdmin on the same system.
+To dump the servers from specific pgAdmin config DB file, ``--sqlite-path`` option
+can be used. It is also recommended to use this option when running pgAdmin in
+desktop mode. By default SQLITE_PATH setting in ``config.py`` is taken.
+For example:
 
 .. code-block:: bash
 
@@ -33,6 +37,10 @@ line option. For example:
 
     /path/to/python /path/to/setup.py --dump-servers output_file.json --user user@example.com
 
+    # to specify a pgAdmin config DB file:
+
+    /path/to/python /path/to/setup.py --dump-servers output_file.json --sqlite-path /path/to/pgadmin4.db
+
 To export only certain servers, use the ``--servers`` option and list one or
 more server IDs. For example:
 
@@ -48,7 +56,10 @@ the ``--load-servers`` command line option, followed by the name (and if require
 path) of the JSON file containing the server definitions. Servers will be owned
 by the desktop mode user (pgadmin4@pgadmin.org by default - see the DESKTOP_USER
 setting in ``config.py``). This can be overridden with the ``--user`` command
-line option. For example:
+line option. There can be multiple configuations of pgAdmin on the same system.
+To load the servers into a specific pgAdmin config DB file, ``--sqlite-path`` option
+can be used. It is also recommended to use this option when running pgAdmin in
+desktop mode. By default SQLITE_PATH setting in ``config.py`` is taken. For example:
 
 .. code-block:: bash
 
@@ -58,6 +69,10 @@ line option. For example:
 
     /path/to/python /path/to/setup.py --load-servers input_file.json --user user@example.com
 
+    # to specify a pgAdmin config DB file:
+
+    /path/to/python /path/to/setup.py --load-servers input_file.json --sqlite-path /path/to/pgadmin4.db
+
 If any Servers are defined with a Server Group that is not already present in
 the configuration database, the required Group will be created.
 
@@ -88,7 +103,7 @@ The following example shows both a minimally defined and a fully defined server:
                 "MaintenanceDB": "postgres"
             },
             "2": {
-                "Name: "Fully Defined Server",
+                "Name": "Fully Defined Server",
                 "Group": "Server Group 2",
                 "Host": "host.domain.com",
                 "HostAddr": "192.168.1.2",
@@ -105,6 +120,7 @@ The following example shows both a minimally defined and a fully defined server:
                 "SSLRootCert": "/path/to/sslroot.crt",
                 "SSLCrl": "/path/to/sslcrl.crl",
                 "SSLCompression": 1,
+                "Shared": false,
                 "BGColor": "#ff9900",
                 "FGColor": "#000000",
                 "Service": "postgresql-10",

docs/en_US/index_dialog.rst

@@ -39,10 +39,10 @@ Use the fields in the *Definition* tab to define the index:
     * Select *hash* to create a hash index.  A hash index may improve
       performance when managing simple equality comparisons.
     * Select *gist* to create a GiST index.  A GiST index may improve
+      performance when managing two-dimensional geometric data types and
+      nearest-neighbor searches.
+    * Select *gin* to create a GIN index.  A GIN index may improve
       performance when managing values with more than one key.
-    * Select *gin* to create a GIN index.  A GIN index may improve performance
-      when managing two-dimensional geometric data types and nearest-neighbor
-      searches.
     * Select *spgist* to create a space-partitioned GiST index. A SP-GiST index
       may improve performance when managing non-balanced data structures.
     * Select *brin* to create a BRIN index.  A BRIN index may improve
@@ -108,4 +108,4 @@ the values in the *code* column of the *distributors* table.
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Reset* button to restore configuration parameters.

docs/en_US/management_basics.rst

@@ -15,4 +15,5 @@ granting user privileges, and performing VACUUM, ANALYZE and REINDEX functions.
    change_password_dialog
    grant_wizard
    import_export_data
-   maintenance_dialog
+   maintenance_dialog
+   storage_manager

docs/en_US/materialized_view_dialog.rst

@@ -67,9 +67,10 @@ thresholds; use the *Table* tab and the *Toast Table* tab to customize values
 for the table and the associated toast table. To change the default values:
 
 * Move the *Custom auto-vacuum?* switch to the *Yes* position to perform custom
-  maintenance on the materialized view.
-* Move the *Enabled?* switch to the *Yes* position to select values in the
-  *Vacuum table*. Provide values for each row in the *Value* column.
+  maintenance on the materialized view and to select values in the
+  *Vacuum table*. The *Vacuum Table* provides default values for maintenance
+  operations.
+* Changing *Autovacuum enabled?* to *Not set* will reset autovacuum_enabled.
 
 Click the *Security* tab to continue.
 

docs/en_US/menu_bar.rst

@@ -114,6 +114,8 @@ Use the *Tools* menu to access the following options (in alphabetical order):
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 | *Resume replay of WAL*    | Click to resume the replay of the WAL log.                                                                                                |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Storage Manager*         | Click to open the :ref:`Storage Manager <storage_manager>` to upload, delete, or download the backup files.                               |
++---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 
 The Help Menu
 *************
@@ -137,7 +139,3 @@ information about the pgAdmin installation (in alphabetical order):
 +----------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
 | *PostgreSQL Website* | Click to access the PostgreSQL core documentation hosted at the PostgreSQL site. The site also offers guides, tutorials, and resources. |
 +----------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-
-
-
-

docs/en_US/modifying_tables.rst

@@ -9,8 +9,8 @@ attributes.
 
 To access a dialog that allows you to create a database object, right-click on
 the object type in the pgAdmin tree control, and select the *Create* option for
-that object.  For example, to create a new database, right-click on the *Casts*
-node, and select *Create Cast...*
+that object.  For example, to create a new table, Select a database from the tree control, select the schema under the database, right-click on the *Tables*
+node, and select *Create Table...*
 
 .. toctree::
    :maxdepth: 1
@@ -22,7 +22,8 @@ node, and select *Create Cast...*
    foreign_key_dialog
    index_dialog
    primary_key_dialog
+   rls_policy_dialog
    rule_dialog
    table_dialog
    trigger_dialog
-   unique_constraint_dialog
+   unique_constraint_dialog

docs/en_US/pgagent_install.rst

@@ -13,6 +13,7 @@ same database; individual jobs may be targeted at a particular host, or left
 for execution by any host. Locking prevents execution of the same instance of a
 job by multiple hosts.
 
+
 Database setup
 **************
 
@@ -39,21 +40,6 @@ the *Execute* icon:
 
     CREATE LANGUAGE plpgsql;
 
-If you are using an earlier version of PostgreSQL or pgAgent, use the
-*Open file* icon on the Query Tool toolbar to open a browser window and locate
-the *pgagent.sql* script. The installation script is installed by pgAdmin, and
-the installation location varies from operating system to operating system:
-
-* On Windows, it is usually located under *C:\\Program files\\pgAdmin III* (or
-  *C:\\Program files\\PostgreSQL\\8.x\\pgAdmin III* if installed with the PostgreSQL
-  server installer).
-
-* On Linux, it is usually located under */usr/local/pgadmin3/share/pgadmin3*
-  or */usr/share/pgadmin3*.
-
-After loading the file into the Query Tool, click the *Execute* icon to execute
-the script.  The script will create a number of tables and other objects in a
-schema named *pgagent*.
 
 Daemon installation on Unix
 ***************************
@@ -73,7 +59,7 @@ needed for debugging or specialised configurations::
 
   Usage:
     /path/to/pgagent [options] <connect-string>
-  
+
   options:
     -f run in the foreground (do not detach from the terminal)
     -t <poll time interval in seconds (default 10)>

docs/en_US/preferences.rst

@@ -49,6 +49,9 @@ Use the fields on the *Display* panel to specify general display preferences:
   the client will display the animated dialogues/notifications otherwise it
   will be unanimated.
 
+* When the *Hide shared servers?* switch is set to *True*, the client will hide
+  all the shared servers from the browser tree.
+
 * Use the *Lock layout* field to lock the UI layout at different levels. This
   can also be changed from File menu on the :ref:`menu bar <menu_bar>`
 
@@ -103,6 +106,23 @@ Use fields on the *Properties* panel to specify browser properties:
 * Provide a value in the *Maximum job history rows* field to limit the number of
   rows to show on the statistics tab for pgAgent jobs.  The default is 250.
 
+Use field on *Tab settings* panel to specify the tab related properties.
+
+.. image:: images/preferences_browser_tab_settings.png
+    :alt: Preferences dialog browser properties section
+    :align: center
+
+* Use *Debugger tab title placeholder* field to customize the Debugger tab title.
+
+* When the *Dynamic tab size* If set to True, the tabs will take full size as per the title, it will also applicable for already opened tabs
+
+* When the *Open in new browser tab* filed is selected for Query tool, Schema Diff or Debugger, it will
+  open in a new browser tab when invoked.
+
+* Use the *Query tool tab title placeholder* field to customize the query tool tab title.
+
+* Use *View/Edit tab title placeholder* field to customize the View/Edit Data tab title.
+
 The Dashboards Node
 *******************
 
@@ -152,13 +172,6 @@ The Debugger Node
 
 Expand the *Debugger* node to specify your debugger display preferences.
 
-.. image:: images/preferences_debugger_display.png
-    :alt: Preferences dialog debugger display options
-    :align: center
-
-* When the *Open in new browser tab* switch is set to *True*, the Debugger will
-  open in a new browser tab when invoked.
-
 Use the fields on the *Keyboard shortcuts* panel to configure shortcuts for the
 debugger window navigation:
 
@@ -185,6 +198,7 @@ Expand the *Miscellaneous* node to specify miscellaneous display preferences.
 * Use the *Themes* drop-down listbox to select the theme for pgAdmin. You'll also get a preview just below the
   drop down. Note that, to apply the theme you need to refresh the pgAdmin page. You can also submit your
   own themes, check `here <https://git.postgresql.org/gitweb/?p=pgadmin4.git;a=blob_plain;f=README>`_ how.
+  Currently we support Standard, Dark and High Contrast theme.
 
 The Paths Node
 **************
@@ -271,9 +285,6 @@ Tool display.
 * Use the *Connection status refresh rate* field to specify the number of
   seconds between connection/transaction status updates.
 
-* When the *Open in new browser tab* switch is set to *True*, each new instance
-  of the Query Tool will open in a new browser tab.
-
 * Use the *Query info notifier timeout* field to control the behaviour of the
   notifier that is displayed when query execution completes. A value of *-1*
   will disable the notifier, and a value of 0 will display it until clicked. If
@@ -305,12 +316,6 @@ Use the fields on the *Editor* panel to change settings of the query editor.
   changed to text/plain. Keyword highlighting and code folding will be disabled.
   This will improve editor performance with large files.
 
-* Use the *Tab size* field to specify the number of spaces per tab character in
-  the editor.
-
-* When the *Use spaces* switch is set to *True*, the editor will insert spaces
-  (instead of tab characters) when the tab key or auto-indent are used.
-
 .. image:: images/preferences_sql_explain.png
     :alt: Preferences dialog sqleditor explain options
     :align: center
@@ -374,13 +379,41 @@ preferences for copied data.
 * Use the *Result copy quoting* drop-down listbox to select which type of fields
   require quoting; select *All*, *None*, or *Strings*.
 
-Use the fields on the *Keyboard shortcuts* panel to configure shortcuts for the
-Query Tool window navigation:
-
 .. image:: images/preferences_sql_keyboard_shortcuts.png
     :alt: Preferences dialog sql keyboard shortcuts section
     :align: center
 
+Use the fields on the *Keyboard shortcuts* panel to configure shortcuts for the
+Query Tool window navigation:
+
+.. image:: images/preferences_sql_formatting.png
+    :alt: Preferences dialog SQL Formatting section
+    :align: center
+
+Use the fields on the *SQL formatting* panel to specify your preferences for
+reformatting of SQL.
+
+* Use the *Command-first notation* option to specify whether to place commas
+  before or after column names.
+* Use the *Identifier case* option to specify whether to change identifiers
+  (object names) into upper, lower, or capitalized case.
+* Use the *Keyword case* option to specify whether to change keywords into
+  upper, lower, or capitalized case.
+* Use the *Re-indent aligned?* option to specify that indentations of statements
+  should be changed, aligned by keywords.
+* Use the *Re-indent?* option to specify that indentations of statements should
+  be changed.
+* Use the *Spaces around operators?* option to specify whether or not to include
+  spaces on either side of operators.
+* Use the *Strip comments?* option to specify whether or not comments should be
+  removed.
+* Use the *Tab size* option to specify the number of spaces per tab or indent.
+* Use the *Use spaces?* option to select whether to use spaces or tabs when
+  indenting.
+* Use the *Wrap after N characters* option to specify the column limit for
+  wrapping column separated lists (e.g. of column names in a table). If set to
+  0 (zero), each item will be on it's own line.
+
 The Schema Diff Node
 ********************
 
@@ -390,8 +423,11 @@ Expand the *Schema Diff* node to specify your display preferences.
     :alt: Preferences schema diff
     :align: center
 
-Use the *Open in new browser tab* switch to indicate if you would like Schema Diff
-to open in a new tab.
+Use the *Ignore owner* switch to ignores the owner while comparing the objects.
+
+Use the *Ignore whitespaces* switch to ignores the whitespaces while comparing
+the string objects. Whitespace includes space, tabs, and CRLF.
+
 
 The Storage Node
 ****************

docs/en_US/query_tool.rst

@@ -65,7 +65,7 @@ features syntax coloring and autocompletion.
 
 To use autocomplete, begin typing your query; when you would like the Query
 editor to suggest object names or commands that might be next in your query,
-press the Control+Space key combination. For example, type "\*SELECT \* FROM\* "
+press the Control+Space key combination. For example, type "*SELECT \* FROM*"
 (without quotes, but with a trailing space), and then press the Control+Space
 key combination to select from a popup menu of autocomplete options.
 
@@ -286,8 +286,10 @@ the *Clear* drop-down menu.
 Query History is maintained across sessions for each database on a per-user
 basis when running in Query Tool mode. In View/Edit Data mode, history is not
 retained. By default, the last 20 queries are stored for each database. This
-can be adjusted in `config_local.py` by overriding the `MAX_QUERY_HIST_STORED`
-value. See the :ref:`Deployment <deployment>` section for more information.
+can be adjusted in ``config_local.py`` or ``config_system.py`` (see the
+:ref:`config.py <config_py>` documentation) by overriding the
+`MAX_QUERY_HIST_STORED` value. See the :ref:`Deployment <deployment>` section
+for more information.
 
 Connection Status
 *****************
@@ -298,3 +300,63 @@ transaction status by clicking on the status icon in the Query Tool:
 .. image:: images/query_tool_connection_status.png
     :alt: Query tool connection and transaction statuses
     :align: center
+
+Change connection
+*****************
+
+User can connect to another server or database from existing open session of query tool.
+
+* Click on the connection link next to connection status.
+* Now click on the *<New Connection>* option from the dropdown.
+
+.. image:: images/new_connection_options.png
+    :alt: Query tool connection options
+    :align: center
+
+* Now select server, database, user, and role to connect and click OK.
+
+.. image:: images/new_connection_dialog.png
+    :alt: Query tool connection dialog
+    :align: center
+
+* A newly created connection will now get listed in the options.
+* To connect, select the newly created connection from the dropdown list.
+
+Macros
+******
+
+Query Tool Macros enable you to execute pre-defined SQL queries with a single key press. Pre-defined queries can contain the placeholder $SELECTION$. Upon macro execution, the placeholder will be replaced with the currently selected text in the Query Editor pane of the Query Tool.
+
+.. image:: images/query_tool_manage_macros.png
+   :alt: Query Tool Manage macros
+   :align: center
+
+To create a macro, select the *Manage Macros* option from the *Macros* menu on the *Query Tool*. Select the key you wish to use, enter the name of the macro, and the query, optionally including the selection placeholder, and then click the *Save* button to store the macro.
+
+.. image:: images/query_tool_manage_macros_dialog.png
+   :alt: Query Tool Manage Macros dialogue
+   :align: center
+
+To clear a macro, select the macro on the *Manage Macros* dialogue, and then click the *Clear* button.
+
+.. image:: images/query_tool_macros_clear_row.png
+   :alt: Query Tool Manage Macros clear the row
+   :align: center
+
+The server will prompt you for confirmation to clear the macro.
+
+.. image:: images/query_tool_macros_clear_confirmation.png
+   :alt: Query Tool Manage Macros Clear row confirmation
+   :align: center
+
+To clear all macros, click on the *Clear* button on left side of the key. The server will prompt you for confirmation to clear all the rows.
+
+.. image:: images/query_tool_macros_clear_all.png
+   :alt: Query Tool Macros Clear All
+   :align: center
+
+To execute a macro, simply select the appropriate shortcut keys, or select it from the *Macros* menu.
+
+.. image:: images/query_tool_macros_execution.png
+   :alt: Query Tool Macros Execution
+   :align: center

docs/en_US/query_tool_toolbar.rst

@@ -1,184 +1,189 @@
-.. _query_tool_toolbar:
-
-***************************
-`Query Tool Toolbar`:index:
-***************************
-
-The *Query Tool* toolbar uses context-sensitive icons that provide shortcuts to
-frequently performed tasks. If an icon is highlighted, the option is enabled;
-if the icon is grayed-out, the task is disabled.
-
-.. note:: The :ref:`Query Tool <query_tool>` and
-    :ref:`View/Edit Data <editgrid>` tools are actually different operating
-    modes of the same tool. Some controls will be disabled in either mode.
-
-.. image:: images/query_toolbar.png
-    :alt: Query tool toolbar
-    :align: center
-
-Hover over an icon in pgAdmin to display a tooltip that describes the icon's
-functionality.
-
-File Options
-************
-
-.. table::
-   :class: longtable
-   :widths: 1 4 1
-
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | Icon                 | Behavior                                                                                          | Shortcut       |
-   +======================+===================================================================================================+================+
-   | *Open File*          | Click the *Open File* icon to display a previously saved query in the SQL Editor.                 | Accesskey + O  |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Save File*          | Click the *Save* icon to perform a quick-save of a previously saved query, or to access the       | Accesskey + S  |
-   |                      | *Save* menu:                                                                                      |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Select *Save* to save the selected content of the SQL Editor panel in a  file.                 |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Select *Save As* to open a new browser dialog and specify a new location to which to save the  |                |
-   |                      |    selected content of the SQL Editor panel.                                                      |                |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-
-Editing Options
-***************
-
-.. table::
-   :class: longtable
-   :widths: 1 4 1
-
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | Icon                 | Behavior                                                                                          | Shortcut       |
-   +======================+===================================================================================================+================+
-   | *Save Data Changes*  | Click the *Save Data Changes* icon to save data changes (insert, update, or delete) in the Data   | F6             |
-   |                      | Output Panel to the server.                                                                       |                |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Find*               | Use the *Find* menu to search, replace, or navigate the code displayed in the SQL Editor:         |                |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Find* to provide a search target, and search the SQL Editor contents.                     | Cmd+F          |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Find next* to locate the next occurrence of the search target.                            | Cmd+G          |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Find previous* to move to the last occurrence of the search target.                       | Cmd+Shift+G    |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Persistent find* to identify all occurrences of the search target within the editor.      |                |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Replace* to locate and replace (with prompting) individual occurrences of the target.     | Cmd+Shift+F    |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Replace all* to locate and replace all occurrences of the target within the editor.       |                |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Jump* to navigate to the next occurrence of the search target.                            | Alt+G          |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Copy*               | Click the *Copy* icon to copy the content with or without header:                                 |  Accesskey + C |
-   |                      |                                                                                                   |                |
-   |                      |  * Click the *Copy* icon to copy the content that is currently highlighted in the Data Output     |                |
-   |                      |     panel.                                                                                        |                |
-   |                      |                                                                                                   |                |
-   |                      |  *  Click *Copy with headers* to copy the highlighted content along with the header.              |                |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Paste*              | Click the *Paste* icon to paste a previously copied row into a new row.                           | Accesskey + P  |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Delete*             | Click the *Delete* icon to mark the selected rows for deletion. These marked rows get deleted     |Accesskey + D   |
-   |                      | when you click the *Save Data Changes* icon.                                                      |                |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Edit*               | Use options on the *Edit* menu to access text editing tools; the options operate on the text      |                |
-   |                      | displayed in the SQL Editor panel when in Query Tool mode:                                        |                |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Indent Selection* to indent the currently selected text.                                  | Tab            |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Unindent Selection* to remove indentation from the currently selected text.               | Shift+Tab      |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Inline Comment Selection* to enclose any lines that contain the selection in SQL style    | Cmd+/          |
-   |                      | comment notation.                                                                                 |                |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Inline Uncomment Selection* to remove SQL style comment notation from the selected line.  | Cmd+.          |
-   |                      +---------------------------------------------------------------------------------------------------+----------------+
-   |                      | Select *Block Comment* to enclose all lines that contain the selection in C style comment         | Shift+Cmd+/    |
-   |                      | notation.  This option acts as a toggle.                                                          |                |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-
-View/Edit Data Resultset Control
-********************************
-
-.. table::
-   :class: longtable
-   :widths: 1 4 1
-
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | Icon                 | Behavior                                                                                          | Shortcut       |
-   +======================+===================================================================================================+================+
-   | *Filter*             | Click the *Filter* icon to set filtering and sorting criteria for the data when in View/Edit data | Accesskey + F  |
-   |                      | mode. Click the down arrow to access other filtering and sorting options:                         |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Click *Sort/Filter* to open the sorting and filtering dialogue. In the *SQL Filter*, you can   |                |
-   |                      |    enter a SQL query as filtering criteria. In *Data Sorting*, you can select the column and      |                |
-   |                      |    specify the order for sorting.                                                                 |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Click *Filter by Selection* to show only the rows containing the values in the selected cells. |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Click *Exclude by Selection* to show only the rows that do not contain the values in the       |                |
-   |                      |    selected cells.                                                                                |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Click *Remove Sort/Filter* to remove any previously selected sort or filtering options.        |                |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | Limit Selector       | Select a value in the *Limit Selector* to limit the size of the dataset to a number of rows.      | Accesskey + R  |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Stop*               | Click the *Stop* icon to cancel the execution of the currently running query.                     | Accesskey + Q  |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-
-Query Execution
-***************
-
-.. table::
-   :class: longtable
-   :widths: 1 4 1
-
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | Icon                 | Behavior                                                                                          | Shortcut       |
-   +======================+===================================================================================================+================+
-   | *Execute/Refresh*    | Click the *Execute/Refresh* icon to either execute or refresh the query highlighted in the SQL    | F5             |
-   |                      | editor panel. Click the down arrow to access other execution options:                             |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Add a check next to *Auto-Rollback* to instruct the server to automatically roll back a        |                |
-   |                      |    transaction if an error occurs during the transaction.                                         |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Add a check next to *Auto-Commit* to instruct the server to automatically commit each          |                |
-   |                      |    transaction.  Any changes made by the transaction will be visible to others, and               |                |
-   |                      |    durable in the event of a crash.                                                               |                |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Explain*            | Click the *Explain* icon to view an explanation plan for the current query. The result of the     | F7             |
-   |                      | EXPLAIN is displayed graphically on the *Explain* tab of the output panel, and in text            |                |
-   |                      | form on the *Data Output* tab.                                                                    |                |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Explain analyze*    | Click the *Explain analyze* icon to invoke an EXPLAIN ANALYZE command on the current query.       | Shift+F7       |
-   |                      |                                                                                                   |                |
-   |                      | Navigate through the *Explain Options* menu to select options for the EXPLAIN command:            |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Select *Verbose* to display additional information regarding the query plan.                   |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Select *Costs* to include information on the estimated startup and total cost of each          |                |
-   |                      |    plan node, as well as the estimated number of rows and the estimated width of each             |                |
-   |                      |    row.                                                                                           |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Select *Buffers* to include information on buffer usage.                                       |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Select *Timing* to include information about the startup time and the amount of time           |                |
-   |                      |    spent in each node of the query.                                                               |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Select *Summary* to include the summary information about the query plan.                      |                |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Commit*             | Click the *Commit* icon to commit the transaction.                                                | Shift+CTRL+M   |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Rollback*           | Click the *Rollback* icon to rollback the transaction.                                            | Shift+CTRL+R   |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Clear*              | Use options on the *Clear* drop-down menu to erase display contents:                              | Accesskey + L  |
-   |                      |                                                                                                   |                |
-   |                      |  * Select *Clear Query Window* to erase the content of the SQL Editor panel.                      |                |
-   |                      |                                                                                                   |                |
-   |                      |  * Select *Clear History* to erase the content of the *History* tab.                              |                |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+.. _query_tool_toolbar:
+
+***************************
+`Query Tool Toolbar`:index:
+***************************
+
+The *Query Tool* toolbar uses context-sensitive icons that provide shortcuts to
+frequently performed tasks. If an icon is highlighted, the option is enabled;
+if the icon is grayed-out, the task is disabled.
+
+.. note:: The :ref:`Query Tool <query_tool>` and
+    :ref:`View/Edit Data <editgrid>` tools are actually different operating
+    modes of the same tool. Some controls will be disabled in either mode.
+
+.. image:: images/query_toolbar.png
+    :alt: Query tool toolbar
+    :align: center
+
+Hover over an icon in pgAdmin to display a tooltip that describes the icon's
+functionality.
+
+File Options
+************
+
+.. table::
+   :class: longtable
+   :widths: 1 4 1
+
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | Icon                 | Behavior                                                                                          | Shortcut       |
+   +======================+===================================================================================================+================+
+   | *Open File*          | Click the *Open File* icon to display a previously saved query in the SQL Editor.                 | Accesskey + O  |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Save File*          | Click the *Save* icon to perform a quick-save of a previously saved query, or to access the       | Accesskey + S  |
+   |                      | *Save* menu:                                                                                      |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Select *Save* to save the selected content of the SQL Editor panel in a  file.                 |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Select *Save As* to open a new browser dialog and specify a new location to which to save the  |                |
+   |                      |    selected content of the SQL Editor panel.                                                      |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+
+Editing Options
+***************
+
+.. table::
+   :class: longtable
+   :widths: 1 4 1
+
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | Icon                 | Behavior                                                                                          | Shortcut       |
+   +======================+===================================================================================================+================+
+   | *Save Data Changes*  | Click the *Save Data Changes* icon to save data changes (insert, update, or delete) in the Data   | F6             |
+   |                      | Output Panel to the server.                                                                       |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Find*               | Use the *Find* menu to search, replace, or navigate the code displayed in the SQL Editor:         |                |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Find* to provide a search target, and search the SQL Editor contents.                     | Cmd+F          |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Find next* to locate the next occurrence of the search target.                            | Cmd+G          |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Find previous* to move to the last occurrence of the search target.                       | Cmd+Shift+G    |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Persistent find* to identify all occurrences of the search target within the editor.      |                |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Replace* to locate and replace (with prompting) individual occurrences of the target.     | Cmd+Shift+F    |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Replace all* to locate and replace all occurrences of the target within the editor.       |                |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Jump* to navigate to the next occurrence of the search target.                            | Alt+G          |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Copy*               | Click the *Copy* icon to copy the content with or without header:                                 |  Accesskey + C |
+   |                      |                                                                                                   |                |
+   |                      |  * Click the *Copy* icon to copy the content that is currently highlighted in the Data Output     |                |
+   |                      |     panel.                                                                                        |                |
+   |                      |                                                                                                   |                |
+   |                      |  *  Click *Copy with headers* to copy the highlighted content along with the header.              |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Paste*              | Click the *Paste* icon to paste a previously copied row into a new row.                           | Accesskey + P  |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Delete*             | Click the *Delete* icon to mark the selected rows for deletion. These marked rows get deleted     |Accesskey + D   |
+   |                      | when you click the *Save Data Changes* icon.                                                      |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Edit*               | Use options on the *Edit* menu to access text editing tools; the options operate on the text      |                |
+   |                      | displayed in the SQL Editor panel when in Query Tool mode:                                        |                |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Indent Selection* to indent the currently selected text.                                  | Tab            |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Unindent Selection* to remove indentation from the currently selected text.               | Shift+Tab      |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Inline Comment Selection* to enclose any lines that contain the selection in SQL style    | Cmd+/          |
+   |                      | comment notation.                                                                                 |                |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Inline Uncomment Selection* to remove SQL style comment notation from the selected line.  | Cmd+.          |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Block Comment* to enclose all lines that contain the selection in C style comment         | Shift+Cmd+/    |
+   |                      | notation.  This option acts as a toggle.                                                          |                |
+   |                      +---------------------------------------------------------------------------------------------------+----------------+
+   |                      | Select *Format SQL* to format the selected SQL or all the SQL if none is selected                 | Shift+Cmd+K    |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+
+View/Edit Data Resultset Control
+********************************
+
+.. table::
+   :class: longtable
+   :widths: 1 4 1
+
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | Icon                 | Behavior                                                                                          | Shortcut       |
+   +======================+===================================================================================================+================+
+   | *Filter*             | Click the *Filter* icon to set filtering and sorting criteria for the data when in View/Edit data | Accesskey + F  |
+   |                      | mode. Click the down arrow to access other filtering and sorting options:                         |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Click *Sort/Filter* to open the sorting and filtering dialogue. In the *SQL Filter*, you can   |                |
+   |                      |    enter a SQL query as filtering criteria. In *Data Sorting*, you can select the column and      |                |
+   |                      |    specify the order for sorting.                                                                 |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Click *Filter by Selection* to show only the rows containing the values in the selected cells. |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Click *Exclude by Selection* to show only the rows that do not contain the values in the       |                |
+   |                      |    selected cells.                                                                                |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Click *Remove Sort/Filter* to remove any previously selected sort or filtering options.        |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | Limit Selector       | Select a value in the *Limit Selector* to limit the size of the dataset to a number of rows.      | Accesskey + R  |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Stop*               | Click the *Stop* icon to cancel the execution of the currently running query.                     | Accesskey + Q  |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+
+Query Execution
+***************
+
+.. table::
+   :class: longtable
+   :widths: 1 4 1
+
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | Icon                 | Behavior                                                                                          | Shortcut       |
+   +======================+===================================================================================================+================+
+   | *Execute/Refresh*    | Click the *Execute/Refresh* icon to either execute or refresh the query highlighted in the SQL    | F5             |
+   |                      | editor panel. Click the down arrow to access other execution options:                             |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Add a check next to *Auto-Rollback* to instruct the server to automatically roll back a        |                |
+   |                      |    transaction if an error occurs during the transaction.                                         |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Add a check next to *Auto-Commit* to instruct the server to automatically commit each          |                |
+   |                      |    transaction.  Any changes made by the transaction will be visible to others, and               |                |
+   |                      |    durable in the event of a crash.                                                               |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Explain*            | Click the *Explain* icon to view an explanation plan for the current query. The result of the     | F7             |
+   |                      | EXPLAIN is displayed graphically on the *Explain* tab of the output panel, and in text            |                |
+   |                      | form on the *Data Output* tab.                                                                    |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Explain analyze*    | Click the *Explain analyze* icon to invoke an EXPLAIN ANALYZE command on the current query.       | Shift+F7       |
+   |                      |                                                                                                   |                |
+   |                      | Navigate through the *Explain Options* menu to select options for the EXPLAIN command:            |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Select *Verbose* to display additional information regarding the query plan.                   |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Select *Costs* to include information on the estimated startup and total cost of each          |                |
+   |                      |    plan node, as well as the estimated number of rows and the estimated width of each             |                |
+   |                      |    row.                                                                                           |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Select *Buffers* to include information on buffer usage.                                       |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Select *Timing* to include information about the startup time and the amount of time           |                |
+   |                      |    spent in each node of the query.                                                               |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Select *Summary* to include the summary information about the query plan.                      |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Commit*             | Click the *Commit* icon to commit the transaction.                                                | Shift+CTRL+M   |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Rollback*           | Click the *Rollback* icon to rollback the transaction.                                            | Shift+CTRL+R   |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Clear*              | Use options on the *Clear* drop-down menu to erase display contents:                              | Accesskey + L  |
+   |                      |                                                                                                   |                |
+   |                      |  * Select *Clear Query Window* to erase the content of the SQL Editor panel.                      |                |
+   |                      |                                                                                                   |                |
+   |                      |  * Select *Clear History* to erase the content of the *History* tab.                              |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | *Download as CSV/TXT*| Click the *Download as CSV/TXT* icon to download the result set of the current query as a *.csv*  | F8             |
    |                      | or as a *.txt* file. if *CSV field seperator* set to comma(,) else as a *.txt* file.              |                |
    |                      | You can specify the CSV/TXT settings through *Preferences -> SQL Editor -> CSV/TXT output*        |                |
    |                      | dialogue.                                                                                         |                |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Macros*             | Click the *Macros* icon to manage the macros. You can create, edit or clear the macros through    |                |
+   |                      | the *Manage Macros* option.                                                                       |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+

docs/en_US/release_notes.rst

@@ -11,6 +11,14 @@ notes for it.
 .. toctree::
    :maxdepth: 1
 
+   release_notes_4_29
+   release_notes_4_28
+   release_notes_4_27
+   release_notes_4_26
+   release_notes_4_25
+   release_notes_4_24
+   release_notes_4_23
+   release_notes_4_22
    release_notes_4_21
    release_notes_4_20
    release_notes_4_19
@@ -48,4 +56,4 @@ notes for it.
    release_notes_1_3
    release_notes_1_2
    release_notes_1_1
-   release_notes_1_0
+   release_notes_1_0

docs/en_US/release_notes_4_22.rst

@@ -0,0 +1,54 @@
+************
+Version 4.22
+************
+
+Release date: 2020-05-28
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 4.21.
+
+New features
+************
+
+| `Issue #5452 <https://redmine.postgresql.org/issues/5452>`_ -  Added connected pgAdmin user and connection name in the log file.
+| `Issue #5489 <https://redmine.postgresql.org/issues/5489>`_ -  Show the startup log as well as the server log in the runtime's log viewer.
+
+Housekeeping
+************
+| `Issue #5255 <https://redmine.postgresql.org/issues/5255>`_ -  Implement Selenium Grid to run multiple tests across different browsers, operating systems, and machines in parallel.
+| `Issue #5333 <https://redmine.postgresql.org/issues/5333>`_ -  Improve code coverage and API test cases for Indexes.
+| `Issue #5334 <https://redmine.postgresql.org/issues/5334>`_ -  Improve code coverage and API test cases for the Rules module.
+| `Issue #5335 <https://redmine.postgresql.org/issues/5335>`_ -  Improve code coverage and API test cases for Triggers and Compound Triggers.
+| `Issue #5443 <https://redmine.postgresql.org/issues/5443>`_ -  Remove support for Python 2.
+| `Issue #5444 <https://redmine.postgresql.org/issues/5444>`_ -  Cleanup Python detection in the runtime project file.
+| `Issue #5455 <https://redmine.postgresql.org/issues/5455>`_ -  Refactor pgAdmin4.py so it can be imported and is a lot more readable.
+| `Issue #5493 <https://redmine.postgresql.org/issues/5493>`_ -  Search object UI improvements.
+| `Issue #5525 <https://redmine.postgresql.org/issues/5525>`_ -  Cleanup and refactor the macOS build scripts.
+| `Issue #5552 <https://redmine.postgresql.org/issues/5552>`_ -  Update dependencies in the Docker container.
+| `Issue #5553 <https://redmine.postgresql.org/issues/5553>`_ -  Remove PG 9.4 utilities from the Docker container as it's now out of support.
+
+Bug fixes
+*********
+
+| `Issue #3694 <https://redmine.postgresql.org/issues/3694>`_ -  Gracefully informed the user that the database is already connected when they click on "Connect Database...".
+| `Issue #4033 <https://redmine.postgresql.org/issues/4033>`_ -  Fixed an issue where clicking on the cross button of the alert box on the login page is not working.
+| `Issue #4099 <https://redmine.postgresql.org/issues/4099>`_ -  Fixed the SQL help issue for EDB Postgres Advanced Server.
+| `Issue #4223 <https://redmine.postgresql.org/issues/4223>`_ -  Ensure that maintenance job should be worked properly for indexes under a materialized view.
+| `Issue #4279 <https://redmine.postgresql.org/issues/4279>`_ -  Ensure that file browse "home" button should point to $HOME rather than /.
+| `Issue #4840 <https://redmine.postgresql.org/issues/4840>`_ -  Ensure that 'With OID' option should be disabled while taking backup of database server version 12 and above.
+| `Issue #5001 <https://redmine.postgresql.org/issues/5001>`_ -  Fixed invalid literal issue when removing the connection limit for the existing role.
+| `Issue #5052 <https://redmine.postgresql.org/issues/5052>`_ -  Fixed internal server error when clicking on Triggers -> 'Enable All' for partitions.
+| `Issue #5398 <https://redmine.postgresql.org/issues/5398>`_ -  Fixed generated SQL issue for auto vacuum options.
+| `Issue #5422 <https://redmine.postgresql.org/issues/5422>`_ -  Ensure that the dependencies tab shows correct information for Synonyms.
+| `Issue #5434 <https://redmine.postgresql.org/issues/5434>`_ -  Fixed an issue where the newly added table is not alphabetically added to the tree.
+| `Issue #5440 <https://redmine.postgresql.org/issues/5440>`_ -  Fixed list sorting issue in the schema diff tool.
+| `Issue #5449 <https://redmine.postgresql.org/issues/5449>`_ -  Fixed an issue while comparing the two identical schemas using the schema diff tool.
+| `Issue #5450 <https://redmine.postgresql.org/issues/5450>`_ -  Fixed an issue when renaming the column not added in the proper order.
+| `Issue #5466 <https://redmine.postgresql.org/issues/5466>`_ -  Correct ipv4 "all interfaces" address in the container docs, per Frank Limpert.
+| `Issue #5469 <https://redmine.postgresql.org/issues/5469>`_ -  Fixed an issue where select2 hover is inconsistent for the SSL field in create server dialog.
+| `Issue #5473 <https://redmine.postgresql.org/issues/5473>`_ -  Fixed post-login redirect location when running in server mode under a non-default root.
+| `Issue #5480 <https://redmine.postgresql.org/issues/5480>`_ -  Fixed an issue where the background job creation fails if there is only a version-specific python binary available in PATH.
+| `Issue #5481 <https://redmine.postgresql.org/issues/5481>`_ -  Fixed data truncation issue when updating the data of type character with length.
+| `Issue #5487 <https://redmine.postgresql.org/issues/5487>`_ -  Fixed an issue where if LDAP_SEARCH_BASE_DN is not set then, the value for LDAP_BASE_DN will be considered.
+| `Issue #5496 <https://redmine.postgresql.org/issues/5496>`_ -  Fixed an issue where clicking on Select All button, not selecting all the options in pgAgent job scheduler.
+| `Issue #5503 <https://redmine.postgresql.org/issues/5503>`_ -  Clarify and correct the docs on enabling the pl/debugger plugin on the server.
+| `Issue #5510 <https://redmine.postgresql.org/issues/5510>`_ -  Fixed Unicode decode error 'utf-8' codec can't decode byte.

docs/en_US/release_notes_4_23.rst

@@ -0,0 +1,38 @@
+************
+Version 4.23
+************
+
+Release date: 2020-06-25
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 4.22.
+
+New features
+************
+
+| `Issue #5468 <https://redmine.postgresql.org/issues/5468>`_ -  Added option to ignore the whitespaces while comparing objects in schema diff.
+| `Issue #5500 <https://redmine.postgresql.org/issues/5500>`_ -  Added server group name while selecting servers in schema diff.
+| `Issue #5516 <https://redmine.postgresql.org/issues/5516>`_ -  Added support of Row Security Policies.
+| `Issue #5576 <https://redmine.postgresql.org/issues/5576>`_ -  Improve error messaging if the storage and log directories cannot be created.
+
+Housekeeping
+************
+
+| `Issue #5325 <https://redmine.postgresql.org/issues/5325>`_ -  Improve code coverage and API test cases for Collations.
+| `Issue #5574 <https://redmine.postgresql.org/issues/5574>`_ -  Cleanup Windows build scripts and ensure Windows x64 builds will work.
+| `Issue #5581 <https://redmine.postgresql.org/issues/5581>`_ -  Documentation of Row Level Security Policies.
+
+Bug fixes
+*********
+
+| `Issue #3591 <https://redmine.postgresql.org/issues/3591>`_ -  Ensure that the query tool should display the proper error message while terminating the active session.
+| `Issue #3669 <https://redmine.postgresql.org/issues/3669>`_ -  Ensure that proper error should be displayed for the deleted node.
+| `Issue #3787 <https://redmine.postgresql.org/issues/3787>`_ -  Disabled the Stop process button after clicking it and added a message 'Terminating the process...' to notify the user.
+| `Issue #4226 <https://redmine.postgresql.org/issues/4226>`_ -  Fixed an issue where select all checkbox only selects the first 50 tables.
+| `Issue #5416 <https://redmine.postgresql.org/issues/5416>`_ -  Ensure that the query tool panel gets closed when clicking on the 'Don't Save' button.
+| `Issue #5465 <https://redmine.postgresql.org/issues/5465>`_ -  Fixed an issue where the Edge browser version is showing wrong and warning message gets displayed.
+| `Issue #5492 <https://redmine.postgresql.org/issues/5492>`_ -  Fixed an issue where the search object is unable to locate inherited tables and constraint filters are not working.
+| `Issue #5507 <https://redmine.postgresql.org/issues/5507>`_ -  Fixed connection and version number detection issue when the database server is upgraded.
+| `Issue #5521 <https://redmine.postgresql.org/issues/5521>`_ -  Fixed an issue when dumping servers from a desktop pgAdmin app by providing an option '--sqlite-path'.
+| `Issue #5539 <https://redmine.postgresql.org/issues/5539>`_ -  Fixed typo in exception keyword.
+| `Issue #5584 <https://redmine.postgresql.org/issues/5584>`_ -  Fixed an issue where two identical tables showing different by schema diff tool.
+| `Issue #5592 <https://redmine.postgresql.org/issues/5592>`_ -  Ensure that pgadmin should be able to connect to the server which has password more than 1000 characters.

docs/en_US/release_notes_4_24.rst

@@ -0,0 +1,53 @@
+************
+Version 4.24
+************
+
+Release date: 2020-07-23
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 4.23.
+
+New features
+************
+
+| `Issue #5235 <https://redmine.postgresql.org/issues/5235>`_ -  Support configuration files that are external to the application installation.
+| `Issue #5484 <https://redmine.postgresql.org/issues/5484>`_ -  Added support for LDAP authentication with different DN by setting the dedicated user for the LDAP connection.
+| `Issue #5583 <https://redmine.postgresql.org/issues/5583>`_ -  Added support for schema level restriction.
+| `Issue #5601 <https://redmine.postgresql.org/issues/5601>`_ -  Added RLS Policy support in Schema Diff.
+| `Issue #5622 <https://redmine.postgresql.org/issues/5622>`_ -  Added support for permissive/restricted policy type while creating RLS Policy.
+| `Issue #5650 <https://redmine.postgresql.org/issues/5650>`_ -  Added support for LDAP anonymous binding.
+| `Issue #5653 <https://redmine.postgresql.org/issues/5653>`_ -  Added High Contrast theme support.
+
+Housekeeping
+************
+
+| `Issue #5323 <https://redmine.postgresql.org/issues/5323>`_ -  Improve code coverage and API test cases for Foreign Data Wrapper.
+| `Issue #5326 <https://redmine.postgresql.org/issues/5326>`_ -  Improve code coverage and API test cases for Domain and Domain Constraints.
+| `Issue #5329 <https://redmine.postgresql.org/issues/5329>`_ -  Improve code coverage and API test cases for FTS Configuration, FTS Parser, FTS Dictionaries, and FTS Template.
+
+Bug fixes
+*********
+
+| `Issue #3814 <https://redmine.postgresql.org/issues/3814>`_ -  Fixed issue of error message not getting displayed when filename is empty for backup, restore, and import/export.
+| `Issue #3851 <https://redmine.postgresql.org/issues/3851>`_ -  Add proper indentation to the code while generating functions, procedures, and trigger functions.
+| `Issue #4235 <https://redmine.postgresql.org/issues/4235>`_ -  Fixed tab indent issue on a selection of lines is deleting the content when 'use spaces == true' in the preferences.
+| `Issue #5137 <https://redmine.postgresql.org/issues/5137>`_ -  Fixed save button enable issue when focusing in and out of numeric input field.
+| `Issue #5287 <https://redmine.postgresql.org/issues/5287>`_ -  Fixed dark theme-related CSS and modify the color codes.
+| `Issue #5414 <https://redmine.postgresql.org/issues/5414>`_ -  Use QStandardPaths::AppLocalDataLocation in the runtime to determine where to store runtime logs.
+| `Issue #5463 <https://redmine.postgresql.org/issues/5463>`_ -  Fixed an issue where CSV download quotes numeric columns.
+| `Issue #5470 <https://redmine.postgresql.org/issues/5470>`_ -  Fixed backgrid row hover issue where on hover background color is set for edit and delete cell only.
+| `Issue #5530 <https://redmine.postgresql.org/issues/5530>`_ -  Ensure that the referenced table should be displayed on foreign key constraints.
+| `Issue #5554 <https://redmine.postgresql.org/issues/5554>`_ -  Replace the runtime themes with ones that don't have sizing issues.
+| `Issue #5569 <https://redmine.postgresql.org/issues/5569>`_ -  Fixed reverse engineered SQL for partitions when storage parameters are specified.
+| `Issue #5577 <https://redmine.postgresql.org/issues/5577>`_ -  Include LICENSE and DEPENDENCIES [inventory] files in official packages.
+| `Issue #5621 <https://redmine.postgresql.org/issues/5621>`_ -  Remove extra brackets from reverse engineering SQL of RLS Policy.
+| `Issue #5629 <https://redmine.postgresql.org/issues/5629>`_ -  Fixed an issue where the user is able to edit properties when some of the collection nodes are selected.
+| `Issue #5630 <https://redmine.postgresql.org/issues/5630>`_ -  Fixed an issue where installation of pgadmin4 not working on 32-bit Windows.
+| `Issue #5631 <https://redmine.postgresql.org/issues/5631>`_ -  Fixed 'cant execute empty query' issue when remove the value of 'USING' or 'WITH CHECK' option of RLS Policy.
+| `Issue #5633 <https://redmine.postgresql.org/issues/5633>`_ -  Ensure that create RLS Policy menu should not be visible for catalog objects.
+| `Issue #5647 <https://redmine.postgresql.org/issues/5647>`_ -  Fixed an issue where difference DDL is showing the wrong SQL when changing the policy owner.
+| `Issue #5662 <https://redmine.postgresql.org/issues/5662>`_ -  Fixed accessibility issue where few dialogs are not rendering properly when we zoomed in browser window 200% and screen resolution is low.
+| `Issue #5666 <https://redmine.postgresql.org/issues/5666>`_ -  Added missing dependencies/dependent and corrected some wrongly identified.
+| `Issue #5673 <https://redmine.postgresql.org/issues/5673>`_ -  Fixed an issue where fetching the schema throws an error if the database is not connected in Schema Diff.
+| `Issue #5675 <https://redmine.postgresql.org/issues/5675>`_ -  Fixed CSRF errors when pgAdmin opened in an iframe on safari browser.
+| `Issue #5677 <https://redmine.postgresql.org/issues/5677>`_ -  Fixed text color issue in explain analyze for the Dark theme.
+| `Issue #5686 <https://redmine.postgresql.org/issues/5686>`_ -  Fixed issue where the user was not able to update policy if the policy is created with space.

docs/en_US/release_notes_4_25.rst

@@ -0,0 +1,49 @@
+************
+Version 4.25
+************
+
+Release date: 2020-08-20
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 4.24.
+
+New features
+************
+
+| `Issue #3904 <https://redmine.postgresql.org/issues/3904>`_ -  Replace charting library Flotr2 with ChartJS using React.
+| `Issue #5126 <https://redmine.postgresql.org/issues/5126>`_ -  Modified schema diff tool to compare two databases instead of two schemas.
+| `Issue #5610 <https://redmine.postgresql.org/issues/5610>`_ -  Add a --yes command line option to setup-web.sh to allow non-interactive use.
+
+Housekeeping
+************
+
+| `Issue #5324 <https://redmine.postgresql.org/issues/5324>`_ -  Improve code coverage and API test cases for Foreign Servers and User Mappings.
+| `Issue #5327 <https://redmine.postgresql.org/issues/5327>`_ -  Improve code coverage and API test cases for Schemas.
+| `Issue #5336 <https://redmine.postgresql.org/issues/5336>`_ -  Improve code coverage and API test cases for Types.
+| `Issue #5700 <https://redmine.postgresql.org/issues/5700>`_ -  Remove old Python 2 compatibility code.
+| `Issue #5731 <https://redmine.postgresql.org/issues/5731>`_ -  Upgrade font awesome from v4 to v5.
+
+Bug fixes
+*********
+
+| `Issue #3767 <https://redmine.postgresql.org/issues/3767>`_ -  Ensure that the original file format should be retained when saving the same file in SQL editor.
+| `Issue #3791 <https://redmine.postgresql.org/issues/3791>`_ -  Added missing comments in reverse engineering SQL for each column of a View.
+| `Issue #4123 <https://redmine.postgresql.org/issues/4123>`_ -  Fixed an issue where debugger doesn't work if the search path is set other than 'public'.
+| `Issue #4361 <https://redmine.postgresql.org/issues/4361>`_ -  Fixed ssh tunnel hang issue when the user tries to disconnect the server.
+| `Issue #4387 <https://redmine.postgresql.org/issues/4387>`_ -  Fixed an issue where the user is not able to insert the data if the table and columns name contains special characters.
+| `Issue #4810 <https://redmine.postgresql.org/issues/4810>`_ -  Fixed an issue where the user is not able to save the new row if the table is empty.
+| `Issue #5429 <https://redmine.postgresql.org/issues/5429>`_ -  Ensure that the Dictionaries drop-down shows all the dictionaries in the FTS configuration dialog.
+| `Issue #5490 <https://redmine.postgresql.org/issues/5490>`_ -  Make the runtime configuration dialog non-modal.
+| `Issue #5526 <https://redmine.postgresql.org/issues/5526>`_ -  Fixed an issue where copying and pasting a cell with multiple line data will result in multiple rows.
+| `Issue #5567 <https://redmine.postgresql.org/issues/5567>`_ -  Fixed an issue where conversion of bytea to the binary string results in an error.
+| `Issue #5604 <https://redmine.postgresql.org/issues/5604>`_ -  Fixed an issue where the entire logs is in red text when the user runs backup and restore.
+| `Issue #5632 <https://redmine.postgresql.org/issues/5632>`_ -  Ensure that the user will be able to modify the start value of the Identity column.
+| `Issue #5646 <https://redmine.postgresql.org/issues/5646>`_ -  Ensure that RLS Policy node should be searchable using search object.
+| `Issue #5664 <https://redmine.postgresql.org/issues/5664>`_ -  Fixed an issue where 'ALTER VIEW' statement is missing when the user sets the default value of a column for View.
+| `Issue #5670 <https://redmine.postgresql.org/issues/5670>`_ -  Fixed an issue where the error message does not have a close button on utility dialogs.
+| `Issue #5689 <https://redmine.postgresql.org/issues/5689>`_ -  Added the 'ORDER BY' clause for the privileges type to fix schema diff issue.
+| `Issue #5708 <https://redmine.postgresql.org/issues/5708>`_ -  Correct TLS certificate filename in the container deployment docs.
+| `Issue #5710 <https://redmine.postgresql.org/issues/5710>`_ -  Fixed an issue when comparing the table with a trigger throwing error in schema diff.
+| `Issue #5713 <https://redmine.postgresql.org/issues/5713>`_ -  Corrected DROP SQL syntax for catalog.
+| `Issue #5716 <https://redmine.postgresql.org/issues/5716>`_ -  Fixed an issue where ajax call continues to fire even after disconnecting the database server.
+| `Issue #5724 <https://redmine.postgresql.org/issues/5724>`_ -  Clarify some of the differences when running in server mode in the docs.
+| `Issue #5730 <https://redmine.postgresql.org/issues/5730>`_ -  Resolve schema diff dependencies by selecting the appropriate node automatically and maintain the order in the generated script.

docs/en_US/release_notes_4_26.rst

@@ -0,0 +1,49 @@
+************
+Version 4.26
+************
+
+Release date: 2020-09-17
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 4.25.
+
+New features
+************
+
+| `Issue #2042 <https://redmine.postgresql.org/issues/2042>`_ -  Added SQL Formatter support in Query Tool.
+| `Issue #4059 <https://redmine.postgresql.org/issues/4059>`_ -  Added a new button to the query tool toolbar to open a new query tool window.
+| `Issue #4979 <https://redmine.postgresql.org/issues/4979>`_ -  Added shared server support for admin users.
+| `Issue #5772 <https://redmine.postgresql.org/issues/5772>`_ -  Warn the user when connecting to a server that is older than pgAdmin supports.
+
+Housekeeping
+************
+
+| `Issue #5332 <https://redmine.postgresql.org/issues/5332>`_ -  Improve code coverage and API test cases for Columns and Constraints (Index, Foreign Key, Check, Exclusion).
+| `Issue #5344 <https://redmine.postgresql.org/issues/5344>`_ -  Improve code coverage and API test cases for Grant Wizard.
+| `Issue #5774 <https://redmine.postgresql.org/issues/5774>`_ -  Improve code coverage and API test cases for Tables.
+| `Issue #5792 <https://redmine.postgresql.org/issues/5792>`_ -  Added documentation for shared server support.
+
+Bug fixes
+*********
+
+| `Issue #4216 <https://redmine.postgresql.org/issues/4216>`_ -  Ensure that schema names starting with 'pg' should be visible in browser tree when standard_conforming_strings is set to off.
+| `Issue #5426 <https://redmine.postgresql.org/issues/5426>`_ -  Adjusted the height of jobstep code block to use maximum space.
+| `Issue #5652 <https://redmine.postgresql.org/issues/5652>`_ -  Modified the 'Commit' and 'Rollback' query tool button icons.
+| `Issue #5722 <https://redmine.postgresql.org/issues/5722>`_ -  Ensure that the user should be able to drop the database even if it is connected.
+| `Issue #5732 <https://redmine.postgresql.org/issues/5732>`_ -  Fixed some accessibility issues.
+| `Issue #5734 <https://redmine.postgresql.org/issues/5734>`_ -  Update the description of GIN and GiST indexes in the documentation.
+| `Issue #5746 <https://redmine.postgresql.org/issues/5746>`_ -  Fixed an issue where --load-server does not allow loading connections that use pg_services.
+| `Issue #5748 <https://redmine.postgresql.org/issues/5748>`_ -  Fixed incorrect reverse engineering SQL for Foreign key when creating a table.
+| `Issue #5751 <https://redmine.postgresql.org/issues/5751>`_ -  Enable the 'Configure' and 'View log' menu option when the server taking longer than usual time to start.
+| `Issue #5754 <https://redmine.postgresql.org/issues/5754>`_ -  Fixed an issue where schema diff is not working when providing the options to Foreign Data Wrapper, Foreign Server, and User Mapping.
+| `Issue #5764 <https://redmine.postgresql.org/issues/5764>`_ -  Fixed SQL for Row Level Security which is incorrectly generated.
+| `Issue #5765 <https://redmine.postgresql.org/issues/5765>`_ -  Fixed an issue in the query tool when columns are having the same name as javascript object internal functions.
+| `Issue #5766 <https://redmine.postgresql.org/issues/5766>`_ -  Fixed string indices must be integers issue for PostgreSQL < 9.3.
+| `Issue #5773 <https://redmine.postgresql.org/issues/5773>`_ -  Fixed an issue where the application ignores the fixed port configuration value.
+| `Issue #5775 <https://redmine.postgresql.org/issues/5775>`_ -  Ensure that 'setup-web.sh' should work in Debian 10.
+| `Issue #5779 <https://redmine.postgresql.org/issues/5779>`_ -  Remove illegal argument from trigger function in trigger DDL statement.
+| `Issue #5794 <https://redmine.postgresql.org/issues/5794>`_ -  Fixed excessive CPU usage by stopping the indefinite growth of the graph dataset.
+| `Issue #5815 <https://redmine.postgresql.org/issues/5815>`_ -  Fixed an issue where clicking on the 'Generate script' button shows a forever spinner due to pop up blocker.
+| `Issue #5816 <https://redmine.postgresql.org/issues/5816>`_ -  Ensure that the 'CREATE SCHEMA' statement should be present in the generated script if the schema is not present in the target database.
+| `Issue #5820 <https://redmine.postgresql.org/issues/5820>`_ -  Fixed an issue while refreshing Resource Group.
+| `Issue #5833 <https://redmine.postgresql.org/issues/5833>`_ -  Fixed an issue where custom sequences are not visible when show system objects are set to false.
+| `Issue #5834 <https://redmine.postgresql.org/issues/5834>`_ -  Ensure that the 'Remove Server Group' option is available in the context menu.

docs/en_US/release_notes_4_27.rst

@@ -0,0 +1,47 @@
+************
+Version 4.27
+************
+
+Release date: 2020-10-15
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 4.26.
+
+New features
+************
+
+| `Issue #1402 <https://redmine.postgresql.org/issues/1402>`_ -  Added Macro support.
+| `Issue #2519 <https://redmine.postgresql.org/issues/2519>`_ -  Added support to view trigger function under the respective trigger node.
+| `Issue #3794 <https://redmine.postgresql.org/issues/3794>`_ -  Allow user to change the database connection from an open query tool tab.
+| `Issue #5200 <https://redmine.postgresql.org/issues/5200>`_ -  Added support to ignore the owner while comparing objects in the Schema Diff tool.
+| `Issue #5857 <https://redmine.postgresql.org/issues/5857>`_ -  Added documentation for Macro support.
+
+Housekeeping
+************
+
+| `Issue #5330 <https://redmine.postgresql.org/issues/5330>`_ -  Improve code coverage and API test cases for Functions.
+| `Issue #5395 <https://redmine.postgresql.org/issues/5395>`_ -  Added RESQL/MSQL test cases for Functions.
+| `Issue #5497 <https://redmine.postgresql.org/issues/5497>`_ -  Merged the latest code of 'pgcli' used for the autocomplete feature.
+
+Bug fixes
+*********
+
+| `Issue #4806 <https://redmine.postgresql.org/issues/4806>`_ -  Added useful message when the explain plan is not used and empty.
+| `Issue #4855 <https://redmine.postgresql.org/issues/4855>`_ -  Fixed an issue where file extension is stripped on renaming a file.
+| `Issue #5131 <https://redmine.postgresql.org/issues/5131>`_ -  Ensure that 'ctrl + a' shortcut does not move the cursor in SQL editor.
+| `Issue #5417 <https://redmine.postgresql.org/issues/5417>`_ -  Fixed and improve API test cases for the schema diff tool.
+| `Issue #5739 <https://redmine.postgresql.org/issues/5739>`_ -  Ensure that the import/export feature should work with SSH Tunnel.
+| `Issue #5802 <https://redmine.postgresql.org/issues/5802>`_ -  Remove maximum length on the password field in the server dialog.
+| `Issue #5807 <https://redmine.postgresql.org/issues/5807>`_ -  Fixed an issue where a column is renamed and then removed, then the drop SQL query takes the wrong column name.
+| `Issue #5826 <https://redmine.postgresql.org/issues/5826>`_ -  Fixed an issue where schema diff is showing identical table as different due to default vacuum settings.
+| `Issue #5830 <https://redmine.postgresql.org/issues/5830>`_ -  Fixed reverse engineering SQL where parenthesis is not properly arranged for View/MView definition.
+| `Issue #5835 <https://redmine.postgresql.org/issues/5835>`_ -  Fixed 'can't execute an empty query' message if the user change the option of Auto FK Index.
+| `Issue #5839 <https://redmine.postgresql.org/issues/5839>`_ -  Ensure that multiple extensions can be dropped from the properties tab.
+| `Issue #5841 <https://redmine.postgresql.org/issues/5841>`_ -  Fixed an issue where the server is not able to connect using the service.
+| `Issue #5843 <https://redmine.postgresql.org/issues/5843>`_ -  Fixed an issue where the 'PARALLEL UNSAFE' option is missing from reverse engineering SQL of function/procedure.
+| `Issue #5845 <https://redmine.postgresql.org/issues/5845>`_ -  Fixed an issue where the query tool is not fetching more than 1000 rows for the table does not have any primary key.
+| `Issue #5853 <https://redmine.postgresql.org/issues/5853>`_ -  Fixed an issue where 'Rows X' column values were not visible properly for Explain Analyze in Dark theme.
+| `Issue #5855 <https://redmine.postgresql.org/issues/5855>`_ -  Ensure that the user should be able to change the start value of the existing sequence.
+| `Issue #5861 <https://redmine.postgresql.org/issues/5861>`_ -  Ensure that the 'Remove Server' option should be visible in the context menu.
+| `Issue #5867 <https://redmine.postgresql.org/issues/5867>`_ -  Fixed an issue where some properties are not being updated correctly for the shared server.
+| `Issue #5882 <https://redmine.postgresql.org/issues/5882>`_ -  Fixed invalid literal issue when fetching dependencies for Materialized View.
+| `Issue #5885 <https://redmine.postgresql.org/issues/5885>`_ -  Fixed an issue where the user is unable to change the macro name.

docs/en_US/release_notes_4_28.rst

@@ -0,0 +1,38 @@
+************
+Version 4.28
+************
+
+Release date: 2020-11-12
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 4.27.
+
+New features
+************
+
+| `Issue #3318 <https://redmine.postgresql.org/issues/3318>`_ -  Added support to download utility files at the client-side.
+| `Issue #4230 <https://redmine.postgresql.org/issues/4230>`_ -  Added support to rename query tool and debugger tabs title.
+| `Issue #4231 <https://redmine.postgresql.org/issues/4231>`_ -  Added support for dynamic tab size.
+| `Issue #4232 <https://redmine.postgresql.org/issues/4232>`_ -  Added tab title placeholder for Query Tool, View/Edit Data, and Debugger.
+| `Issue #5891 <https://redmine.postgresql.org/issues/5891>`_ -  Added support to compare schemas and databases in schema diff.
+
+Housekeeping
+************
+
+| `Issue #5938 <https://redmine.postgresql.org/issues/5938>`_ -  Documentation of Storage Manager.
+
+Bug fixes
+*********
+
+| `Issue #4639 <https://redmine.postgresql.org/issues/4639>`_ -  Ensure that some fields should be disabled for the trigger in edit mode.
+| `Issue #5736 <https://redmine.postgresql.org/issues/5736>`_ -  Fixed an issue where the validation error message is shown twice.
+| `Issue #5760 <https://redmine.postgresql.org/issues/5760>`_ -  Ensure that non-superuser should be able to debug the function.
+| `Issue #5842 <https://redmine.postgresql.org/issues/5842>`_ -  Ensure that query history should be listed by date/time in descending order.
+| `Issue #5858 <https://redmine.postgresql.org/issues/5858>`_ -  Ensure that search object functionality works with case insensitive string.
+| `Issue #5895 <https://redmine.postgresql.org/issues/5895>`_ -  Fixed an issue where the suffix for Toast table size is not visible in the Statistics tab.
+| `Issue #5911 <https://redmine.postgresql.org/issues/5911>`_ -  Ensure that macros should be run on the older version of Safari and Chrome.
+| `Issue #5914 <https://redmine.postgresql.org/issues/5914>`_ -  Fixed an issue where a mismatch in the value of 'Estimated row' for functions.
+| `Issue #5919 <https://redmine.postgresql.org/issues/5919>`_ -  Added security related enhancements.
+| `Issue #5923 <https://redmine.postgresql.org/issues/5923>`_ -  Fixed an issue where non-closeable tabs are getting closed.
+| `Issue #5950 <https://redmine.postgresql.org/issues/5950>`_ -  Fixed an issue where a long file name is not visible on the process watcher dialog.
+| `Issue #5953 <https://redmine.postgresql.org/issues/5953>`_ -  Fixed an issue where connection to the server is on wait state if a different user is provided.
+| `Issue #5959 <https://redmine.postgresql.org/issues/5959>`_ -  Ensure that Grant Wizard should include foreign tables.

docs/en_US/release_notes_4_29.rst

@@ -0,0 +1,37 @@
+************
+Version 4.29
+************
+
+Release date: 2020-12-10
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 4.28.
+
+New features
+************
+
+
+Housekeeping
+************
+
+| `Issue #5328 <https://redmine.postgresql.org/issues/5328>`_ -  Improve code coverage and API test cases for Foreign Tables.
+| `Issue #5337 <https://redmine.postgresql.org/issues/5337>`_ -  Improve code coverage and API test cases for Views and Materialized Views.
+| `Issue #5343 <https://redmine.postgresql.org/issues/5343>`_ -  Improve code coverage and API test cases for Debugger.
+| `Issue #6033 <https://redmine.postgresql.org/issues/6033>`_ -  Update the cryptography python package for Python 3.5 and above.
+| `Issue #6062 <https://redmine.postgresql.org/issues/6062>`_ -  Ensure that code coverage should cover class and function declarations.
+
+Bug fixes
+*********
+
+| `Issue #5886 <https://redmine.postgresql.org/issues/5886>`_ -  Fixed false error is shown while adding a new foreign key from the table dialog when a foreign key already exists with Auto FK Index set to true.
+| `Issue #5943 <https://redmine.postgresql.org/issues/5943>`_ -  Ensure that folder rename should work properly in Storage Manager.
+| `Issue #5974 <https://redmine.postgresql.org/issues/5974>`_ -  Fixed an issue where the debugger's custom tab title not applied when opened in the new browser tab.
+| `Issue #5978 <https://redmine.postgresql.org/issues/5978>`_ -  Fixed an issue where dynamic tab title has not applied the first time for debugger panel.
+| `Issue #5982 <https://redmine.postgresql.org/issues/5982>`_ -  Fixed documentation issue where JSON is not valid.
+| `Issue #5983 <https://redmine.postgresql.org/issues/5983>`_ -  Added the appropriate server icon based on the server type in the new connection dialog.
+| `Issue #5985 <https://redmine.postgresql.org/issues/5985>`_ -  Fixed an issue where the process watcher dialog throws an error for the database server which is already removed.
+| `Issue #5991 <https://redmine.postgresql.org/issues/5991>`_ -  Ensure that dirty indicator (*) should not be visible when renaming the tabs.
+| `Issue #5992 <https://redmine.postgresql.org/issues/5992>`_ -  Fixed an issue where escape character is shown when the server/database name has some special characters.
+| `Issue #5998 <https://redmine.postgresql.org/issues/5998>`_ -  Fixed an issue where schema diff doesn't show the result of compare if source schema has tables with RLS.
+| `Issue #6003 <https://redmine.postgresql.org/issues/6003>`_ -  Fixed an issue where an illegal argument is showing for trigger SQL when a trigger is created for View.
+| `Issue #6022 <https://redmine.postgresql.org/issues/6022>`_ -  Fixed an issue where shared servers import is failing.
+| `Issue #6072 <https://redmine.postgresql.org/issues/6072>`_ -  Fixed DLL load failed while importing bcrypt.