Ensure that data output color is readable on row selection. Fixes #5687

1) Schema diff compare button icon is not visible on hover.
  2) Schema diff for identical section text is not readable due to the same color as the background.
  3) Removed extra variables used for set text color for explain - Analysis section (Issue related dark theme.). 
  4) Issue related to the disabled toggle button.

refs #5653

.gitignore

@@ -1,8 +1,6 @@
 *.autosave
 *.db
-*.diff
 *.o
-*.patch
 *.psp
 *.pyc
 *.pyo
@@ -11,14 +9,18 @@
 .DS_Store
 .idea
 .vscode
+/*.diff
+/*.patch
 /dist
+/debian-build
 /docker-build
 /mac-build
 /pip-build
+/redhat-build
 /src-build
 /win-build
 _build
-build-*
+/build-*
 pgadmin4.log
 pkg/win32/installer.iss
 pkg/mac/codesign.conf
@@ -36,10 +38,15 @@ runtime/pgAdmin4_resource.rc
 runtime/release/
 runtime/ui_BrowserWindow.h
 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
 web/yarn-error.log
 /web/cacert.pem
+auditjs.html
+auditpy.txt
+/venv/

Dockerfile

@@ -0,0 +1,200 @@
+########################################################################
+#
+# pgAdmin 4 - PostgreSQL Tools
+#
+# Copyright (C) 2013 - 2018, The pgAdmin Development Team
+# This software is released under the PostgreSQL Licence
+#
+#########################################################################
+
+#########################################################################
+# Create a Node container which will be used to build the JS components
+# and clean up the web/ source code
+#########################################################################
+
+FROM node:12-alpine3.11 AS app-builder
+
+RUN apk add --no-cache \
+    autoconf \
+    automake \
+    bash \
+    g++ \
+    libc6-compat \
+    libjpeg-turbo-dev \
+    libpng-dev \
+    make \
+    nasm \
+    git \
+    zlib-dev
+
+# Create the /pgadmin4 directory and copy the source into it. Explicitly
+# remove the node_modules directory as we'll recreate a clean version, as well
+# as various other files we don't want
+COPY web /pgadmin4/web
+RUN rm -rf /pgadmin4/web/*.log \
+           /pgadmin4/web/config_*.py \
+           /pgadmin4/web/node_modules \
+           /pgadmin4/web/regression \
+           `find /pgadmin4/web -type d -name tests` \
+           `find /pgadmin4/web -type f -name .DS_Store`
+
+WORKDIR /pgadmin4/web
+
+# Build the JS vendor code in the app-builder, and then remove the vendor source.
+RUN npm install && \
+	npm audit fix && \
+	rm -f yarn.lock && \
+	yarn import && \
+# 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 && \
+	rm -f package-lock.json && \
+    yarn run bundle && \
+    rm -rf node_modules \
+           yarn.lock \
+           package.json \
+           .[^.]* \
+           babel.cfg \
+           webpack.* \
+           karma.conf.js \
+           ./pgadmin/static/js/generated/.cache
+
+#########################################################################
+# Now, create a documentation build container for the Sphinx docs
+#########################################################################
+
+FROM python:3.8-alpine3.11 as docs-builder
+
+# Install only dependencies absolutely required for documentation building
+RUN apk add --no-cache \
+        make \
+        build-base \
+        openssl-dev \
+        libffi-dev && \
+    pip install --no-cache-dir \
+        sphinx \
+        flask_security_too \
+        flask_paranoid \
+        python-dateutil \
+        flask_sqlalchemy \
+        flask_gravatar \
+        flask_migrate \
+        simplejson \
+        cryptography
+
+# Copy the docs from the local tree. Explicitly remove any existing builds that
+# may be present
+COPY docs /pgadmin4/docs
+COPY web /pgadmin4/web
+RUN rm -rf /pgadmin4/docs/en_US/_build
+
+# Build the docs
+RUN LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 make -C /pgadmin4/docs/en_US -f Makefile.sphinx html
+
+#########################################################################
+# Create additional builders to get all of the PostgreSQL utilities
+#########################################################################
+
+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.11 as tool-builder
+
+# Copy the PG binaries
+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/
+COPY --from=pg95-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-9.5/
+
+COPY --from=pg96-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.6/
+COPY --from=pg96-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-9.6/
+COPY --from=pg96-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-9.6/
+COPY --from=pg96-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-9.6/
+
+COPY --from=pg10-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-10/
+COPY --from=pg10-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-10/
+COPY --from=pg10-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-10/
+COPY --from=pg10-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-10/
+
+COPY --from=pg11-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-11/
+COPY --from=pg11-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-11/
+COPY --from=pg11-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-11/
+COPY --from=pg11-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-11/
+
+COPY --from=pg12-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-12/
+COPY --from=pg12-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-12/
+COPY --from=pg12-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-12/
+COPY --from=pg12-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-12/
+
+#########################################################################
+# Assemble everything into the final container.
+#########################################################################
+
+FROM python:3.8-alpine3.11
+
+COPY --from=tool-builder /usr/local/pgsql /usr/local/
+
+WORKDIR /pgadmin4
+ENV PYTHONPATH=/pgadmin4
+
+# Copy in the code and docs
+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 \
+        build-deps \
+        build-base \
+        postgresql-dev \
+        libffi-dev \
+        linux-headers && \
+    apk add \
+        postfix \
+        postgresql-client \
+        postgresql-libs \
+        shadow \
+        sudo \
+        libcap && \
+    pip install --upgrade pip && \
+    pip install --no-cache-dir -r requirements.txt && \
+    pip install --no-cache-dir gunicorn==19.9.0 && \
+    apk del --no-cache build-deps && \
+    echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix
+
+# We need the v12 libpq, which is only in the 'edge' build of Alpine at present
+COPY --from=pg12-builder /usr/local/lib/libpq.so.5.12 /usr/lib/
+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/entrypoint.sh /entrypoint.sh
+
+# Precompile and optimize python code to save time and space on startup
+RUN python -O -m compileall -x node_modules /pgadmin4
+
+RUN groupadd -g 5050 pgadmin && \
+    useradd -r -u 5050 -g pgadmin pgadmin && \
+    mkdir -p /var/lib/pgadmin && \
+    chown pgadmin:pgadmin /var/lib/pgadmin && \
+    mkdir -p /var/log/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.8
+USER pgadmin
+
+# Finish up
+VOLUME /var/lib/pgadmin
+EXPOSE 80 443
+
+ENTRYPOINT ["/entrypoint.sh"]

LICENSE

@@ -1,6 +1,6 @@
 pgAdmin 4
 
-Copyright (C) 2013 - 2019, The pgAdmin Development Team
+Copyright (C) 2013 - 2020, The pgAdmin Development Team
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose, without fee, and without a written agreement is

Make.bat

@@ -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,46 +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
-    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
-    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
-    COPY "%PGDIR%\bin\ssleay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\libeay32.dll" "%PGBUILDPATH%\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
+    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 (
+        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 "%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
@@ -301,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%
@@ -354,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 ************************************************************
@@ -368,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

@@ -9,6 +9,10 @@
 
 SHELL = /bin/sh
 
+APP_NAME := $(shell grep ^APP_NAME web/config.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]' | tr -d "'" | awk '{print tolower($$0)}')
+APP_RELEASE := $(shell grep ^APP_RELEASE web/config.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]')
+APP_REVISION := $(shell grep ^APP_REVISION web/config.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]')
+
 #########################################################################
 # High-level targets
 #########################################################################
@@ -20,7 +24,16 @@ appbundle: docs
 	./pkg/mac/build.sh
 
 install-node:
-	cd web && yarn install
+	cd web && npm install
+	cd web && npm audit fix
+	rm -f web/yarn.lock
+	cd web && yarn import
+# 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
+	rm -f package-lock.json
+	rm -f web/package-lock.json
 
 bundle:
 	cd web && yarn run bundle
@@ -34,6 +47,23 @@ linter:
 check: install-node bundle linter check-pep8
 	cd web && yarn run karma start --single-run && python regression/runtests.py
 
+check-audit:
+	cd web && yarn run audit
+
+check-auditjs:
+# 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.
+#	cd web && yarn run auditjs
+	cd web && yarn run auditjs --groups dependencies
+
+check-auditjs-html:
+	cd web && yarn run auditjs-html
+
+check-auditpy:
+	cd web && yarn run auditpy
+
 check-pep8:
 	pycodestyle --config=.pycodestyle docs/
 	pycodestyle --config=.pycodestyle pkg/
@@ -59,7 +89,7 @@ runtime:
 	cd runtime && qmake CONFIG+=release && make
 
 # Include all clean sub-targets in clean
-clean: clean-appbundle clean-docker clean-dist clean-docs clean-node clean-pip clean-src clean-runtime
+clean: clean-appbundle clean-debian clean-dist clean-docs clean-node clean-pip clean-redhat clean-src clean-runtime
 	rm -rf web/pgadmin/static/js/generated/*
 	rm -rf web/pgadmin/static/js/generated/.cache
 	rm -rf web/pgadmin/static/css/generated/*
@@ -72,8 +102,8 @@ clean-runtime:
 clean-appbundle:
 	rm -rf mac-build/
 
-clean-docker:
-	rm -rf docker-build/
+clean-debian:
+	rm -rf debian-build/
 
 clean-dist:
 	rm -rf dist/
@@ -87,11 +117,18 @@ clean-node:
 clean-pip:
 	rm -rf pip-build/
 
+clean-redhat:
+	rm -rf redhat-build/
+
 clean-src:
 	rm -rf src-build/
 
+debian:
+	./pkg/debian/build.sh
+
 docker:
-	./pkg/docker/build.sh
+	echo $(APP_NAME)
+	docker build -t ${APP_NAME} -t $(APP_NAME):latest -t $(APP_NAME):$(APP_RELEASE) -t $(APP_NAME):$(APP_RELEASE).$(APP_REVISION) .
 
 docs:
 	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html
@@ -118,5 +155,8 @@ msg-update:
 pip: docs
 	./pkg/pip/build.sh
 
+redhat:
+	./pkg/redhat/build.sh
+
 src:
 	./pkg/src/build.sh

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.
@@ -219,6 +214,23 @@ can be used:
     C:\$PGADMIN4_SRC\web> yarn install
     C:\$PGADMIN4_SRC\web> yarn run bundle
 
+Creating pgAdmin themes
+-----------------------
+
+To create a pgAdmin theme, you need to create a directory under
+web/pgadmin/static/scss/resources.
+Copy the sample file _theme.variables.scss.sample to the new directory and
+rename it to _theme.variables.scss. Change the desired hexadecimal values of
+the colors and bundle pgAdmin. You can also add a preview image in the theme
+directory with the name as <dir name>_preview.png. It is recommended that the
+preview image should not be larger in size as it may take time to load on slow
+networks. Run the yarn run bundle and you're good to go. No other changes are
+required, pgAdmin bundle will read the directory and create other required
+entries to make them available in preferences.
+
+The name of the theme is derived from the directory name. Underscores (_) and
+hyphens (-) will be replaced with spaces and the result will be camel cased.
+
 Configuring the Runtime
 -----------------------
 
@@ -235,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.
 
@@ -277,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/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/code_review.rst

@@ -16,7 +16,7 @@ review process for any patches submitted for inclusion in pgAdmin.
   bulk updates every year). The start date should always be 2013, and the end year
   the current year, e.g.
 
-    Copyright (C) 2013 - 2019, The pgAdmin Development Team
+    Copyright (C) 2013 - 2020, The pgAdmin Development Team
  
 * Ensure there's a blank line immediately following any copyright headers.
 

docs/en_US/coding_standards.rst

@@ -170,7 +170,7 @@ with the required file header is shown below::
     #
     # pgAdmin 4 - PostgreSQL Tools
     #
-    # Copyright (C) 2013 - 2019, The pgAdmin Development Team
+    # Copyright (C) 2013 - 2020, The pgAdmin Development Team
     # This software is released under the PostgreSQL Licence
     #
     ##########################################################################

docs/en_US/column_dialog.rst

@@ -34,14 +34,74 @@ are disabled if inapplicable.)
   column. For more information on the data types that are supported by
   PostgreSQL, refer to Chapter 8 of the Postgres core documentation. This field
   is required.
-* Use the *Length* and *Precision* fields to specify the maximum number of
+* Use the *Length/Precision* and *Scale* fields to specify the maximum number of
   significant digits in a numeric value, or the maximum number of characters in
   a text value.
 * Use the drop-down listbox next to *Collation* to apply a collation setting to
   the column.
+
+Click the *Constraints* tab to continue.
+
+.. image:: images/column_constraints.png
+    :alt: Column dialog constraints tab
+    :align: center
+
+Use the fields in the *Constraints* tab to specify constraints for the column.
+(Fields are disabled if inapplicable.)
+
 * Use the *Default Value* field to specify a default data value.
 * Move the *Not Null* switch to the *Yes* position to specify the column may not
   contain null values. The default is *No*.
+* Use the *Type* field to specify the column type (NONE/IDENTITY/GENERATED).
+  The default is *NONE*.
+
+Click the *IDENTITY* type to create Identity column.
+
+.. image:: images/column_constraint_identity.png
+    :alt: Column dialog constraints tab
+    :align: center
+
+Use the following fields to create *IDENTITY* column. Identity columns are
+applicable for PG/EPAS version 10 and above.
+
+* Use the *Identity* field to specify ALWAYS or BY DEFAULT. This clause is
+  used to determine how the sequence value is given precedence over a
+  user-specified value in an INSERT statement.
+* Use the *Increment* field to specify which value is added to the current
+  sequence value to create a new value.
+* Provide a value in the *Start* field to specify the beginning value of the
+  sequence. The default starting value is MINVALUE for ascending sequences and
+  MAXVALUE for descending ones.
+* Provide a value in the *Minimum* field to specify the minimum value a sequence
+  can generate. If this clause is not supplied or NO MINVALUE is specified,
+  then defaults will be used. The defaults are 1 and -263-1 for ascending and
+  descending sequences, respectively.
+* Provide a value in the *Maximum* field to specify the maximum value for the
+  sequence. If this clause is not supplied or NO MAXVALUE is specified, then
+  default values will be used. The defaults are 263-1 and -1 for ascending and
+  descending sequences, respectively.
+* Provide a value in the *Cache* field to specify how many sequence numbers are
+  to be preallocated and stored in memory for faster access. The minimum value
+  is 1 (only one value can be generated at a time, i.e., no cache), and this is
+  also the default.
+* Move the *Cycled* switch to the *Yes* position to allow the sequence to wrap
+  around when the MAXVALUE or the MINVALUE has been reached by an ascending or
+  descending sequence respectively. If the limit is reached, the next number
+  generated will be the MINVALUE or MAXVALUE, respectively. The default is *No*.
+
+Click the *GENERATED* type to create Generated column.
+
+.. image:: images/column_constraint_generated.png
+    :alt: Column dialog constraints tab
+    :align: center
+
+Use the following fields to create *GENERATED* column. Generated columns are
+applicable for PG/EPAS version 12 and above.
+
+* Use the *Expression* field to specify the generation expression. It can
+  refer to other columns in the table, but not other generated columns.
+  Any functions and operators used must be immutable. References to other
+  tables are not allowed.
 
 Click the *Variables* tab to continue.
 

docs/en_US/compound_trigger_dialog.rst

@@ -0,0 +1,83 @@
+.. _compound_trigger_dialog:
+
+********************************
+`Compound Trigger Dialog`:index:
+********************************
+
+Use the *Compound Trigger* dialog to create a compound trigger or modify an
+existing compound trigger. *Compound Trigger* is supported only for EPAS server
+12 and above. A compound trigger executes a specified code when certain events
+occur.
+
+The *Compound Trigger* dialog organizes the development of a compound trigger
+through the following dialog tabs: *General*, *Events*, and *Code*. The *SQL*
+tab displays the SQL code generated by dialog selections.
+
+.. image:: images/compound_trigger_general.png
+    :alt: Compound Trigger dialog general tab
+    :align: center
+
+Use the fields in the *General* tab to identify the compound trigger:
+
+* Use the *Name* field to add a descriptive name for the compound trigger. This
+  must be distinct from the name of any other compound trigger for the same table.
+  The name will be displayed in the *pgAdmin* tree control.
+* Store notes about the compound trigger in the *Comment* field.
+
+.. image:: images/compound_trigger_general_enabled.png
+    :alt: Trigger enabled in dialog tab
+    :align: center
+
+* *Trigger enabled* field is available in compound trigger dialog once the trigger is created.
+  You can select one of the four options available.
+
+Click the *Events* tab to continue.
+
+.. image:: images/compound_trigger_events.png
+    :alt: Compound Trigger dialog events tab
+    :align: center
+
+Use the fields in the *Events* tab to specify how and when the compound trigger fires:
+
+* Select the type of event(s) that will invoke the compound trigger; to select
+  an event type, move the switch next to the event to the *YES* position.
+  The supported event types are *INSERT*, *UPDATE*, *DELETE* and *TRUNCATE*.
+  Views cannot have TRUNCATE triggers.
+* Use the *When* field to provide a boolean condition that will invoke the
+  compound trigger.
+* If defining a column-specific compound trigger, use the *Columns* field to
+  specify the columns or columns that are the target of the compound trigger.
+
+Click the *Code* tab to continue.
+
+.. image:: images/compound_trigger_code.png
+    :alt: Compound Trigger dialog code tab
+    :align: center
+
+Use the *Code* field to specify the code for the five timing events
+*BEFORE STATEMENT*, *AFTER STATEMENT*, *BEFORE EACH ROW*, *AFTER EACH ROW*,
+*INSTEAD OF EACH ROW* that will be invoked when the compound trigger fires.
+Basic template is provided with place holders.
+
+Click the *SQL* tab to continue.
+
+Your entries in the *Compound Trigger* dialog generate a SQL command (see an example
+below). Use the *SQL* tab for review; revisit or switch tabs to make any changes
+to the SQL command.
+
+Example
+*******
+
+The following is an example of the sql command generated by user selections in
+the *Compound Trigger* dialog:
+
+.. image:: images/compound_trigger_sql.png
+    :alt: Compound Trigger dialog sql tab
+    :align: center
+
+The example demonstrates creating a compound trigger named *test_ct*.
+
+* 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.

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

docs/en_US/config_py.rst

@@ -0,0 +1,45 @@
+.. _config_py:
+
+***************************
+`The config.py File`:index:
+***************************
+
+There are multiple configuration files that are read at startup by pgAdmin. These
+are as follows:
+
+* ``config.py``: This is the main configuration file, and should not be modified.
+  It can be used as a reference for configuration settings, that may be overridden
+  in one of the following files.
+
+* ``config_distro.py``: This file is read after ``config.py`` and is intended for
+  packagers to change any settings that are required for their pgAdmin distribution.
+  This may typically include certain paths and file locations. This file is optional,
+  and may be created by packagers in the same directory as ``config.py`` if
+  needed.
+
+* ``config_local.py``: This file is read after ``config_distro.py`` and is intended
+  for end users to change any default or packaging specific settings that they may
+  wish to adjust to meet local preferences or standards.This file is optional,
+  and may be created by users in the same directory as ``config.py`` if
+  needed.
+
+* ``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:
+
+.. literalinclude:: ../../web/config.py
+   :language: python

docs/en_US/container_deployment.rst

@@ -17,11 +17,11 @@ 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*
 * PostgreSQL 11: */usr/local/pgsql-11*
