diff options
| author | Bastien Guerry <bzg@altern.org> | 2013-03-20 01:00:24 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2013-03-20 01:00:24 +0100 |
| commit | 855dcfbf2ab8870e2f5b75adfe719256c5c887ca (patch) | |
| tree | d59ef8706e4287553492c94afc66686a5f9dee8d | |
| parent | 9c1ea74c2b05f49bda6012a4e5c8451a86071303 (diff) | |
| parent | 78b3a0398124aff412606438b851f315078485e4 (diff) | |
| download | org-mode-855dcfbf2ab8870e2f5b75adfe719256c5c887ca.tar.gz | |
Merge branch 'master' of orgmode.org:org-mode
| -rw-r--r-- | lisp/ob-sql.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el index 20e62d0..264ed99 100644 --- a/lisp/ob-sql.el +++ b/lisp/ob-sql.el @@ -103,10 +103,10 @@ 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" + ('dbi (format "dbish --batch %s < %s | sed '%s' > %s" (or cmdline "") (org-babel-process-file-name in-file) - "/^+/d;s/^\|//;$d" + "/^+/d;s/^\|//;s/(NULL)/ /g;$d" (org-babel-process-file-name out-file))) ('monetdb (format "mclient -f tab %s < %s > %s" (or cmdline "") @@ -142,6 +142,7 @@ This function is called by `org-babel-execute-src-block'." (with-temp-buffer (cond ((or (eq (intern engine) 'mysql) + (eq (intern engine) 'dbi)) (eq (intern engine) 'postgresql)) ;; Add header row delimiter after column-names header in first line (cond |