ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2012-05-17 08:16:29 +02:00
parent 872516b8f9 eed31ad936
commit 443398b766
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/ob-sql.el
View File

@ -71,6 +71,11 @@ This function is called by `org-babel-execute-src-block'."
(org-babel-temp-file "sql-out-"))) (org-babel-temp-file "sql-out-")))
(header-delim "") (header-delim "")
(command (case (intern engine) (command (case (intern engine)
('dbi (format "dbish --batch '%s' < %s | sed '%s' > %s"
(or cmdline "")
(org-babel-process-file-name in-file)
"/^+/d;s/^\|//;$d"
(org-babel-process-file-name out-file)))
('monetdb (format "mclient -f tab %s < %s > %s" ('monetdb (format "mclient -f tab %s < %s > %s"
(or cmdline "") (or cmdline "")
(org-babel-process-file-name in-file) (org-babel-process-file-name in-file)
@ -90,7 +95,11 @@ This function is called by `org-babel-execute-src-block'."
(or cmdline ""))) (or cmdline "")))
(t (error "no support for the %s sql engine" engine))))) (t (error "no support for the %s sql engine" engine)))))
(with-temp-file in-file (with-temp-file in-file
(insert (org-babel-expand-body:sql body params))) (insert
(case (intern engine)
('dbi "/format partbox\n")
(t ""))
(org-babel-expand-body:sql body params)))
(message command) (message command)
(shell-command command) (shell-command command)
(if (or (member "scalar" result-params) (if (or (member "scalar" result-params)