+* PostgreSQL 12: */usr/local/pgsql-12*
 
 The most recent version of the utilities is used by default; this may be
 changed in the :ref:`preferences`.
@@ -31,19 +31,19 @@ Environment Variables
 
 The container will accept the following variables at startup:
 
-*PGADMIN_DEFAULT_EMAIL*
+**PGADMIN_DEFAULT_EMAIL**
 
 This is the email address used when setting up the initial administrator account
 to login to pgAdmin. This variable is required and must be set at launch time.
 
-*PGADMIN_DEFAULT_PASSWORD*
+**PGADMIN_DEFAULT_PASSWORD**
 
 This is the password used when setting up the initial administrator account to
 login to pgAdmin. This variable is required and must be set at launch time.
 
-*PGADMIN_ENABLE_TLS*
+**PGADMIN_ENABLE_TLS**
 
-Default: <null>
+*Default: <null>*
 
 If left un-set, the container will listen on port 80 for connections in plain
 text. If set to any value, the container will listen on port 443 for TLS
@@ -53,57 +53,100 @@ 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
 
-*PGADMIN_LISTEN_ADDRESS*
+**PGADMIN_LISTEN_ADDRESS**
 
-Default: [::]
+*Default: [::]*
 
 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*
+**PGADMIN_LISTEN_PORT**
 
