Added support for executing the query at the cursor position in the query tool. #6841

docs/en_US/clear_saved_passwords.rst

@@ -8,6 +8,7 @@ Use *Clear Saved Password* functionality to clear the saved password for the
 database server.
 
 .. image:: images/clear_saved_password.png
+    :alt: Clear saved password
     :align: center
 
 *Clear Saved Password* shows in the context menu for the selected server as well
@@ -17,6 +18,7 @@ Use *Clear SSH Tunnel Password* functionality to clear the saved password of SSH
 Tunnel to connect to the database server.
 
 .. image:: images/clear_tunnel_password.png
+    :alt: Clear SSH tunnel password
     :align: center
 
 *Clear SSH Tunnel Password* shows in the context menu for the selected server as

docs/en_US/connect_to_server.rst

@@ -11,6 +11,7 @@ and select *Connect Server...* from the context menu.
 
 .. image:: images/connect_to_server.png
     :alt: Connect to server dialog
+    :align: center
 
 Provide authentication information for the selected server:
 
@@ -26,6 +27,7 @@ Tunnel and Database server passwords if not already saved.
 
 .. image:: images/connect_to_tunneled_server.png
     :alt: Connect to server dialog
+    :align: center
 
 Provide authentication information for the selected server:
 

docs/en_US/debugger.rst

@@ -61,6 +61,7 @@ values required by the program:
 
 .. image:: images/debug_params.png
     :alt: Debugger parameter dialog
+    :align: center
 
 Use the fields on the *Debugger* dialog to provide a value for each parameter:
 

docs/en_US/preferences.rst

@@ -399,9 +399,6 @@ Use the fields on the *Editor* panel to change settings of the query editor.
   changed to text/plain. Keyword highlighting and code folding will be disabled.
   This will improve editor performance with large files.
 
-* When the *Show View/Edit Data Promotion Warning?* switch is set to *True*
-  View/Edit Data tool will show promote to Query tool confirm dialog on query edit.
-
 .. image:: images/preferences_sql_explain.png
     :alt: Preferences dialog sqleditor explain options
     :align: center
@@ -474,6 +471,16 @@ Use the fields on the *Options* panel to manage editor preferences.
   by the Primary Key columns by default. When using the First/Last 100 Rows options,
   data is always sorted.
 
+* When the *Show View/Edit Data Promotion Warning?* switch is set to *True*
+  View/Edit Data tool will show promote to Query tool confirm dialog on query edit.
+
+* When the *Underline query at cursor?* switch is set to *True*, query tool will 
+  parse and underline the query at the cursor position.
+
+* When the *Underlined query execute warning?* switch is set to *True*, query tool 
+  will warn upon clicking the *Execute Query* button in the query tool.  The warning 
+  will appear only if *Underline query at cursor?* is set to *False*.
+
 .. image:: images/preferences_sql_results_grid.png
     :alt: Preferences dialog sql results grid section
     :align: center
@@ -503,7 +510,7 @@ preferences for copied data.
     :align: center
 
 Use the fields on the *Keyboard shortcuts* panel to configure shortcuts for the
-Query Tool window navigation:
+Query Tool window navigation.
 
 .. image:: images/preferences_sql_formatting.png
     :alt: Preferences dialog SQL Formatting section

docs/en_US/query_tool.rst

@@ -26,13 +26,12 @@ allows you to:
     :align: center
 
 You can open multiple copies of the Query tool in individual tabs
-simultaneously.  To close a copy of the Query tool, click the *X* in the
-upper-right hand corner of the tab bar.
+simultaneously.  To close a copy of the Query tool, click the *X* of the tab.
 
 The Query Tool features two panels:
 
 * The upper panel displays the *SQL Editor*. You can use the panel to enter,
-  edit, or execute a query. It also shows the *History* tab which can be used
+  edit, or execute a query or a script. It also shows the *History* tab which can be used
   to view the queries that have been executed in the session, and a *Scratch Pad*
   which can be used to hold text snippets during editing. If the Scratch Pad is
   closed, it can be re-opened (or additional ones opened) by right-clicking in
@@ -75,14 +74,30 @@ key combination to select from a popup menu of autocomplete options.
 
 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 script* icon.
+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 script* icon.
 
-.. image:: images/query_execute_section.png
+.. image:: images/query_execute_script.png
+    :alt: Query tool execute script section
+    :align: center
+
+You can also execute a query based on cursor position. Query tool will detect
+a query and underline it when cursor position changes. Now, to execute the
+current underlined query, hit the *Execute query* button on the toolbar. If a section
+is highlighted then it will behave like normal execute.
+
+.. image:: images/query_execute_query.png
     :alt: Query tool execute query section
     :align: center
 
+The warning will appear only if *Underline query at cursor?* is set to *False* and
+the *Underlined query execute warning?* switch is set to *True* Preferences Query tool's Options.
+
+.. image:: images/query_execute_warning.png
+    :alt: Query tool execute query warning
+    :align: center
+
 The message returned by the server when a command executes is displayed on the
 *Messages* tab.  If the command is successful, the *Messages* tab displays
 execution details.
@@ -159,8 +174,6 @@ 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 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.
 * Edit the data in the result set of a SELECT query if it is updatable.

docs/en_US/query_tool_toolbar.rst

@@ -128,6 +128,9 @@ Query Execution
    |                      |    transaction.  Any changes made by the transaction will be visible to others, and               |                |
    |                      |    durable in the event of a crash.                                                               |                |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Execute query*      | Click the *Execute query* icon to either execute the query where the cursor is present or         | Option+F5 (MAC)|
+   |                      | refresh the query highlighted in the SQL editor panel.                                            | Alt+F5 (Others)|
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | *Explain*            | Click the *Explain* icon to view an explanation plan for the current query. The result of the     | F7             |
    |                      | EXPLAIN is displayed graphically on the *Explain* tab of the output panel, and in text            |                |
    |                      | form on the *Data Output* tab.                                                                    |                |
@@ -206,6 +209,8 @@ Data Editing Options
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | Graph Visualiser     | Use the Graph Visualiser button to generate graphs of the query results.                          |                |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | SQL                  | Use the SQL button to check the current query that gave the data.                                 |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
 
 Status Bar
 **********