Fixed object delete issue from the properties tab for the collection nodes. Fixes #6858

Fixed an issue where the wrong SQL is generated when deleting and renaming table columns together. Fixes #6935
Fixed an issue where a blank string is stored instead of NULL in create mode in server dialog. Fixes #6915
2026-10-29 07:50:04 -05:00 · 2021-10-19 17:21:46 +05:30 · 2021-10-19 17:13:12 +05:30 · 2021-10-19 17:01:50 +05:30 · 2021-10-19 12:01:43 +05:30 · 2021-10-19 11:56:44 +05:30
2189 changed files with 100674 additions and 77622 deletions
@@ -227,6 +227,7 @@ is-arrayish                                                      0.2.1
 is-color-stop                                                    1.1.0            MIT                                  git+https://github.com/pigcan/is-color-stop.git
 is-finite                                                        1.1.0            MIT                                  https://github.com/sindresorhus/is-finite.git
 istanbul-instrumenter-loader                                     3.0.1            MIT                                  https://github.com/webpack-contrib/istanbul-instrumenter-loader.git
+javascript-natural-sort                                          0.7.1            MIT                                  https://github.com/Bill4Time/javascript-natural-sort.git
 jquery                                                           3.6.0            MIT                                  https://github.com/jquery/jquery.git
 jquery-contextmenu                                               2.9.2            MIT                                  git://github.com/swisnl/jQuery-contextMenu.git
 jquery-ui                                                        1.12.1           MIT                                  git://github.com/jquery/jquery-ui.git
@@ -239,6 +240,7 @@ json-bignumber                                                   1.0.2
 json-parse-even-better-errors                                    2.3.1            MIT                                  https://github.com/npm/json-parse-even-better-errors
 json-schema-traverse                                             0.4.1            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
 json-schema-traverse                                             0.3.1            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
+json-source-map                                                  0.6.1            MIT                                  git+https://github.com/epoberezkin/json-source-map.git
 json5                                                            2.2.0            MIT                                  git+https://github.com/json5/json5.git
 json5                                                            1.0.1            MIT                                  git+https://github.com/json5/json5.git
 karma-coverage                                                   2.0.3            MIT                                  git://github.com/karma-runner/karma-coverage.git
@@ -257,6 +259,7 @@ ml-array-max                                                     1.2.3
 ml-array-min                                                     1.2.2            MIT                                  git+https://github.com/mljs/array.git
 ml-array-rescale                                                 1.3.5            MIT                                  git+https://github.com/mljs/array.git
 ml-matrix                                                        6.8.0            MIT                                  https://github.com/mljs/matrix.git
+mobius1-selectr                                                  2.4.13           MIT                                  git+https://github.com/Mobius1/Selectr.git
 moment                                                           2.29.1           MIT                                  https://github.com/moment/moment.git
 moment                                                           2.24.0           MIT                                  https://github.com/moment/moment.git
 moment-timezone                                                  0.5.33           MIT                                  https://github.com/moment/moment-timezone.git
@@ -274,6 +277,7 @@ parseuri                                                         0.0.6
 path-type                                                        4.0.0            MIT                                  https://github.com/sindresorhus/path-type.git
 pathfinding                                                      0.4.18           MIT                                  git://github.com/qiao/PathFinding.js.git
 performance-now                                                  2.1.0            MIT                                  git://github.com/braveg1rl/performance-now.git
+picomodal                                                        3.0.0            MIT                                  https://github.com/Nycto/PicoModal.git
 popper.js                                                        1.16.1           MIT                                  git+https://github.com/FezVrasta/popper.js.git
 postcss                                                          8.3.0            MIT                                  https://github.com/postcss/postcss.git
 postcss-calc                                                     8.0.0            MIT                                  https://github.com/postcss/postcss-calc.git
@@ -355,12 +359,14 @@ xterm-addon-search                                               0.8.0
 xterm-addon-web-links                                            0.4.0            MIT                                  https://github.com/xtermjs/xterm.js
 yeast                                                            0.1.2            MIT                                  https://github.com/unshiftio/yeast.git
