sosedoff/pgweb
1
1
Fork 0
mirror of https://github.com/sosedoff/pgweb.git synced 2024-12-14 10:23:02 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-detect the query from the query source based on user selection (#547)

Browse Source 
* Auto-detect the query from the query source based on user selection

* Misc comment
This commit is contained in:
Dan Sosedoff 2022-02-10 20:14:42 -06:00 committed by GitHub
parent 5803295174
commit 4c096e8774
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 70 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
static/js/app.js
View File

@ -619,13 +619,77 @@ function hideQueryProgressMessage() {
$("#query_progress").hide();
}
function getEditorSelection() {
// Return the exact selection if user has one
var query = $.trim(editor.getSelectedText());
if (query.length > 0) {
return query;
}
query = editor.getValue();
// Determine which query we should run when there are multiple queries without a delimiter
if (query.indexOf(";") == -1) {
var subquery = getSubquery(query, editor.getCursorPosition());
if (subquery) {
// Highlight query selection so user knows what is being executed
if (subquery.numChunks > 1) {
editor.selection.setSelectionRange({
start: { row: subquery.startRow, column: 0 },
end: { row: subquery.endRow, column: 0 },
})
}
return subquery.text;
}
}
return query;
}
function getSubquery(text, cursor) {
var lines = text.split("\n");
var startRow = undefined;
var numChunks = 0;
var ranges = [];
for (i = 0; i < lines.length; i++) {
if (lines[i].trim().length == 0) {
if (startRow >= 0 && cursor.row >= startRow && cursor.row <= i) {
ranges.push([startRow, i]);
}
numChunks++;
startRow = undefined;
continue;
}
if (startRow === undefined) {
startRow = i;
}
if (i == lines.length - 1) {
ranges.push([startRow, i + 1]);
numChunks++;
}
}
if (ranges.length > 0) {
return {
text: lines.slice(ranges[0][0], ranges[0][1]).join("\n"),
startRow: ranges[0][0],
endRow: ranges[0][1],
numChunks: numChunks
};
}
}
function runQuery() {
setCurrentTab("table_query");
showQueryProgressMessage();
var query = $.trim(editor.getSelectedText() || editor.getValue());
var query = getEditorSelection();
if (query.length == 0) {
hideQueryProgressMessage();
return;
@ -652,11 +716,9 @@ function runQuery() {
function runExplain() {
setCurrentTab("table_query");
showQueryProgressMessage();
var query = $.trim(editor.getSelectedText() || editor.getValue());
var query = getEditorSelection();
if (query.length == 0) {
hideQueryProgressMessage();
return;
@ -674,11 +736,9 @@ function runExplain() {
function runAnalyze() {
setCurrentTab("table_query");
showQueryProgressMessage();
var query = $.trim(editor.getSelectedText() || editor.getValue());
var query = getEditorSelection();
if (query.length == 0) {
hideQueryProgressMessage();
return;
@ -695,8 +755,7 @@ function runAnalyze() {
}
function exportTo(format) {
var query = $.trim(editor.getSelectedText() || editor.getValue());
var query = getEditorSelection();
if (query.length == 0) {
return;
}