From 1ee8d9fd93f086631708b100dbf91b87e4653a4a Mon Sep 17 00:00:00 2001 From: azivner Date: Sun, 18 Nov 2018 08:29:56 +0100 Subject: [PATCH] sql console executes selected text if there's a selection instead of the whole content --- package-lock.json | 2 +- src/public/javascripts/dialogs/sql_console.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 47aefacc0..724ba7fd2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.23.1", + "version": "0.24.0-beta", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/public/javascripts/dialogs/sql_console.js b/src/public/javascripts/dialogs/sql_console.js index 0deccb4e6..917eda1e7 100644 --- a/src/public/javascripts/dialogs/sql_console.js +++ b/src/public/javascripts/dialogs/sql_console.js @@ -50,7 +50,12 @@ async function execute(e) { e.preventDefault(); e.stopPropagation(); - const sqlQuery = codeEditor.getValue(); + // execute the selected text or the whole content if there's no selection + let sqlQuery = codeEditor.getSelection(); + + if (!sqlQuery) { + sqlQuery = codeEditor.getValue(); + } const result = await server.post("sql/execute", { query: sqlQuery