@fortawesome/fontawesome-free                                    5.15.3           (CC-BY-4.0 AND OFL-1.1 AND MIT)      https://github.com/FortAwesome/Font-Awesome
+@sphinxxxx/color-conversion                                      2.2.2            ISC                                  git+https://github.com/Sphinxxxx/color-conversion.git
@trysound/sax                                                    0.1.1            ISC                                  git://github.com/svg/sax.git
 boolbase                                                         1.0.0            ISC                                  https://github.com/fb55/boolbase
 css-declaration-sorter                                           6.0.3            ISC                                  https://github.com/Siilwyn/css-declaration-sorter.git
 electron-to-chromium                                             1.3.740          ISC                                  https://github.com/kilian/electron-to-chromium/
 icss-utils                                                       5.1.0            ISC                                  git+https://github.com/css-modules/icss-utils.git
 is-resolvable                                                    1.1.0            ISC                                  https://github.com/shinnn/is-resolvable.git
+jsonrepair                                                       2.2.1            ISC                                  https://github.com/josdejong/jsonrepair.git
 lru-cache                                                        6.0.0            ISC                                  git://github.com/isaacs/node-lru-cache.git
 minimatch                                                        3.0.4            ISC                                  git://github.com/isaacs/minimatch.git
 postcss-modules-extract-imports                                  3.0.0            ISC                                  https://github.com/css-modules/postcss-modules-extract-imports.git
@@ -369,10 +375,25 @@ postcss-modules-values                                           4.0.0
 semver                                                           7.3.5            ISC                                  https://github.com/npm/node-semver
 semver                                                           5.7.1            ISC                                  https://github.com/npm/node-semver
 semver                                                           6.3.0            ISC                                  https://github.com/npm/node-semver
+vanilla-picker                                                   2.11.2           ISC                                  https://github.com/Sphinxxxx/vanilla-picker.git
 yallist                                                          4.0.0            ISC                                  git+https://github.com/isaacs/yallist.git
 yaml                                                             1.10.2           ISC                                  https://github.com/eemeli/yaml.git
+ace-builds                                                       1.4.12           BSD-3-Clause                         https://github.com/ajaxorg/ace-builds.git
+istanbul-lib-coverage                                            1.2.1            BSD-3-Clause                         git@github.com:istanbuljs/istanbuljs.git
+istanbul-lib-coverage                                            3.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
+istanbul-lib-instrument                                          1.10.2           BSD-3-Clause                         git@github.com:istanbuljs/istanbuljs.git
+istanbul-lib-instrument                                          4.0.3            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
+istanbul-lib-report                                              3.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
+istanbul-lib-source-maps                                         4.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
+istanbul-reports                                                 3.0.2            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
+source-map                                                       0.5.7            BSD-3-Clause                         http://github.com/mozilla/source-map.git
+source-map                                                       0.6.1            BSD-3-Clause                         http://github.com/mozilla/source-map.git
+source-map-js                                                    0.6.2            BSD-3-Clause                         http://github.com/7rulnik/source-map.git
+sprintf-js                                                       1.1.2            BSD-3-Clause                         https://github.com/alexei/sprintf.js.git
 bootstrap-datepicker                                             1.9.0            Apache-2.0                           https://github.com/uxsolutions/bootstrap-datepicker.git
 eve                                                              0.5.4            Apache-2.0                           git@github.com:adobe-webplatform/eve.git
+jmespath                                                         0.15.0           Apache-2.0                           git://github.com/jmespath/jmespath.js
+jsoneditor                                                       9.5.3            Apache-2.0                           https://github.com/josdejong/jsoneditor.git
 paths-js                                                         0.4.11           Apache-2.0                           https://github.com/andreaferretti/paths-js.git
 snapsvg                                                          0.5.1            Apache-2.0                           git@github.com:adobe-webplatform/Snap.svg.git
 caniuse-lite                                                     1.0.30001230     CC-BY-4.0                            https://github.com/browserslist/caniuse-lite.git
@@ -388,22 +409,11 @@ nth-check                                                        2.0.0
 uri-js                                                           4.4.1            BSD-2-Clause                         http://github.com/garycourt/uri-js
 FileSaver                                                        0.10.0           UNKNOWN                              Unknown
 heap                                                             0.2.5            UNKNOWN                              git://github.com/qiao/heap.js.git