-Default: 80 or 443 (if TLS is enabled)
+*Default: 80 or 443 (if TLS is enabled)*
 
 Allows the port that the server listens on to be set to a specific value rather
 than using the default.
 
-*PGADMIN_SERVER_JSON_FILE*
+**PGADMIN_SERVER_JSON_FILE**
 
-Default: /pgadmin4/servers.json
+*Default: /pgadmin4/servers.json*
 
 Override the default file path for the server definition list. See the
 /pgadmin4/servers.json mapped file below for more information.
 
-*GUNICORN_THREADS*
+**GUNICORN_ACCESS_LOGFILE**
 
-Default: 25
+*Default: -* (stdout)
+
+Specify an output file in which to store the Gunicorn access logs, instead of
+sending them to stdout.
+
+**GUNICORN_THREADS**
+
+*Default: 25*
 
 Adjust the number of threads the Gunicorn server uses to handle incoming
 requests. This should typically be left as-is, except in highly loaded systems
 where it may be increased.
 
+**PGADMIN_CONFIG_**
+
+This is a variable prefix that can be used to override any of the configuration
+options in pgAdmin's *config.py* file. Add the *PGADMIN_CONFIG_* prefix to any
+variable name from *config.py* and give the value in the format 'string value'
+for strings, True/False for booleans or 123 for numbers. See below for an
+example.
+
+Settings are written to */pgadmin4/config_distro.py* within the container, which
+is read after */pgadmin4/config.py* and before */pgadmin4/config_local.py*.
+Any settings given will therefore override anything in config.py, but can be
+overridden by settings in config_local.py.
+
+See :ref:`config_py` for more information on the available configuration settings.
+
 Mapped Files and Directories
 ****************************
 
 The following files or directories can be mapped from the container onto the
 host machine to allow configuration to be customised and shared between
