emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Nick Savage <nick@nicksavage.ca>
To: emacs-orgmode@gnu.org
Subject: [PATCH] Fix truncated output in ob-sqlite.el (Was: Bug: sqlite output truncated?)
Date: Tue, 4 May 2021 16:42:06 -0400	[thread overview]
Message-ID: <3cf8beb3-bd45-ddc8-780a-79b32fc413eb@nicksavage.ca> (raw)
In-Reply-To: <CAK5xwica4i8h09ObzCVPx2pe-T6B0_ju_MXiduRiY7GH+PkE_A@mail.gmail.com>

[-- Attachment #1.1: Type: text/plain, Size: 1206 bytes --]

I've attached a patch to address this.

The issue is that ob-sqlite.el uses org-babel-string-read, which 
purposefully removes double-quotes. I think this is unintended 
behaviour, and it only seems to be used with ob-sqlite.el. I added a 
minor function to bypass the part of org-babel-string-read that was 
stripping out the double-quotes and use the rest of the function.

I tried ob-sql with the mysql engine and didn't experience the same bug, 
so I'm pretty confident that this is an isolated issue.

On 5/3/21 6:22 PM, learn orchids wrote:
> I am using Org mode version 9.4.5 (9.4.5-73-g4c7696-elpaplus and I have the following code snippet. Values in the 'sql' column of the second row is truncated. Am I missing something?
> #+begin_src sqlite :db /tmp/rip.db  :colnames yes
>    drop table if exists testtable;
>    create table testtable(id int, sql varchar);
>    insert into testtable values (1, "Select id from foo");
>    insert into testtable values (2, 'Select "id" from foo');
>    select* from testtable;
> #+end_src
> #+RESULTS: testsql
> | id | sql                |
> |----+--------------------|
> |  1 | Select id from foo |
> |  2 | id                 |

[-- Attachment #1.2: Type: text/html, Size: 2070 bytes --]

[-- Attachment #2: 0001-lisp-ob-sqlite.el-Prevent-output-from-being-incorrec.patch --]
[-- Type: text/x-patch, Size: 1576 bytes --]

From 3dd868bcd798e6763ec67ba0d2661834e09bb6e9 Mon Sep 17 00:00:00 2001
From: Nicholas Savage <nick@nicksavage.ca>
Date: Tue, 4 May 2021 11:02:20 -0400
Subject: [PATCH] lisp/ob-sqlite.el: Prevent output from being incorrectly
 parsed if it contains double-quotes.

* lisp/ob-sqlite.el (org-babel-sqlite--read-cell): New function.
lisp/ob-sqlite.el (org-babel-sqlite-table-or-scalar): Use
`org-babel-sqlite--read-cell' instead of `org-babel-string-read' to
prevent data from being ignored if it contains double-quotes.

Reported-by: learnorchids@gmail.com
Link: https://orgmode.org/list/CAK5xwica4i8h09ObzCVPx2pe-T6B0_ju_MXiduRiY7GH+PkE_A@mail.gmail.com/
 lisp/ob-sqlite.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el
index c0c6f3c97..d227ba69d 100644
--- a/lisp/ob-sqlite.el
+++ b/lisp/ob-sqlite.el
@@ -125,7 +125,7 @@ This function is called by `org-babel-execute-src-block'."
     (mapcar (lambda (row)
 	      (if (eq 'hline row)
-		(mapcar #'org-babel-string-read row)))
+		(mapcar #'org-babel-sqlite--read-cell row)))
 (defun org-babel-sqlite-offset-colnames (table headers-p)
@@ -139,6 +139,10 @@ This function is called by `org-babel-execute-src-block'."
 Prepare SESSION according to the header arguments specified in PARAMS."
   (error "SQLite sessions not yet implemented"))
+(defun org-babel-sqlite--read-cell (cell)
+  "Process CELL to remove unnecessary characters."
+  (org-babel-read cell t))
 (provide 'ob-sqlite)
 ;;; ob-sqlite.el ends here

  parent reply	other threads:[~2021-05-04 20:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-03 22:22 Bug: sqlite output truncated? learn orchids
2021-05-03 23:32 ` Nick Savage
2021-05-04 20:42 ` Nick Savage [this message]
2021-05-04 20:44   ` [PATCH] Fix truncated output in ob-sqlite.el Bastien

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3cf8beb3-bd45-ddc8-780a-79b32fc413eb@nicksavage.ca \
    --to=nick@nicksavage.ca \
    --cc=emacs-orgmode@gnu.org \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).