-istanbul-lib-coverage                                            1.2.1            BSD-3-Clause                         git@github.com:istanbuljs/istanbuljs.git
-istanbul-lib-coverage                                            3.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-lib-instrument                                          1.10.2           BSD-3-Clause                         git@github.com:istanbuljs/istanbuljs.git
-istanbul-lib-instrument                                          4.0.3            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-lib-report                                              3.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-lib-source-maps                                         4.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-reports                                                 3.0.2            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-source-map                                                       0.5.7            BSD-3-Clause                         http://github.com/mozilla/source-map.git
-source-map                                                       0.6.1            BSD-3-Clause                         http://github.com/mozilla/source-map.git
-source-map-js                                                    0.6.2            BSD-3-Clause                         http://github.com/7rulnik/source-map.git
-sprintf-js                                                       1.1.2            BSD-3-Clause                         https://github.com/alexei/sprintf.js.git
 mdn-data                                                         2.0.14           CC0-1.0                              https://github.com/mdn/data.git
 mousetrap                                                        1.6.5            Apache-2.0 WITH LLVM-exception       git://github.com/ccampbell/mousetrap.git
 precond                                                          0.2.3            MIT*                                 https://github.com/MathieuTurcotte/node-precond.git
 webcabin-docker                                                  2.2.5            MIT*                                 Unknown
 tablesorter                                                      2.31.3           (MIT OR GPL-2.0)                     git://github.com/Mottie/tablesorter.git

-335 dependencies listed.
+345 dependencies listed.

@@ -12,7 +12,7 @@
 # and clean up the web/ source code
 #########################################################################

-FROM alpine:3.13 AS app-builder
+FROM alpine:3.14 AS app-builder

 RUN apk add --no-cache \
    autoconf \
@@ -60,7 +60,7 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
 # Next, create the base environment for Python
 #########################################################################

-FROM alpine:3.13 as env-builder
+FROM alpine:3.14 as env-builder

 # Install dependencies
 COPY requirements.txt /
@@ -113,8 +113,9 @@ FROM postgres:10-alpine as pg10-builder
 FROM postgres:11-alpine as pg11-builder
 FROM postgres:12-alpine as pg12-builder
 FROM postgres:13-alpine as pg13-builder
+FROM postgres:14-alpine as pg14-builder

-FROM alpine:3.13 as tool-builder
+FROM alpine:3.14 as tool-builder

 # Copy the PG binaries
 COPY --from=pg96-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.6/
@@ -142,17 +143,25 @@ COPY --from=pg13-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-13/
 COPY --from=pg13-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-13/
 COPY --from=pg13-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-13/

+COPY --from=pg14-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-14/
+
 #########################################################################
 # Assemble everything into the final container.
 #########################################################################

-FROM alpine:3.13
+FROM alpine:3.14

 # Copy in the Python packages
 COPY --from=env-builder /venv /venv

 # Copy in the tools
 COPY --from=tool-builder /usr/local/pgsql /usr/local/
+COPY --from=pg14-builder /usr/local/lib/libpq.so.5.14 /usr/lib/
+RUN ln -s libpq.so.5.14 /usr/lib/libpq.so.5 && \
+    ln -s libpq.so.5.14 /usr/lib/libpq.so

 WORKDIR /pgadmin4
 ENV PYTHONPATH=/pgadmin4
@@ -173,7 +182,6 @@ RUN apk add \
        python3 \
        py3-pip \
        postfix \
-        postgresql-libs \
        krb5-libs \
        shadow \
        sudo \
@@ -187,7 +195,7 @@ RUN apk add \
    chown pgadmin:pgadmin /var/lib/pgadmin && \
    touch /pgadmin4/config_distro.py && \
    chown pgadmin:pgadmin /pgadmin4/config_distro.py && \
-    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.8 && \
+    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.9 && \
    echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix

 USER pgadmin
@@ -272,11 +272,17 @@ REM Main build sequence Ends
    REM YARN END

    REM WGET
-    FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i"
-    :GET_NW
-        wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
-        IF %ERRORLEVEL% NEQ 0 GOTO GET_NW
+    REM Comment out the below for loop as the latest version (0.57.0) having
+    REM some problem, so for the time being hardcoded the version to 0.55.0
+    REM FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i"
+    REM :GET_NW
+    REM    wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
+    REM    IF %ERRORLEVEL% NEQ 0 GOTO GET_NW

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

@@ -35,27 +35,15 @@ paths it would expect to find in the standard package for your platform.

 You can then execute the runtime by running something like:

-    node_modules/nw/nwjs/nw .
+```bash
+node_modules/nw/nwjs/nw .
+```

 or on macOS:

-    node_modules/nw/nwjs/nwjs.app/Contents/MacOS/nwjs .
-
-# Create Database Migrations
-
-In order to make changes to the SQLite DB, navigate to the 'web' directory:
-
-    (pgadmin4) $ cd $PGADMIN4_SRC/web
-
-Create a migration file with the following command:
-
-    (pgadmin4) $ FLASK_APP=pgAdmin4.py flask db revision
-
-This will create a file in: $PGADMIN4_SRC/web/migrations/versions/ .
-Add any changes to the 'upgrade' function.
-Increment the SCHEMA_VERSION in $PGADMIN4_SRC/web/pgadmin/model/__init__.py file.
-
-There is no need to increment the SETTINGS_SCHEMA_VERSION.
+```bash
+node_modules/nw/nwjs/nwjs.app/Contents/MacOS/nwjs .
+```

 # Configuring the Python Environment

