From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduardo Bellani Subject: [PATCH] Enable table with fields containing commas to be used as arguments to sqlite source blocks, fix ox-taskjuggler broken call. Date: Fri, 01 Sep 2017 14:04:07 -0300 Message-ID: <87wp5imjug.fsf@brickabode.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnpOy-0006EI-Ud for emacs-orgmode@gnu.org; Fri, 01 Sep 2017 13:08:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnpMm-0003eg-2u for emacs-orgmode@gnu.org; Fri, 01 Sep 2017 13:06:40 -0400 Received: from mail-qt0-x22c.google.com ([2607:f8b0:400d:c0d::22c]:34112) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dnpMl-0003dY-M1 for emacs-orgmode@gnu.org; Fri, 01 Sep 2017 13:04:23 -0400 Received: by mail-qt0-x22c.google.com with SMTP id u11so3685110qtu.1 for ; Fri, 01 Sep 2017 10:04:22 -0700 (PDT) Received: from personal ([187.112.69.145]) by smtp.gmail.com with ESMTPSA id e126sm7194049qkd.80.2017.09.01.10.04.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Sep 2017 10:04:18 -0700 (PDT) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: org mode --=-=-= Content-Type: text/plain ob-sqlite.el: Enable table with fields containing commas to be used as arguments to sqlite source blocks * lisp/ob-sqlite.el: Stop interfering with the 'orgtbl-to-csv' default formatting. * testing/lisp/test-ob-sqlite.el:: Adds a test using a table with commas in the content of any of its fields as an argument for a sqlite source block. * testing/examples/ob-sqlite-test.org: Adds an example to be used in the sqlite test above. * contrib/lisp/ox-taskjuggler.el (org-taskjuggler--build-task): Fix a call to a non existing function. The problem here was that ob-sqlite was providing a format to the 'orgtbl-to-csv' that actually overwrote the default format in that function, and in the case where there were commas in the content of the table, broke the table as argument mechanism. The case with ox-taskjuggler was simpler, it was only a reference to an outdated function. TINYCHANGE --- contrib/lisp/ox-taskjuggler.el | 2 +- lisp/ob-sqlite.el | 5 +---- testing/examples/ob-sqlite-test.org | 20 ++++++++++++++++++++ testing/lisp/test-ob-sqlite.el | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 testing/examples/ob-sqlite-test.org create mode 100644 testing/lisp/test-ob-sqlite.el diff --git a/contrib/lisp/ox-taskjuggler.el b/contrib/lisp/ox-taskjuggler.el index 2144b04..aee7ae9 100644 --- a/contrib/lisp/ox-taskjuggler.el +++ b/contrib/lisp/ox-taskjuggler.el @@ -861,7 +861,7 @@ a unique id will be associated to it." (and complete (format " complete %s\n" complete)) (and effort (format " effort %s\n" - (let* ((minutes (org-duration-minutes effort)) + (let* ((minutes (org-duration-to-minutes effort)) (hours (/ minutes 60.0))) (format "%.1fh" hours)))) (and priority (format " priority %s\n" priority)) diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el index 8094019..f381f43 100644 --- a/lisp/ob-sqlite.el +++ b/lisp/ob-sqlite.el @@ -123,10 +123,7 @@ This function is called by `org-babel-execute-src-block'." (if (listp val) (let ((data-file (org-babel-temp-file "sqlite-data-"))) (with-temp-file data-file - (insert (orgtbl-to-csv - val '(:fmt (lambda (el) (if (stringp el) - el - (format "%S" el))))))) + (insert (orgtbl-to-csv val nil))) data-file) (if (stringp val) val (format "%S" val)))) body))) diff --git a/testing/examples/ob-sqlite-test.org b/testing/examples/ob-sqlite-test.org new file mode 100644 index 0000000..0965b8e --- /dev/null +++ b/testing/examples/ob-sqlite-test.org @@ -0,0 +1,20 @@ +#+Title: a collection of examples for ob-sqlite tests +#+OPTIONS: ^:nil +* Simple tests + :PROPERTIES: + :ID: baa7fb30-28ec-4ac4-abef-0ad47b093332 + :END: + +#+name: test_table1 +| "Mr Test A. Sql" | Minister for Science, Eternal Happiness, and Finance | + +#+begin_src sqlite :db /tmp/test.db :var tb=test_table1 + drop table if exists TestTable; + create table TestTable(person, job); + .mode csv TestTable + .import $tb TestTable + select * from TestTable; +#+end_src + +#+RESULTS: +| Mr Test A. Sql | Minister for Science, Eternal Happiness, and Finance | diff --git a/testing/lisp/test-ob-sqlite.el b/testing/lisp/test-ob-sqlite.el new file mode 100644 index 0000000..4970391 --- /dev/null +++ b/testing/lisp/test-ob-sqlite.el @@ -0,0 +1,34 @@ +;;; test-ob-sqlite.el --- tests for ob-sqlite.el + +;; Copyright (C) 2017 Eduardo Bellani + +;; Author: Eduardo Bellani +;; Keywords: lisp + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Code: +(org-test-for-executable "sqlite") +(unless (featurep 'ob-sqlite) + (signal 'missing-test-dependency "Support for sqlite code blocks")) + +(ert-deftest ob-sqlite/table-variables-with-commas () + "Test of a table variable that contains commas. This garantees that this code path results in a valid CSV." + (org-test-at-id "baa7fb30-28ec-4ac4-abef-0ad47b093332" + (org-babel-next-src-block 1) + (should (equal '(("Mr Test A. Sql" + "Minister for Science, Eternal Happiness, and Finance")) + (org-babel-execute-src-block))))) + +;;; test-ob-sqlite.el ends here -- 2.1.4 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlmpkwcACgkQSbLl0kCTjGkR5ACfUj7tpMD2PCylzPAUzbBOzctC TCUAmgJXv7EUJo8VUoNHfxwSniQkqs2L =rodE -----END PGP SIGNATURE----- --=-=-=--