diff options
| author | Sébastien Delafond <sdelafond@gmail.com> | 2015-11-27 17:40:16 +0100 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2015-11-27 17:40:16 +0100 |
| commit | 09600666ecbbebe86830a937658465d046e13d06 (patch) | |
| tree | f8140dfdec0fdfc11323d6c491f7680673bcc0de /lisp/ob-sql.el | |
| parent | 1be13d57dc8357576a8285c6dadc03db9e3ed7b0 (diff) | |
Imported Upstream version 8.3.2
Diffstat (limited to 'lisp/ob-sql.el')
| -rw-r--r-- | lisp/ob-sql.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el index c29b175..a039613 100644 --- a/lisp/ob-sql.el +++ b/lisp/ob-sql.el @@ -1,6 +1,6 @@ ;;; ob-sql.el --- org-babel functions for sql evaluation -;; Copyright (C) 2009-2014 Free Software Foundation, Inc. +;; Copyright (C) 2009-2015 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research @@ -119,7 +119,7 @@ This function is called by `org-babel-execute-src-block'." ('dbi (format "dbish --batch %s < %s | sed '%s' > %s" (or cmdline "") (org-babel-process-file-name in-file) - "/^+/d;s/^\|//;s/(NULL)/ /g;$d" + "/^+/d;s/^|//;s/(NULL)/ /g;$d" (org-babel-process-file-name out-file))) ('monetdb (format "mclient -f tab %s < %s > %s" (or cmdline "") @@ -202,7 +202,7 @@ This function is called by `org-babel-execute-src-block'." (lambda (pair) (setq body (replace-regexp-in-string - (format "\$%s" (car pair)) ;FIXME: "\$" == "$"! + (format "$%s" (car pair)) (let ((val (cdr pair))) (if (listp val) (let ((data-file (org-babel-temp-file "sql-data-"))) |