@@ -65,40 +53,47 @@ 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
+1. Create a virtual environment in an appropriate directory. The last argument is
+   the name of the environment; that can be changed as desired:

-       $ sudo pip install virtualenv virtualenvwrapper
-
-2. Source the virtualenv wrapper tools script. You may want to add this command
-   to your ~/.bash_profile file for future convenience:
-
-       $ source /usr/local/bin/virtualenvwrapper.sh
-
-3. Create a virtual environment:
-
-       $ mkvirtualenv pgadmin4
-
-   To make use of the virtual environment in the future, use the following
-   command to re-activate it:
-
-       $ workon pgadmin4
+   ```bash
+   $ python3 -m venv venv
+   ```
+   
+2. Now activate the virtual environment:

+   ```bash
+   $ source venv/bin/activate
+   ```
+   
+3. Some of the components used by pgAdmin require a very recent version of *pip*,
+   so update that to the latest:
+   
+   ```bash
+   $ pip install --upgrade pip
+   ```
+   
 4. Ensure that a PostgreSQL installation's bin/ directory is in the path (so
   pg_config can be found for building psycopg2), and install the required
   packages:

-       (pgadmin4) $ PATH=$PATH:/usr/local/pgsql/bin pip install -r $PGADMIN4_SRC/requirements.txt
-
+   ```bash
+   (venv) $ PATH=$PATH:/usr/local/pgsql/bin pip install -r $PGADMIN4_SRC/requirements.txt
+   ```
+   
   If you are planning to run the regression tests, you also need to install
   additional requirements from web/regression/requirements.txt:

-       (pgadmin4) $ pip install -r $PGADMIN4_SRC/web/regression/requirements.txt
-
+   ```bash
+   (venv) $ pip install -r $PGADMIN4_SRC/web/regression/requirements.txt
+   ```
+   
 5. Create a local configuration file for pgAdmin. Edit
   $PGADMIN4_SRC/web/config_local.py and add any desired configuration options
   (use the config.py file as a reference - any settings duplicated in
   config_local.py will override those in config.py). A typical development
   configuration may look like:
+   
    ```python
    from config import *

@@ -131,6 +126,7 @@ simple - adapt as required for your distribution:
            'pgadmin4-server.db'
        )
   ```
+   
   This configuration allows easy switching between server and desktop modes
   for testing.

@@ -138,12 +134,16 @@ simple - adapt as required for your distribution:
   mode, and non-interactive in desktop mode. You can run it either by
   running:

-       (pgadmin4) $ python $PGADMIN4_SRC/web/setup.py
-
+   ```bash
+   (venv) $ python3 $PGADMIN4_SRC/web/setup.py
+   ```
+   
   or by starting pgAdmin 4:

-       (pgadmin4) $ python $PGADMIN4_SRC/web/pgAdmin4.py
-
+   ```bash
+   (venv) $ python3 $PGADMIN4_SRC/web/pgAdmin4.py
+   ```
+   
   Whilst it is possible to automatically run setup in desktop mode by running
   the runtime, that will not work in server mode as the runtime doesn't allow
   command line interaction with the setup program.
@@ -155,10 +155,7 @@ the terminal once pgAdmin has started up.
 Setup of an environment on Windows is somewhat more complicated unfortunately,
 please see *pkg/win32/README.txt* for complete details.

-Once a virtual environment has been created and enabled, setup can continue
-from step 4 above.
-
-## Building the Web Assets
+# Building the Web Assets

 pgAdmin is dependent on a number of third party Javascript libraries. These,
 along with it's own Javascript code, SCSS/CSS code and images must be
@@ -170,18 +167,22 @@ To create the bundle, you will need the 'yarn' package management tool to be
 installed. Then, you can run the following commands on a *nix system to
 download the required packages and build the bundle:

-    (pgadmin4) $ cd $PGADMIN4_SRC
-    (pgadmin4) $ make install-node
-    (pgadmin4) $ make bundle
+```bash
+(venv) $ cd $PGADMIN4_SRC
+(venv) $ make install-node
+(venv) $ make bundle
+```

 On Windows systems (where "make" is not available), the following commands
 can be used:

