diff options
| author | Bastien Guerry <bzg@gnu.org> | 2012-09-30 17:14:59 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2012-09-30 17:14:59 +0200 |
| commit | 8223b1d23361b74ede10bac47974ce7803804380 (patch) | |
| tree | 3a2491c5193fed1bef14acd45092c0b9736fa5d6 /lisp/org/ob-sql.el | |
| parent | 163227893c97b5b41039ea9d5ceadb7e5b2d570c (diff) | |
| download | emacs-8223b1d23361b74ede10bac47974ce7803804380.tar.gz emacs-8223b1d23361b74ede10bac47974ce7803804380.tar.bz2 emacs-8223b1d23361b74ede10bac47974ce7803804380.zip | |
Sync Org 7.9.2 from the commit tagged "release_7.9.2" in Org's Git repo.
Diffstat (limited to 'lisp/org/ob-sql.el')
| -rw-r--r-- | lisp/org/ob-sql.el | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el index 68bd95af9f9..ad7b1e29a93 100644 --- a/lisp/org/ob-sql.el +++ b/lisp/org/ob-sql.el @@ -51,8 +51,9 @@ (defvar org-babel-default-header-args:sql '()) -(defvar org-babel-header-arg-names:sql - '(engine out-file)) +(defvar org-babel-header-args:sql + '((engine . :any) + (out-file . :any))) (defun org-babel-expand-body:sql (body params) "Expand BODY according to the values of PARAMS." @@ -70,6 +71,15 @@ This function is called by `org-babel-execute-src-block'." (org-babel-temp-file "sql-out-"))) (header-delim "") (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" + (or cmdline "") + (org-babel-process-file-name in-file) + (org-babel-process-file-name out-file))) ('msosql (format "osql %s -s \"\t\" -i %s -o %s" (or cmdline "") (org-babel-process-file-name in-file) @@ -80,12 +90,16 @@ This function is called by `org-babel-execute-src-block'." (org-babel-process-file-name out-file))) ('postgresql (format "psql -A -P footer=off -F \"\t\" -f %s -o %s %s" - (org-babel-process-file-name in-file) - (org-babel-process-file-name out-file) - (or cmdline ""))) - (t (error "no support for the %s sql engine" engine))))) + (org-babel-process-file-name in-file) + (org-babel-process-file-name out-file) + (or cmdline ""))) + (t (error "No support for the %s SQL engine" engine))))) (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) (shell-command command) (if (or (member "scalar" result-params) @@ -134,8 +148,8 @@ This function is called by `org-babel-execute-src-block'." (with-temp-file data-file (insert (orgtbl-to-csv val '(:fmt (lambda (el) (if (stringp el) - el - (format "%S" el))))))) + el + (format "%S" el))))))) data-file) (org-babel-temp-file "sql-data-")) (if (stringp val) val (format "%S" val)))) @@ -146,7 +160,7 @@ This function is called by `org-babel-execute-src-block'." (defun org-babel-prep-session:sql (session params) "Raise an error because Sql sessions aren't implemented." - (error "sql sessions not yet implemented")) + (error "SQL sessions not yet implemented")) (provide 'ob-sql) |