1 files changed, 11 insertions, 13 deletions

diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 658a54f1d8a..d17dd8a7f9d 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -186,19 +186,17 @@ This function is called by `org-babel-execute-src-block'."
    (lambda (pair)
      (setq body
            (replace-regexp-in-string
-            (format "\$%s" (car pair))
-            ((lambda (val)
-               (if (listp val)
-                   ((lambda (data-file)
-                      (with-temp-file data-file
-                        (insert (orgtbl-to-csv
-                                 val '(:fmt (lambda (el) (if (stringp el)
-                                                             el
-                                                           (format "%S" el)))))))
-                      data-file)
-                    (org-babel-temp-file "sql-data-"))
-                 (if (stringp val) val (format "%S" val))))
-             (cdr pair))
+            (format "\$%s" (car pair))  ;FIXME: "\$" == "$"!
+            (let ((val (cdr pair)))
+              (if (listp val)
+                  (let ((data-file (org-babel-temp-file "sql-data-")))
+                    (with-temp-file data-file
+                      (insert (orgtbl-to-csv
+                               val '(:fmt (lambda (el) (if (stringp el)
+                                                      el
+                                                    (format "%S" el)))))))
+                    data-file)
+                (if (stringp val) val (format "%S" val))))
             body)))
    vars)
   body)