-    C:\> cd $PGADMIN4_SRC\web
-    C:\$PGADMIN4_SRC\web> yarn install
-    C:\$PGADMIN4_SRC\web> yarn run bundle
+```
+C:\> cd $PGADMIN4_SRC\web
+C:\$PGADMIN4_SRC\web> yarn install
+C:\$PGADMIN4_SRC\web> yarn run bundle
+```

-## Creating pgAdmin themes
+# Creating pgAdmin themes

 To create a pgAdmin theme, you need to create a directory under
 *web/pgadmin/static/scss/resources*.
@@ -202,12 +203,16 @@ hyphens (-) will be replaced with spaces and the result will be camel cased.
 In order to build the docs, an additional Python package is required in the
 virtual environment. This can be installed with the pip package manager:

-    $ workon pgadmin4
-    (pgadmin4) $ pip install Sphinx
-    
+```bash
+$ source venv/bin/activate
+(venv) $ pip install Sphinx
+```
+
 The docs can then be built using the Makefile in *$PGADMIN4_SRC*, e.g.

-    (pgadmin4) $ make docs
+```bash
+(venv) $ make docs
+```

 The output can be found in *$PGADMIN4_SRC/docs/en_US/_build/html/index.html*

@@ -218,22 +223,45 @@ the setup and configuration above has been completed.

 To build a source tarball:

-    (pgadmin4) $ make src
+```bash
+(venv) $ make src
+```

 To build a PIP Wheel, activate either a Python 3 virtual environment, configured 
 with all the required packages, and then run:

-    (pgadmin4) $ make pip
+```bash
+(venv) $ make pip
+```

 To build the macOS AppBundle, please see *pkg/mac/README*.

 To build the Windows installer, please see *pkg/win32/README.txt*.
+# Create Database Migrations

-## Support
+In order to make changes to the SQLite DB, navigate to the 'web' directory:
+
+```bash
+(venv) $ cd $PGADMIN4_SRC/web
+```
+
+Create a migration file with the following command:
+
+```bash
+(venv) $ FLASK_APP=pgAdmin4.py flask db revision
+```
+
+This will create a file in: $PGADMIN4_SRC/web/migrations/versions/ .
+Add any changes to the 'upgrade' function.
+Increment the SCHEMA_VERSION in $PGADMIN4_SRC/web/pgadmin/model/__init__.py file.
+
+There is no need to increment the SETTINGS_SCHEMA_VERSION.
+
+# Support

 See https://www.pgadmin.org/support/ for support options.

-## Project info
+# Project info

 The source code repository can be found here:

@@ -38,7 +38,7 @@ Use the fields in the *Definition* tab to define parameters:
 * Use the drop-down listbox next to *Function* to select the function used to
  perform the cast. The function's result data type must match the target type
  of the cast.
-* Move the *Context* switch to the *Implicit* position if the cast is implicit.
+* Select *Context* toggle to *Implicit* if the cast is implicit.
  By default, a cast can be invoked only by an explicit cast request. If the
  cast is marked *Implicit* then it can be invoked implicitly in any context,
  whether by assignment or internally in an expression.
@@ -58,10 +58,7 @@ the *Cast* dialog:
    :alt: Cast dialog sql tab
    :align: center

-The cast uses a function named *int4(bigint)* to convert a biginteger data type
-to an integer.
-
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
@@ -55,12 +55,11 @@ the *Check* dialog:
    :alt: Check dialog sql tab
    :align: center

-The example shown demonstrates creating a check constraint named *check_price*
-on the *price* column of the *products* table.  The constraint confirms that
-any values added to the column are greater than 0.
+The example shown demonstrates creating a check constraint named *jobhist_date_chk*
+on the *startdate* column of the *jobhist* table.


 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
@@ -212,5 +212,5 @@ 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 completely.) Please
-look at the the javascript files node.js, browser.js, menu.js, panel.js, etc for
+look at the javascript files node.js, browser.js, menu.js, panel.js, etc for
 better understanding of the code.
@@ -79,7 +79,7 @@ rules specified for the locale, *fr-BI-x-icu.  The collation is owned by
   https://www.postgresql.org/docs/current/locale.html

 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.


@@ -163,10 +163,10 @@ the *Column* dialog:
    :alt: Column dialog sql tab
    :align: center

-The example shown demonstrates creating a column named *territory* in the table
-named *distributors*.
+The example shown demonstrates creating a column named *sal* in the table
+named *jobhist*.

 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