-instances:
+instances.
 
-*/var/lib/pgadmin*
+.. warning:: Warning: pgAdmin runs as the *pgadmin* user (UID: 5050) in the
+    *pgadmin* group (GID: 5050) in the container. You must ensure that all files
+    are readable, and where necessary (e.g. the working/session directory)
+    writeable for this user on the host machine. For example:
+
+    .. code-block:: bash
+
+        sudo chown -R 5050:5050 <host_directory>
+
+    On some filesystems that do not support extended attributes, it may not be
+    possible to run pgAdmin without specifying a value for *PGADMIN_LISTEN_PORT*
+    that is greater than 1024. In such cases, specify an alternate port when
+    launching the container by adding the environment variable, for example:
+
+    .. code-block:: bash
+
+        -e 'PGADMIN_LISTEN_PORT=5050'
+
+    Don't forget to adjust any host-container port mapping accordingly.
+
+**/var/lib/pgadmin**
 
 This is the working directory in which pgAdmin stores session data, user files,
 configuration files, and it's configuration database. Mapping this directory
 onto the host machine gives you an easy way to maintain configuration between
 invocations of the container.
 
-*/pgadmin4/config_local.py*
+**/pgadmin4/config_local.py**
 
 This file can be used to override configuration settings in pgAdmin. Settings
 found in config.py can be overridden with deployment specific values if
