From 75ef766649eee156bb32b40a7dcf538c0d1275d5 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Mon, 13 May 2019 20:40:00 +0200
Subject: [PATCH 1/2] fix retrieving "many rows", closes #525

---
 package-lock.json   | 2 +-
 src/services/sql.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e0d150f90..74215005d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.31.4",
+  "version": "0.31.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/services/sql.js b/src/services/sql.js
index 27c121516..659b315d2 100644
--- a/src/services/sql.js
+++ b/src/services/sql.js
@@ -92,7 +92,7 @@ async function getManyRows(query, params) {
     let results = [];
 
     while (params.length > 0) {
-        const curParams = params.slice(0, Math.max(params.length, PARAM_LIMIT));
+        const curParams = params.slice(0, Math.min(params.length, PARAM_LIMIT));
         params = params.slice(curParams.length);
 
         let i = 1;

From 81d10fa605cb85f88554c7e5136d24e5fbe2263d Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Mon, 13 May 2019 21:13:04 +0200
Subject: [PATCH 2/2] fix focusing the text editor component after adding a
 link, closes #523

---
 src/public/javascripts/dialogs/add_link.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/public/javascripts/dialogs/add_link.js b/src/public/javascripts/dialogs/add_link.js
index cde8f5d18..7b547479f 100644
--- a/src/public/javascripts/dialogs/add_link.js
+++ b/src/public/javascripts/dialogs/add_link.js
@@ -94,15 +94,16 @@ $form.submit(() => {
             $dialog.modal('hide');
 
             const linkHref = '#' + notePath;
+            const editor = noteDetailText.getEditor();
 
             if (hasSelection()) {
-                const editor = noteDetailText.getEditor();
-
                 editor.execute('link', linkHref);
             }
             else {
                 linkService.addLinkToEditor(linkTitle, linkHref);
             }
+
+            editor.editing.view.focus();
         }
         else if (linkType === 'selected-to-active') {
             const prefix = $clonePrefix.val();
@@ -145,10 +146,6 @@ function linkTypeChanged() {
 
 $linkTypes.change(linkTypeChanged);
 
-// return back focus to note text detail after quitting add link
-// the problem is that cursor position is reset
-$dialog.on("hidden.bs.modal", () => noteDetailText.focus());
-
 export default {
     showDialog,
     showDialogForClone