@@ -79,5 +79,5 @@ 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.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
@@ -22,17 +22,19 @@ server:
 * PostgreSQL 11: */usr/local/pgsql-11*
 * PostgreSQL 12: */usr/local/pgsql-12*
 * PostgreSQL 13: */usr/local/pgsql-13*
+* PostgreSQL 14: */usr/local/pgsql-14*

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

 .. code-block:: bash

    DEFAULT_BINARY_PATHS = {
-            'pg-13': '/usr/local/pgsql-13'
-            'pg-12': '/usr/local/pgsql-12'
-            'pg-11': '/usr/local/pgsql-11'
-            'pg-10': '/usr/local/pgsql-10'
-            'pg-9.6': '/usr/local/pgsql-9.6'
+        'pg-14': '/usr/local/pgsql-14',
+        'pg-13': '/usr/local/pgsql-13',
+        'pg-12': '/usr/local/pgsql-12',
+        'pg-11': '/usr/local/pgsql-11',
+        'pg-10': '/usr/local/pgsql-10',
+        'pg-9.6': '/usr/local/pgsql-9.6'
    }

 this may be changed in the :ref:`preferences`.
@@ -131,5 +131,5 @@ allows unlimited connections, and is available to all authenticated users.

 * 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
@@ -15,7 +15,7 @@ installation, and is distributed as part of Advanced Server.  You must have
 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
+the server-side debugger components to the value of the
 *shared_preload_libraries* parameter, for example:

  shared_preload_libraries = '$libdir/plugin_debugger'
@@ -59,11 +59,11 @@ the *Domain Constraints* dialog:
    :align: center

 The example shown demonstrates creating a domain constraint on the domain
-*timesheets* named *weekday*. It constrains a value to equal *Friday*.
+*timesheets* named *weekday*. It constrains a value equal to *Friday*.

 * 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.


@@ -114,12 +114,12 @@ the *Domain* dialog:
    :alt: Domain dialog sql tab
    :align: center

-The example shown demonstrates creating a domain named *minimum-wage* that
-confirms that the value entered is greater than or equal to *7.25*.
+The example shown demonstrates creating a domain named *postal_code* that
+confirms that the value entered is in proper format.

 * 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.


@@ -107,6 +107,86 @@ properties of the geometries directly in map, just click the specific geometry:
    - *Internet access:* An internet connection is required for the Geometry Viewer
      to function correctly.

+
+**JSON Data Editor**
+
+A built in json editor is provided for *JSON/JSONB Data*.Double clicking on json/jsonb
+data type cell in data grid will open JSON Editor.Editor provides different mode to
+view and edit json data.
+
+
+.. image:: images/json_editor_modes.png
+    :alt: Json Editor
+    :align: center
+
+*Code Mode*:
+Provides way to format & compact json data.Also provides ability to repair json data
+by fixing quotes and escape characters, removing comments and JSONP notation and
+turn JavaScript objects into JSON.
+
+*Tree Mode*:
+Enabled to change, add, move, remove, and duplicate fields and values.Provides ability
+to searh & hilight data.
+
+*Form Mode*:
+Allows only to edit values in json data there by providing ability to keep data structure
+unchanged while editing.
+
+*Preview Mode*:
+Provides ability to check data before saving and also shows size of current json data.
+Format and compact json data as well.
+
+
+*Editor Toolbar*
+
+Different options are provided to manipulate json data.
+
+Code/Preview mode:
+
+.. image:: images/json_editor_code_preview_tool_bar.png
+    :alt: Json Editor Code/Preview mode Tool Bar
+    :align: center
+
+
+Tree/Form mode:
+
+.. image:: images/json_editor_tree_form_mode_tool_bar.png
+    :alt: Json Editor Tree/Form mode Tool Bar
+    :align: center
+
+
+.. table::
+   :class: longtable
+   :widths: 1 3 2
+
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | Icon                 | Behavior                                                                               | Available in mode         |
+   +======================+========================================================================================+===========================+
+   | *Format Json*        | Click to *Format Json* format json data with proper indentation.                       | Code, Preview             |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Compact Json*       | Click to *Compact Json* get compacted json data.                                       | Code, Preview             |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Sort*               | Click to *Sort* icon to set sorting criteria for the data using file values.           | Code, Preview, Tree       |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Transform*          | Click to *Transform*  to filter data  using JSME query language.                       | Code, Preview, Tree       |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Undo*               | Click to *Undo* to undo last action performed on data .                                | Code, Preview, Tree, From |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Redo*               | Click to *Redo* to repat last action performed on data .                               | Code, Preview, Tree, From |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Mode*               | Click to *Mode* dropdown to change dipaly mode of editor.Different modes avaialble     | Code, Tree, From, Preview |
+   |                      | are Code, Preview, Tree, From.                                                         |                           |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Expand All*         | Click to *Expand All* to expand json data.                                             | Tree, From                |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Collapse All*       | Click to *Redo* to collapse json data.                                                 | Tree, From                |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Search Box*         | Enter partial/complete string to search in data.                                       | Tree, From                |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+
+
+
+
 Sort/Filter options dialog
 **************************