-required.
+required. Settings in config_local.py will also override anything specified in
+the container environment through *PGADMIN_CONFIG_* prefixed variables.
 
-*/pgadmin4/servers.json*
+**/pgadmin4/servers.json**
 
 If this file is mapped, server definitions found in it will be loaded at launch
 time. This allows connection information to be pre-loaded into the instance of
@@ -111,11 +154,11 @@ pgAdmin in the container. Note that server definitions are only loaded on first
 launch, i.e. when the configuration database is created, and not on subsequent
 launches using the same configuration database.
 
-*/certs/server.cert*
+**/certs/server.cert**
 
 If TLS is enabled, this file will be used as the servers TLS certificate.
 
-*/certs/server.key*
+**/certs/server.key**
 
 If TLS is enabled, this file will be used as the key file for the servers TLS
 certificate.
@@ -129,8 +172,21 @@ Run a simple container over port 80:
 
     docker pull dpage/pgadmin4
     docker run -p 80:80 \
-        -e "PGADMIN_DEFAULT_EMAIL=user@domain.com" \
-        -e "PGADMIN_DEFAULT_PASSWORD=SuperSecret" \
+        -e 'PGADMIN_DEFAULT_EMAIL=user@domain.com' \
+        -e 'PGADMIN_DEFAULT_PASSWORD=SuperSecret' \
+        -d dpage/pgadmin4
+
+Run a simple container over port 80, setting some configuration options:
+
+.. code-block:: bash
+
+    docker pull dpage/pgadmin4
+    docker run -p 80:80 \
+        -e 'PGADMIN_DEFAULT_EMAIL=user@domain.com' \
+        -e 'PGADMIN_DEFAULT_PASSWORD=SuperSecret' \
+        -e 'PGADMIN_CONFIG_ENHANCED_COOKIE_PROTECTION=True' \
+        -e 'PGADMIN_CONFIG_LOGIN_BANNER="Authorised users only!"' \
+        -e 'PGADMIN_CONFIG_CONSOLE_LOG_LEVEL=10' \
         -d dpage/pgadmin4
 
 Run a TLS secured container using a shared config/storage directory in
@@ -141,13 +197,13 @@ Run a TLS secured container using a shared config/storage directory in
 
     docker pull dpage/pgadmin4
     docker run -p 443:443 \
-        -v "/private/var/lib/pgadmin:/var/lib/pgadmin" \
-        -v "/path/to/certificate.cert:/certs/server.cert" \
-        -v "/path/to/certificate.key:/certs/server.key" \
-        -v "/tmp/servers.json:/servers.json" \
-        -e "PGADMIN_DEFAULT_EMAIL=user@domain.com" \
-        -e "PGADMIN_DEFAULT_PASSWORD=SuperSecret" \
-        -e "PGADMIN_ENABLE_TLS=True" \
+        -v /private/var/lib/pgadmin:/var/lib/pgadmin \
+        -v /path/to/certificate.cert:/certs/server.cert \
+        -v /path/to/certificate.key:/certs/server.key \
+        -v /tmp/servers.json:/pgadmin4/servers.json \
+        -e 'PGADMIN_DEFAULT_EMAIL=user@domain.com' \
+        -e 'PGADMIN_DEFAULT_PASSWORD=SuperSecret' \
+        -e 'PGADMIN_ENABLE_TLS=True' \
         -d dpage/pgadmin4
 
 Reverse Proxying
@@ -168,6 +224,36 @@ for example:
         -e "PGADMIN_DEFAULT_PASSWORD=SuperSecret" \
         -d dpage/pgadmin4
 
+pgAdmin X-Forwarded-* Configuration
+-----------------------------------
+
+pgAdmin needs to understand how many proxies set each header so it knows what
+values to trust. The configuration parameters for the X-Forwarded-* options
+which are used for this purpose are shown below, along with their default
+values.
+
+pgAdmin is configured by default to be able to run behind a reverse proxy even
+on a non-standard port and these config options don't normally need to be
+changed. If you're running an unusual configuration (such as multiple reverse
+proxies) you can adjust the configuration to suit.
+
+.. code-block:: python
+
+    # Number of values to trust for X-Forwarded-For
+    PROXY_X_FOR_COUNT = 1
+
+    # Number of values to trust for X-Forwarded-Proto.
+    PROXY_X_PROTO_COUNT = 0
+
+    # Number of values to trust for X-Forwarded-Host.
+    PROXY_X_HOST_COUNT = 0
+
+    # Number of values to trust for X-Forwarded-Port.
+    PROXY_X_PORT_COUNT = 1
+
+    # Number of values to trust for X-Forwarded-Prefix.
+    PROXY_X_PREFIX_COUNT = 0
+
 HTTP via Nginx
 --------------
 
