* [PATCH] Enable table with fields containing commas to be used as arguments to sqlite source blocks, fix ox-taskjuggler broken call.
@ 2017-09-01 17:04 Eduardo Bellani
2017-09-01 21:01 ` Nicolas Goaziou
0 siblings, 1 reply; 2+ messages in thread
From: Eduardo Bellani @ 2017-09-01 17:04 UTC (permalink / raw)
To: org mode
[-- Attachment #1: Type: text/plain, Size: 5108 bytes --]
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 <ebellani@gmail.com>
+;; 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 <http://www.gnu.org/licenses/>.
+
+;;; 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 180 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Enable table with fields containing commas to be used as arguments to sqlite source blocks, fix ox-taskjuggler broken call.
2017-09-01 17:04 [PATCH] Enable table with fields containing commas to be used as arguments to sqlite source blocks, fix ox-taskjuggler broken call Eduardo Bellani
@ 2017-09-01 21:01 ` Nicolas Goaziou
0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Goaziou @ 2017-09-01 21:01 UTC (permalink / raw)
To: Eduardo Bellani; +Cc: org mode
Hello,
Eduardo Bellani <ebellani@gmail.com> writes:
> ob-sqlite.el: Enable table with fields containing commas to be used as
> arguments to sqlite source blocks
Thank you!
Could you split this into 2 patches since "ob-sqlite" and
"ox-taskjuggler" are unrelated.
> * testing/examples/ob-sqlite-test.org: Adds an example to be used in
> the sqlite test above.
I suggest to write a self-contained test. IOW, prefer
`org-test-with-temp-text' instead of `org-test-at-id'. This is much
easier to debug when something breaks.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-01 21:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-01 17:04 [PATCH] Enable table with fields containing commas to be used as arguments to sqlite source blocks, fix ox-taskjuggler broken call Eduardo Bellani
2017-09-01 21:01 ` Nicolas Goaziou
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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).