@@ -12,6 +12,7 @@ The Entity-Relationship Diagram (ERD) tool is a database design tool that provid
 * Save the diagram and open it later to continue working on it.
 * Generate ready to run SQL from the database design.
 * Generate the database diagram for an existing database.
+* Drag and drop tables from browser tree to the diagram.

 .. image:: images/erd_tool.png
    :alt: ERD tool window
@@ -4,14 +4,14 @@
 `Event Trigger Dialog`:index:
 *****************************

-Use the *Domain Trigger* dialog to define an event trigger. Unlike regular
+Use the *Event Trigger* dialog to define an event trigger. Unlike regular
 triggers, which are attached to a single table and capture only DML events,
 event triggers are global to a particular database and are capable of capturing
 DDL events.  Like regular triggers, event triggers can be written in any
 procedural language that includes event trigger support, or in C, but not in
 SQL.

-The *Domain Trigger* dialog organizes the development of a event trigger through
+The *Event Trigger* dialog organizes the development of a event trigger through
 the following dialog tabs: *General*, *Definition*, and *Security Labels*. The
 *SQL* tab displays the SQL code generated by dialog selections.

@@ -67,7 +67,7 @@ in the *Delete Row* popup.

 Click the *SQL* tab to continue.

-Your entries in the *Domain Trigger* dialog generate a generate a SQL command.
+Your entries in the *Event Trigger* dialog generate a generate a SQL command.
 Use the *SQL* tab for review; revisit or switch tabs to make any changes to the
 SQL command.

@@ -75,18 +75,18 @@ Example
 *******

 The following is an example of the sql command generated by user selections in
-the *Domain Trigger* dialog:
+the *Event Trigger* dialog:

 .. image:: images/event_trigger_sql.png
    :alt: Event trigger dialog sql tab
    :align: center

 The command creates an event trigger named *accounts* that invokes the procedure
-named *acct_due*.
+named *evt_tri_fun*.

 * 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.


@@ -96,11 +96,9 @@ the *Exclusion Constraint* dialog:
    :align: center

 The example shown demonstrates creating an exclusion constraint named
-*exclude_department* that restricts additions to the dept table to those
-additions that are not equal to the value of the *deptno* column.  The
-constraint uses a btree index.
+*ex_dept_no*. The constraint uses a btree index.

 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
@@ -54,11 +54,11 @@ the *Extension* dialog:
    :alt: Extension dialog sql tab
    :align: center

-The command creates the *chkpass* extension in the *public* schema.  It is
-version *1.0* of *chkpass*.
+The command creates the *adminpack* extension in the *public* schema.  It is
+version *1.0* of *adminpack*.

 * 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.

@@ -53,7 +53,7 @@ Click the *Options* tab to continue.

 Use the fields in the *Options* tab to specify options:

-* Click the the *Add* icon (+) button to add an option/value pair for the
+* Click the *Add* icon (+) button to add an option/value pair for the
  foreign data wrapper. Supported option/value pairs will be specific to the
  selected foreign data wrapper.
 * Specify the option name in the *Option* field and provide a corresponding
@@ -97,12 +97,12 @@ the *Foreign Data Wrapper* dialog:
    :alt: Foreign data wrapper dialog sql tab
    :align: center

-The example creates a foreign data wrapper named *libpq_debug* that uses
+The example creates a foreign data wrapper named *lib_qp_debug* that uses
 pre-existing validator and handler functions, *dblink_fdw_validator* and
 *libpg_fdw_handler*.  Selections on the *Options* tab set *debug* equal to
 *true*.  The foreign data wrapper is owned by *postgres*.

 * Click the *Help* button (?) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
@@ -129,10 +129,10 @@ the *Foreign key* dialog:
    :align: center

 The example shown demonstrates creating a foreign key constraint named
-*territory_fkey* that matches values in the *distributors* table *territory*
-column with those of the *sales_territories* table *region* column.
+*jobhist_ref_dept_fk* that matches values in the *jobhist* table *dept_no*
+column with those of the *dept* table *deptno* column.

 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
