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

Set PSQLRC and PSQL_HISTORY env vars to apt. user storage path in the server mode. Fixes #6691

Browse Source
This commit is contained in:
Aditya Toshniwal 2021-08-23 16:19:01 +05:30 committed by Akshay Joshi
parent c64eb3507c
commit fbc6c30b62
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_5_7.rst
View File

@ -10,6 +10,7 @@ New features
************
| `Issue #4264 <https://redmine.postgresql.org/issues/4264>`_ - Make code folding case insensitive in the code mirror.
| `Issue #6691 <https://redmine.postgresql.org/issues/6691>`_ - Set PSQLRC and PSQL_HISTORY env vars to apt. user storage path in the server mode.
Housekeeping
************

7
web/pgadmin/tools/psql/__init__.py
View File

@ -109,6 +109,13 @@ def panel(trans_id):
# Set TERM env for xterm.
os.environ['TERM'] = 'xterm'
# If psql is enabled in server mode, set psqlrc and hist paths
# to individual user storage.
if config.ENABLE_PSQL and config.SERVER_MODE:
os.environ['PSQLRC'] = get_complete_file_path('.psqlrc', False)
os.environ['PSQL_HISTORY'] = \
get_complete_file_path('.psql_history', False)
o_db_name = _get_database(params['sid'], params['did'])
return render_template('editor_template.html',

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

@ -241,7 +241,7 @@ else:
return os.path.realpath(os.path.expanduser('~/'))
def get_complete_file_path(file):
def get_complete_file_path(file, validate=True):
"""
Args:
file: File returned by file manager
@ -266,7 +266,10 @@ def get_complete_file_path(file):
file = file.replace('\\', '/')
file = fs_short_path(file)
return file if os.path.isfile(file) else None
if validate:
return file if os.path.isfile(file) else None
else:
return file
def does_utility_exist(file):