IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

1) Fixed an issue where the binary path is not correctly parsed for version 9.6. Fixes #6534

Browse Source 
2) Added the default binary path in the container. 
3) Fixed the typo in the documentation.
This commit is contained in:
Akshay Joshi 2021-06-15 19:44:54 +05:30
parent 083509eb97
commit 16d2a3096a
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/docker/entrypoint.sh
View File

@ -10,6 +10,7 @@ CA_FILE = '/etc/ssl/certs/ca-certificates.crt'
LOG_FILE = '/dev/null'
HELP_PATH = '../../docs'
DEFAULT_BINARY_PATHS = {
'pg': '/usr/local/pgsql-13',
'pg-13': '/usr/local/pgsql-13',
'pg-12': '/usr/local/pgsql-12',
'pg-11': '/usr/local/pgsql-11',

2
web/pgadmin/static/js/backform.pgadmin.js
View File

@ -1196,7 +1196,7 @@ define([
gettext(' Enter the directory in which the psql, pg_dump, pg_dumpall, and pg_restore' +
' utilities can be found for the corresponding database server version.' +
' The default path will be used for server versions that do not have a' +
'path specified.') + '</span>'].join('\n'));
' path specified.') + '</span>'].join('\n'));
return this;
},

2
web/pgadmin/utils/__init__.py
View File

@ -322,6 +322,8 @@ def set_binary_path(binary_path, bin_paths, server_type,
# Get the version number by splitting the result string
version_number = \
version_string.split(") ", 1)[1].split('.', 1)[0]
elif version_number.find('.'):
version_number = version_number.split('.', 1)[0]
# Get the paths array based on server type
if 'pg_bin_paths' in bin_paths or 'as_bin_paths' in bin_paths: