diff --git a/docs/en_US/query_tool.rst b/docs/en_US/query_tool.rst index cb462110a..e2ead1c05 100644 --- a/docs/en_US/query_tool.rst +++ b/docs/en_US/query_tool.rst @@ -73,11 +73,11 @@ key combination to select from a popup menu of autocomplete options. :alt: Query tool autocomplete feature :align: center -After entering a query, select the *Execute/Refresh* icon from the toolbar. The +After entering a query, select the *Execute script* icon from the toolbar. The complete contents of the SQL editor panel will be sent to the database server for execution. To execute only a section of the code that is displayed in the SQL editor, highlight the text that you want the server to execute, and click -the *Execute/Refresh* icon. +the *Execute script* icon. .. image:: images/query_execute_section.png :alt: Query tool execute query section @@ -159,7 +159,7 @@ The *Data Output* tab displays the result set of the query in a table format. You can: * Select and copy from the displayed result set. -* Use the *Execute/Refresh* options to retrieve query execution information and +* Use the *Execute script* options to retrieve query execution information and set query execution options. * Use the *Save results to file* icon to save the content of the *Data Output* tab as a comma-delimited file. diff --git a/docs/en_US/query_tool_toolbar.rst b/docs/en_US/query_tool_toolbar.rst index 4ecd3c1ed..bb04f5f4f 100644 --- a/docs/en_US/query_tool_toolbar.rst +++ b/docs/en_US/query_tool_toolbar.rst @@ -116,7 +116,7 @@ Query Execution +======================+===================================================================================================+================+ | *Stop* | Click the *Stop* icon to cancel the execution of the currently running query. | Accesskey + Q | +----------------------+---------------------------------------------------------------------------------------------------+----------------+ - | *Execute/Refresh* | Click the *Execute/Refresh* icon to either execute or refresh the query highlighted in the SQL | F5 | + | *Execute script* | Click the *Execute script* icon to either execute or refresh the query highlighted in the SQL | F5 | | | editor panel. Click the down arrow to access other execution options: | | | | | | | | * Add a check next to *Auto rollback on error?* to instruct the server to automatically roll back| | diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx index 2518df0bf..f72ff7c53 100644 --- a/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx +++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx @@ -537,7 +537,7 @@ export function MainToolBar({containerRef, onFilterClick, onManageMacros}) { } onClick={cancelQuery} disabled={buttonsDisabled['cancel']} accesskey={shortcut_key(queryToolPref.btn_cancel_query)} /> - } + } onClick={executeQuery} disabled={buttonsDisabled['execute']} shortcut={queryToolPref.execute_query}/> } splitButton name="menu-autocommit" ref={autoCommitMenuRef} accesskey={shortcut_key(queryToolPref.btn_delete_row)} diff --git a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py index f17f46466..20bca9ad9 100644 --- a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py +++ b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py @@ -357,7 +357,7 @@ def register_query_tool_preferences(self): self.preference.register( 'keyboard_shortcuts', 'execute_query', - gettext('Execute query'), + gettext('Execute script'), 'keyboardshortcut', { 'alt': False, diff --git a/web/regression/feature_utils/locators.py b/web/regression/feature_utils/locators.py index 5c8cd23bb..a8c996f8c 100644 --- a/web/regression/feature_utils/locators.py +++ b/web/regression/feature_utils/locators.py @@ -213,7 +213,7 @@ class QueryToolLocators: btn_load_file_css = "button[data-label='Open File']" - btn_execute_query_css = "button[data-label='Execute/Refresh']" + btn_execute_query_css = "button[data-label='Execute script']" folder_path_css = \ "div[data-label='file-path'] input"