diff options
| author | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
| commit | cafdcef32d55cbb44389d7e322e7f973cbb72dfd (patch) | |
| tree | 7ee0c41ea8a589650ce6f4311fb10e61a63807b9 /lisp/org/ob-sql.el | |
| parent | a08a25d7aaf251aa18f2ef747be53734bc55cae9 (diff) | |
| parent | 4e05e67e4cd0bc1b0a4ef3176a4d0d91c6b3738e (diff) | |
| download | emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.tar.gz emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.zip | |
Merge from trunk
Diffstat (limited to 'lisp/org/ob-sql.el')
| -rw-r--r-- | lisp/org/ob-sql.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el index 3bd10d6b2bd..49859d24a17 100644 --- a/lisp/org/ob-sql.el +++ b/lisp/org/ob-sql.el | |||
| @@ -66,18 +66,18 @@ This function is called by `org-babel-execute-src-block'." | |||
| 66 | (out-file (or (cdr (assoc :out-file params)) | 66 | (out-file (or (cdr (assoc :out-file params)) |
| 67 | (org-babel-temp-file "sql-out-"))) | 67 | (org-babel-temp-file "sql-out-"))) |
| 68 | (command (case (intern engine) | 68 | (command (case (intern engine) |
| 69 | ('msosql (format "osql %s -s \"\t\" -i %s -o %s" | 69 | (msosql (format "osql %s -s \"\t\" -i %s -o %s" |
| 70 | (or cmdline "") | ||
| 71 | (org-babel-process-file-name in-file) | ||
| 72 | (org-babel-process-file-name out-file))) | ||
| 73 | ('mysql (format "mysql %s -e \"source %s\" > %s" | ||
| 74 | (or cmdline "") | 70 | (or cmdline "") |
| 75 | (org-babel-process-file-name in-file) | 71 | (org-babel-process-file-name in-file) |
| 76 | (org-babel-process-file-name out-file))) | 72 | (org-babel-process-file-name out-file))) |
| 77 | ('postgresql (format "psql -A -P footer=off -F \"\t\" -f %s -o %s %s" | 73 | (mysql (format "mysql %s -e \"source %s\" > %s" |
| 78 | (org-babel-process-file-name in-file) | 74 | (or cmdline "") |
| 79 | (org-babel-process-file-name out-file) | 75 | (org-babel-process-file-name in-file) |
| 80 | (or cmdline ""))) | 76 | (org-babel-process-file-name out-file))) |
| 77 | (postgresql (format "psql -A -P footer=off -F \"\t\" -f %s -o %s %s" | ||
| 78 | (org-babel-process-file-name in-file) | ||
| 79 | (org-babel-process-file-name out-file) | ||
| 80 | (or cmdline ""))) | ||
| 81 | (t (error "no support for the %s sql engine" engine))))) | 81 | (t (error "no support for the %s sql engine" engine))))) |
| 82 | (with-temp-file in-file | 82 | (with-temp-file in-file |
| 83 | (insert (org-babel-expand-body:sql body params))) | 83 | (insert (org-babel-expand-body:sql body params))) |