@@ -93,5 +93,5 @@ Options for the foreign server include a host and a port.

 * 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
@@ -157,10 +157,10 @@ the *Foreign Table* dialog:
    :align: center

 The example shown demonstrates creating a foreign table *weblogs* with multiple
-columns and two options.
+columns.


 * 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
@@ -49,7 +49,7 @@ Click the *Tokens* tab to continue.
 Use the fields in the *Tokens* tab to add a token:

 * Use the *Tokens* field to specify the name of a token.
-* Click the *Add* icon (+) to create a token.
+* Click the *Add* button to create a token.
 * Use the *Dictionaries* field to specify a dictionary.

 Repeat these steps to add additional tokens; to discard a token, click the
@@ -73,11 +73,11 @@ the *FTS Configuration* dialog:
    :align: center

 The example shown demonstrates creating a FTS configuration named
-*meme_phrases*. It uses the *default* parser.
+*english_phrases*. It uses the *default* parser.

 * 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.


@@ -108,7 +108,7 @@ The example shown demonstrates creating a custom dictionary named

 * 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.


@@ -58,7 +58,7 @@ command.

 * 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.


@@ -52,12 +52,12 @@ the *FTS Template* dialog:
    :alt: FTS template dialog sql tab
    :align: center

-The example shown demonstrates creating a fts template named *ru_template* that
+The example shown demonstrates creating a fts template named *eng.template* that
 uses the ispell dictionary.

 * 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.


@@ -181,5 +181,5 @@ 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 *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
@@ -35,9 +35,11 @@ Mode is pre-configured for security.
   login
   user_management
   change_user_password
+   restore_locked_user
   ldap
   kerberos
   oauth2
+   webserver


 .. note:: Pre-compiled and configured installation packages are available for
@@ -10,8 +10,8 @@ search box, dropdown lists, and checkboxes facilitate quick selections of
 database objects, roles and privileges.

 The wizard organizes privilege management through a sequence of windows:
-*Object Selection (step 1 of 3)*, *Privileges Selection (step 2 of 3)* and
-*Final (Review Selection) (step 3 of 3)*. The *Final (Review Selection)* window
+*Object Selection*, *Privileges Selection* and
+*Review Selection*. The *Review Selection* window
 displays the SQL code generated by wizard selections.

 To launch the *Grant Wizard* tool, select a database object in the *pgAdmin*
@@ -22,7 +22,7 @@ tree control, then navigate through *Tools* on the menu bar to click on the
    :alt: Grant wizard step one page
    :align: center

-Use the fields in the *Object Selection (step 1 of 3)* window to select the
+Use the fields in the *Object Selection* window to select the
 object or objects on which you are modifying privileges. Use the *Search by
 object type or name* field to locate a database object, or use the scrollbar
 to scroll through the list of all accessible objects.
@@ -35,14 +35,14 @@ to scroll through the list of all accessible objects.
    * The schema in which the object resides in the *Schema* field
    * The object name in the *Name* field.

-Click the *Next* button to continue, or the *Cancel* button to close the wizard
+Click the *Next* button to continue, or the *X* button to close the wizard
 without modifying privileges.

 .. image:: images/grant_wizard_step2.png
    :alt: Grant wizard step two page
    :align: center

-Use the fields in the *Privileges Selection (step 2 of 3)* window to grant
+Use the fields in the *Privileges Selection* window to grant
 privileges. If you grant a privilege WITH GRANT OPTION, the Grantee will have
 the right to grant privileges on the object to others. If WITH GRANT OPTION is
 subsequently revoked, any role who received access to that object from that
@@ -64,11 +64,11 @@ For more information about granting privileges on database objects, see the
 `PostgreSQL core documentation <https://www.postgresql.org/docs/current/sql-grant.html>`_.

 Click the *Next* button to continue, the *Back* button to select or deselect
-additional database objects, or the *Cancel* button to close the wizard without
+additional database objects, or the *X* button to close the wizard without
 modifying privileges.

 Your entries in the *Grant Wizard* tool generate a SQL command; you can review
-the command in the *Final (Review Selection) (step 3 of 3)* window (see an
+the command in the *Review Selection* window (see an
 example below).

 Example
@@ -81,11 +81,6 @@ the *Grant Wizard* tool:
    :alt: Grant wizard step three page
    :align: center

-The commands displayed assign a role named *Bob* *INSERT* and *UPDATE*
-privileges *WITH GRANT OPTION* on the *sales_meetings* and the
-*sales_territories* tables.
-
 * 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.