@@ -312,4 +398,4 @@ the container is launched like this:
 The *SCRIPT_NAME* environment variable has been set to tell the container it is
 being hosted under a subdirectory (in the same way as the *X-Script-Name* header
 is used with Nginx), and a label has been added to tell Traefik to route
-requests under the subdirectory to this container.
+requests under the subdirectory to this container.

docs/en_US/database_dialog.rst

@@ -61,8 +61,7 @@ Use the *Privileges* panel to assign privileges to a role. Click the *Add* icon
 * Select the name of the role from the drop-down listbox in the *Grantee* field.
 * Click inside the *Privileges* field. Check the boxes to the left of one or
   more privileges to grant the selected privilege to the specified user.
-* Select the name of the role from the drop-down listbox in the *Grantor* field.
-  The default grantor is the owner of the database.
+* The current user, who is the default grantor for granting the privilege, is displayed in the *Grantor* field.
 
 Click add to set additional privileges; to discard a privilege, click the trash
 icon to the left of the row and confirm deletion in the *Delete Row* popup.
@@ -98,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
@@ -121,4 +133,3 @@ allows unlimited connections, and is available to all authenticated users.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
-

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.
@@ -81,6 +81,8 @@ Use the fields on the *Debugger* dialog to provide a value for each parameter:
 
 Provide values required by the program, and click the *Debug* button to start
 stepping through the program.
+The values of the arguments provided here are saved. The values will be pre-filled
+next time the dialog opens. To clear the values, use the *Clear All* button.
 
 .. image:: images/debug_step_in.png
     :alt: Debugger step-in demo

docs/en_US/deployment.rst

@@ -12,7 +12,8 @@ will provide detailed information about creating a custom deployment.
 
 .. toctree::
    :maxdepth: 2
-   
+
+   config_py
    desktop_deployment
    server_deployment
-   container_deployment
+   container_deployment

docs/en_US/desktop_deployment.rst

@@ -36,32 +36,10 @@ this is overridden by the desktop runtime at startup. In most environments, no
 Python configuration is required unless you wish to override other default
 settings.
 
-There are multiple configuration files that are read at startup by pgAdmin. These
-are as follows:
-
-* ``config.py``: This is the main configuration file, and should not be modified.
-  It can be used as a reference for configuration settings, that may be overridden
-  in one of the following files.
-
-* ``config_distro.py``: This file is read after ``config.py`` and is intended for
-  packagers to change any settings that are required for their pgAdmin distribution.
-  This may typically include certain paths and file locations. This file is optional,
-  and may be created by packagers in the same directory as ``config.py`` if
-  needed.
-
-* ``config_local.py``: This file is read after ``config_distro.py`` and is intended
-  for end users to change any default or packaging specific settings that they may
-  wish to adjust to meet local preferences or standards.This file is optional,
-  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.
+See :ref:`config_py` for more information on configuration settings.
 
 Runtime
--------
+*******
 
 When executed, the runtime will automatically try to execute the pgAdmin Python
 application. If execution fails, it will prompt you to adjust the Python Path
@@ -93,6 +71,12 @@ The configuration settings:
    +--------------------------+--------------------+---------------------------------------------------------------+
    | ConnectionTimeout        | Integer            | The number of seconds to wait for application server startup. |
    +--------------------------+--------------------+---------------------------------------------------------------+
+   | FixedPort                | Boolean            | Use a fixed network port number rather than a random one.     |
+   +--------------------------+--------------------+---------------------------------------------------------------+
+   | OpenTabAtStartup         | Boolean            | Open a browser tab at startup.                                |
+   +--------------------------+--------------------+---------------------------------------------------------------+
+   | PortNumber               | Integer            | The port number to use, if using a fixed port.                |
+   +--------------------------+--------------------+---------------------------------------------------------------+
    | PythonPath               | String             | The Python module search path                                 |
    +--------------------------+--------------------+---------------------------------------------------------------+
 

docs/en_US/developer_tools.rst

@@ -14,3 +14,4 @@ PL/SQL code.
    debugger
    query_tool
    editgrid
+   schema_diff

docs/en_US/editgrid.rst

@@ -35,6 +35,8 @@ disabled in either mode. Please see
 :ref:`The Query Tool Toolbar <query_tool_toolbar>` for a description of the
 available controls.
 
+.. _data-grid:
+
 The Data Grid
 *************
 
@@ -42,8 +44,6 @@ The top row of the data grid displays the name of each column, the data type,
 and if applicable, the number of characters allowed. A column that is part of
 the primary key will additionally be marked with [PK].
 
-.. _modifying-data-grid:
-
 To modify the displayed data:
 
 * To change a numeric value within the grid, double-click the value to select
@@ -138,3 +138,8 @@ To delete a row from the grid, click the trash icon.
 * Click the *Help* button (?) to access online help.
 * Click the *Ok* button to save work.
 * Click the *Close* button to discard current changes and close the dialog.
+
+.. toctree::
+   :maxdepth: 2
+
+   viewdata_filter

docs/en_US/enabling_ldap_authentication.rst

