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

Catch errors when trying to EXPLAIN an invalid query. Fixes #3257

Browse Source
This commit is contained in:
Murtuza Zabuawala 2018-04-12 10:50:57 +01:00 committed by Dave Page
parent 79edf40141
commit c08adb5567
7 changed files with 46 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes.rst
View File

@ -9,6 +9,7 @@ for it.
.. toctree::
release_notes_3_1
release_notes_3_0
release_notes_2_1
release_notes_2_0

17
docs/en_US/release_notes_3_1.rst Normal file
View File

@ -0,0 +1,17 @@
***********
Version 3.1
***********
Release date: 2018-??-??
This release contains a number of features and fixes reported since the release of pgAdmin4 3.0
Features
********
Bug fixes
*********
| `Bug #3257 <https://redmine.postgresql.org/issues/3257>`_ - Catch errors when trying to EXPLAIN an invalid query

24
web/pgadmin/tools/sqleditor/templates/sqleditor/sql/10_plus/explain_plan.sql
View File

@ -1,23 +1,15 @@
EXPLAIN (
{% if format %}
EXPLAIN ({% if format -%}
FORMAT {{ format.upper() }},
{% endif %}
{% if analyze is defined %}
{%- endif %}{% if analyze is defined -%}
ANALYZE {{ analyze }},
{% endif %}
{% if verbose is defined %}
{%- endif %}{% if verbose is defined -%}
VERBOSE {{ verbose }},
{% endif %}
{% if costs is defined %}
{%- endif %}{% if costs is defined -%}
COSTS {{ costs }},
{% endif %}
{% if timing is defined %}
{%- endif %}{% if timing is defined -%}
TIMING {{ timing }},
{% endif %}
{% if summary is defined %}
{%- endif %}{% if summary is defined -%}
SUMMARY {{ summary }},
{% endif %}
{% if buffers is defined %}
{%- endif %}{% if buffers is defined -%}
BUFFERS {{ buffers }}
{% endif %}
) {{ sql }}
{%- endif %}) {{ sql }}

21
web/pgadmin/tools/sqleditor/templates/sqleditor/sql/9.2_plus/explain_plan.sql
View File

@ -1,20 +1,13 @@
EXPLAIN (
{% if format %}
EXPLAIN ({% if format -%}
FORMAT {{ format.upper() }},
{% endif %}
{% if analyze is defined %}
{%- endif %}{% if analyze is defined -%}
ANALYZE {{ analyze }},
{% endif %}
{% if verbose is defined %}
{%- endif %}{% if verbose is defined -%}
VERBOSE {{ verbose }},
{% endif %}
{% if costs is defined %}
{%- endif %}{% if costs is defined -%}
COSTS {{ costs }},
{% endif %}
{% if timing is defined %}
{%- endif %}{% if timing is defined -%}
TIMING {{ timing }},
{% endif %}
{% if buffers is defined %}
{%- endif %}{% if buffers is defined -%}
BUFFERS {{ buffers }}
{% endif %}
) {{ sql }}
{%- endif %}) {{ sql }}

19
web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/explain_plan.sql
View File

@ -1,17 +1,10 @@
EXPLAIN (
{% if format %}
EXPLAIN ({% if format -%}
FORMAT {{ format.upper() }},
{% endif %}
{% if analyze is defined %}
ANALYZE {{ analyze }},
{% endif %}
{% if verbose is defined %}
{%- endif %}{% if analyze is defined -%}
ANALYZE {{ analyze }},{%- endif %}{% if verbose is defined -%}
VERBOSE {{ verbose }},
{% endif %}
{% if costs is defined %}
{%- endif %}{% if costs is defined -%}
COSTS {{ costs }},
{% endif %}
{% if buffers is defined %}
{%- endif %}{% if buffers is defined -%}
BUFFERS {{ buffers }}
{% endif %}
) {{ sql }}
{%- endif %}) {{ sql }}

6
web/pgadmin/tools/sqleditor/templates/sqleditor/sql/gpdb_5.0_plus/explain_plan.sql
View File

@ -1,5 +1 @@
EXPLAIN
{% if analyze %}
ANALYZE
{% endif %}
{{ sql }}
EXPLAIN {% if analyze %}ANALYZE {% endif %}{{ sql }}

12
web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py
View File

@ -35,8 +35,8 @@ class TestExplainPlanTemplates(BaseTestGenerator):
),
sql_statement='SELECT * FROM places',
expected_return_value='EXPLAIN '
'( FORMAT XML, ANALYZE True, '
'VERBOSE True, COSTS False, '
'(FORMAT XML,ANALYZE True,'
'VERBOSE True,COSTS False,'
'BUFFERS True) SELECT * FROM places'
)
),
@ -54,7 +54,7 @@ class TestExplainPlanTemplates(BaseTestGenerator):
),
sql_statement='SELECT * FROM places',
expected_return_value='EXPLAIN '
'( FORMAT JSON, BUFFERS True) '
'(FORMAT JSON,BUFFERS True) '
'SELECT * FROM places'
)
),
@ -73,7 +73,7 @@ class TestExplainPlanTemplates(BaseTestGenerator):
),
sql_statement='SELECT * FROM places',
expected_return_value='EXPLAIN '
'( FORMAT JSON, TIMING False, '
'(FORMAT JSON,TIMING False,'
'BUFFERS True) SELECT * FROM places'
)
),
@ -93,8 +93,8 @@ class TestExplainPlanTemplates(BaseTestGenerator):
),
sql_statement='SELECT * FROM places',
expected_return_value='EXPLAIN '
'( FORMAT YAML, TIMING False, '
'SUMMARY True, BUFFERS True) '
'(FORMAT YAML,TIMING False,'
'SUMMARY True,BUFFERS True) '
'SELECT * FROM places'
)
),