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

Fix ordering of VACUUM options which changed in PG11. Fixes #3836

Browse Source 
While we're at it, fix the JSON handling in the maintenance/backup/restore routes.
This commit is contained in:
Akshay Joshi
2019-01-10 15:29:55 +05:30
committed by Dave Page
parent a8167f0a72
commit 8fb340d23b
5 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_1.rst
View File

@@ -15,5 +15,6 @@ Bug fixes
********* *********
| `Bug #3575 <https://redmine.postgresql.org/issues/3575>`_ - Ensure the context menu works after a server is renamed. | `Bug #3575 <https://redmine.postgresql.org/issues/3575>`_ - Ensure the context menu works after a server is renamed.
| `Bug #3836 <https://redmine.postgresql.org/issues/3836>`_ - Fix ordering of VACUUM options which changed in PG11.
| `Bug #3842 <https://redmine.postgresql.org/issues/3842>`_ - Don't show system catalogs in the schemas property list unless show system objects is enabled. | `Bug #3842 <https://redmine.postgresql.org/issues/3842>`_ - Don't show system catalogs in the schemas property list unless show system objects is enabled.
| `Bug #3861 <https://redmine.postgresql.org/issues/3861>`_ - Fix help for the backup/restore dialogues. | `Bug #3861 <https://redmine.postgresql.org/issues/3861>`_ - Fix help for the backup/restore dialogues.

4
web/pgadmin/tools/backup/__init__.py
View File

@@ -276,9 +276,7 @@ def create_backup_objects_job(sid):
None None
""" """
if request.form: if request.form:
# Convert ImmutableDict to dict data = json.loads(request.form['data'], encoding='utf-8')
data = dict(request.form)
data = json.loads(data['data'][0], encoding='utf-8')
else: else:
data = json.loads(request.data, encoding='utf-8') data = json.loads(request.data, encoding='utf-8')

4
web/pgadmin/tools/maintenance/__init__.py
View File

@@ -174,9 +174,7 @@ def create_maintenance_job(sid, did):
None None
""" """
if request.form: if request.form:
# Convert ImmutableDict to dict data = json.loads(request.form['data'], encoding='utf-8')
data = dict(request.form)
data = json.loads(data['data'][0], encoding='utf-8')
else: else:
data = json.loads(request.data, encoding='utf-8') data = json.loads(request.data, encoding='utf-8')

2
web/pgadmin/tools/maintenance/templates/maintenance/sql/command.sql
View File

@@ -1,5 +1,5 @@
{% if data.op == "VACUUM" %} {% if data.op == "VACUUM" %}
VACUUM{% if data.vacuum_full %} FULL{% endif %}{% if data.vacuum_freeze %} FREEZE{% endif %}{% if data.vacuum_analyze %} ANALYZE{% endif %}{% if data.verbose %} VERBOSE{% endif %}{% if data.schema %} {{ conn|qtIdent(data.schema) }}.{{ conn|qtIdent(data.table) }}{% endif %}; VACUUM{% if data.vacuum_full %} FULL{% endif %}{% if data.vacuum_freeze %} FREEZE{% endif %}{% if data.verbose %} VERBOSE{% endif %}{% if data.vacuum_analyze %} ANALYZE{% endif %}{% if data.schema %} {{ conn|qtIdent(data.schema) }}.{{ conn|qtIdent(data.table) }}{% endif %};
{% endif %} {% endif %}
{% if data.op == "ANALYZE" %} {% if data.op == "ANALYZE" %}
ANALYZE{% if data.verbose %} VERBOSE{% endif %}{% if data.schema %} {{ conn|qtIdent(data.schema, data.table) }}{% endif %}; ANALYZE{% if data.verbose %} VERBOSE{% endif %}{% if data.schema %} {{ conn|qtIdent(data.schema, data.table) }}{% endif %};

4
web/pgadmin/tools/restore/__init__.py
View File

@@ -183,9 +183,7 @@ def create_restore_job(sid):
None None
""" """
if request.form: if request.form:
# Convert ImmutableDict to dict data = json.loads(request.form['data'], encoding='utf-8')
data = dict(request.form)
data = json.loads(data['data'][0], encoding='utf-8')
else: else:
data = json.loads(request.data, encoding='utf-8') data = json.loads(request.data, encoding='utf-8')