@@ -0,0 +1,105 @@
+.. _enabling_ldap_authentication:
+
+**************************************************
+`Enabling LDAP Authentication for pgAdmin`:index:
+**************************************************
+
+To enable LDAP authentication for pgAdmin, you must configure the LDAP
+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**"
+   :class: longtable
+   :widths: 35, 55
+
+   "AUTHENTICATION_SOURCES","The default value for this parameter is *internal*.
+   To enable LDAP authentication, you must include *ldap* in the list of values
+   for this parameter. you can modify the value as follows:
+
+   * [‘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.
+
+   * [‘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."
+   "LDAP_CONNECTION_TIMEOUT","Specifies the connection timeout (in seconds) for LDAP
+   authentication."
+   "LDAP_SERVER_URI", "An LDAP URI is a combination of connection protocol
+   (ldap or ldaps), IP address/hostname and port of the directory server that you
+   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_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
+   LDAP_USERNAME_ATTRIBUTE as ‘cn’ and you have defined 'cn=admin' in your LDAP server
+   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 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."
+   "LDAP_SEARCH_SCOPE","Indicates the set of entries at or below the Base DN that
+   maybe considered as potential matches for a search request. You can specify the
+   scope of a search as either a *base*, *level*, or *subtree* search. A *base* search
+   limits the search to the base object. A *level* search is restricted to the immediate
+   children of a base object, but excludes the base object itself. A *subtree* search
+   includes all child objects as well as the base object."
+   "LDAP_USE_STARTTLS","Specifies if you want to use Transport Layer Security (TLS)
+   for secure communication between LDAP clients and LDAP servers. If you specify
+   the connection protocol in *LDAP_SERVER_URI* as *ldaps*, this parameter is ignored."
+   "LDAP_CA_CERT_FILE","Specifies the path to the trusted CA certificate file. This
+   parameter is applicable only if you are using *ldaps* as connection protocol and
+   you have set *LDAP_USE_STARTTLS* parameter to *True*."
+   "LDAP_CERT_FILE","Specifies the path to the server certificate file. This parameter
+   is applicable only if you are using *ldaps* as connection protocol and you have
+   set *LDAP_USE_STARTTLS* parameter to *True*."
+   "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/event_trigger_dialog.rst

@@ -35,15 +35,15 @@ Click the *Definition* tab to continue.
 
 Use the fields in the *Definition* tab to define the event trigger:
 
-* Select a radio button in the *Enabled Status* field to specify a status for
-  the trigger: *Enable* *Disable*, *Replica* *Always*.
+* Select a value from the drop down of *Trigger Enabled* field to specify a status
+  for the trigger: *Enable* *Disable*, *Replica* *Always*.
 * Use the drop-down listbox next to *Trigger function* to specify an existing
   function.  A trigger function takes an empty argument list, and returns a
   value of type event_trigger.
-* Select a radio button in the *Events* field to specify when the event trigger
-  will fire: *DDL COMMAND START*, *DDL COMMAND END*, or *SQL DROP*.
-* Use the *When* field to write a condition for the event trigger that must be
-  satisfied before the event trigger can execute.
+* Select a value from the drop down of *Events* field to specify when the event
+  trigger will fire: *DDL COMMAND START*, *DDL COMMAND END*, or *SQL DROP*.
+* Use the *When TAG in* field to enter filter values for TAG for which the trigger
+  will be executed. The values must be in single quotes separated by comma.
 
 Click the *Security Labels* tab to continue.
 

docs/en_US/foreign_data_wrapper_dialog.rst

@@ -75,9 +75,7 @@ to assign a set of privileges.
 * Select the name of the role from the drop-down listbox in the *Grantee* field.
 * Click inside the *Privileges* field. Check the boxes to the left of one or
   more privileges to grant the selected privileges to the specified user.
-* Select the name of the role granting the privileges from the drop-down listbox
-  in the *Grantor* field. The default grantor is the owner of the foreign data
-  wrapper.
+* The current user, who is the default grantor for granting the privilege, is displayed in the *Grantor* field.
 
 Click add to assign additional privileges; to discard a privilege, click the
 trash icon to the left of the row and confirm deletion in the *Delete Row*
@@ -108,5 +106,3 @@ pre-existing validator and handler functions, *dblink_fdw_validator* and
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
-
-

docs/en_US/foreign_server_dialog.rst

@@ -65,9 +65,7 @@ Click *Add* before you assign a set of privileges.
 * Select the name of the role from the drop-down listbox in the *Grantee* field.
 * Click inside the *Privileges* field. Check the boxes to the left of one or
   more privileges to grant the selected privileges to the specified user.
-* Select the name of the role from the drop-down listbox in the *Grantor* field.
-  The default grantor is the owner of the foreign server. This is a required
-  field.
+* The current user, who is the default grantor for granting the privilege, is displayed in the *Grantor* field.
 
 Click *Add* to assign a new set of privileges; to discard a privilege, click the
 trash icon to the left of the row and confirm deletion in the *Delete Row*

docs/en_US/foreign_table_dialog.rst

@@ -120,9 +120,7 @@ Use the *Privileges* panel to assign privileges to a role. Click the *Add* icon
   drop-down listbox in the *Grantee* field.
 * Click inside the *Privileges* field. Check the boxes to the left of one or
   more privileges to grant the selected privilege to the specified user.
-* Select the name of the role that owns the foreign table from the drop-down
-  listbox in the *Grantor* field. The default grantor is the owner of the
-  database.
+* The current user, who is the default grantor for granting the privilege, is displayed in the *Grantor* field.
 
 Click the *Add* icon (+) to assign additional privileges; to discard a
 privilege, click the trash icon to the left of the row and confirm deletion in
@@ -166,5 +164,3 @@ columns and two options.
 * Click the *Save* button to save work.
 * Click the *Cancel* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
-
-

docs/en_US/function_dialog.rst

@@ -9,7 +9,7 @@ a function, the new function is not the same entity as the old; you must drop
 existing rules, views, triggers, etc. that refer to the old function.
 
 The *Function* dialog organizes the development of a function through the
-following dialog tabs: *General*, *Definition*, *Options*, *Arguments*,
+following dialog tabs: *General*, *Definition*, *Code*, *Options*,
 *Parameters*, and *Security*. The *SQL* tab displays the SQL code generated by
 dialog selections.
 
@@ -39,6 +39,27 @@ Use the fields in the *Definition* tab to define the function:
   returned by the function, if any.
 * Use the drop-down listbox next to *Language* to select the implementation
   language. The default is *sql*.
+* Use the fields in the *Arguments* to define an argument. Click the *Add*
+  icon (+) to set parameters and values for the argument:
+
+  * Use the drop-down listbox in the *Data type* field to select a data type.
+  * Use the drop-down listbox in the *Mode* field to select a mode. Select *IN*
+    for an input parameter; select *OUT* for an output parameter; select *INOUT*
+    for both an input and an output parameter; or, select *VARIADIC* to specify a
+    VARIADIC parameter.
+  * Provide a name for the argument in the *Argument Name* field.
+  * Specify a default value for the argument in the *Default Value* field.
+
+Click the *Add* icon (+) to define another argument; to discard an argument,
+click the trash icon to the left of the row and confirm deletion in the *Delete
+Row* popup.
+
+Click the *Code* tab to continue.
+
+.. image:: images/function_code.png
+    :alt: Function dialog code tab
+    :align: center
+
 * Use the *Code* field to write the code that will execute when the function
   is called.
 
@@ -87,27 +108,8 @@ function:
   The default assumption is 1000 rows.
 * Move the *Leak proof?* switch to indicate whether the function has side
   effects. The default is *No*. This option can only be set by the superuser.
-
-Click the *Arguments* tab to continue.
-
-.. image:: images/function_arguments.png
-    :alt: Function dialog arguments tab
-    :align: center
-
-Use the fields in the *Arguments* tab to define an argument. Click the *Add*
-icon (+) to set parameters and values for the argument:
-
-* Use the drop-down listbox in the *Data type* field to select a data type.
-* Use the drop-down listbox in the *Mode* field to select a mode. Select *IN*
-  for an input parameter; select *OUT* for an output parameter; select *INOUT*
-  for both an input and an output parameter; or, select *VARIADIC* to specify a
-  VARIADIC parameter.
-* Provide a name for the argument in the *Argument Name* field.
-* Specify a default value for the argument in the *Default Value* field.
-
-Click the *Add* icon (+) to define another argument; to discard an argument,
-click the trash icon to the left of the row and confirm deletion in the *Delete
-Row* popup.
+* Use the *Support function* field to specify a planner support function to
+  use for the function.
 
 Click the *Parameters* tab to continue.
 
@@ -138,8 +140,7 @@ role.
 * Select the name of the role from the drop-down listbox in the *Grantee* field.
 * Click inside the *Privileges* field. Check the boxes to the left of one or
   more privileges to grant the selected privilege to the specified user.
-* Select the name of the role from the drop-down listbox in the *Grantor* field.
-  The default grantor is the owner of the database.
+* The current user, who is the default grantor for granting the privilege, is displayed in the *Grantor* field.
 
 Click the *Add* icon (+) to assign additional privileges; to discard a
 privilege, click the trash icon to the left of the row and confirm deletion in
@@ -175,14 +176,10 @@ the *Function* dialog:
     :alt: Function dialog sql tab
     :align: center
 
-The example demonstrates creating an *edbspl* function named *emp_comp*.  The
-function adds two columns (p_sal and p_comm), and then uses the result to
-compute a yearly salary, returning a NUMERIC value.
+The example demonstrates creating an *plpgsql* function named *hire_salesmen*. The
+function have three columns (p_ename, p_sal and p_comm).
 
 * 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.
-
-
-

docs/en_US/getting_started.rst

@@ -35,6 +35,7 @@ Mode is pre-configured for security.
    login
    user_management
    change_user_password
+   enabling_ldap_authentication
 
 
 .. note:: Pre-compiled and configured installation packages are available for
@@ -64,6 +65,8 @@ display.  To open the *Preferences* dialog, select *Preferences* from the *File*
 for the dialog.  You can access additional Postgres help by navigating through
 the *Help* menu, and selecting the name of the resource that you wish to open.
 
+You can search for objects in the database using the :ref:`Search objects <search_objects>`
+
 .. toctree::
    :maxdepth: 2
 
@@ -74,6 +77,7 @@ the *Help* menu, and selecting the name of the resource that you wish to open.
    tree_control
    preferences
    keyboard_shortcuts
+   search_objects
 
 Before using pgAdmin to manage objects that reside on a server, you must define a
 connection to the server; for more information please see *Connecting to a Server*

docs/en_US/grant_wizard.rst

@@ -55,8 +55,7 @@ the object.
   more privileges to grant the selected privileges to the specified user. If
   privileges have previously been granted on a database object, unchecking a
   privilege for a group or user will result in revoking that privilege.
-* If enabled, select the name of the role from the drop-down listbox in the
-  *Grantor* field. The default grantor is the owner of the database.
+* The current user, who is the default grantor for granting the privilege, is displayed in the *Grantor* field.
 * Click the *Add* icon (+) to assign a set of privileges to another role; to
   discard a privilege, click the trash icon to the left of the row and confirm
   deletion in the *Delete Row* dialog.
@@ -89,4 +88,4 @@ privileges *WITH GRANT OPTION* on the *sales_meetings* and the
 * Click the *Back* button to select or deselect additional database objects,
   roles and privileges.
 * Click the *Cancel* button to exit without saving work.
-* Click the *Finish* button to save selections and exit the wizard.
+* Click the *Finish* button to save selections and exit the wizard.