Merge from emacs-23; up to 2010-06-16T23:27:20Z!jay.p.belanger@gmail.com.

[gnu-emacs] / lisp / org / ob-sql.el

diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 184c755f7b8ab9f1c5e860fd19ac4bb6fc5a1044..49859d24a172c66ea9ca15d219de67dda130ff9e 100644 (file)
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -1,11 +1,11 @@
 ;;; ob-sql.el --- org-babel functions for sql evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.01
+;; Version: 7.4
 
 ;; This file is part of GNU Emacs.
 
@@ -47,37 +47,73 @@
 (eval-when-compile (require 'cl))
 
 (declare-function org-table-import "org-table" (file arg))
+(declare-function orgtbl-to-csv "org-table" (TABLE PARAMS))
 
 (defvar org-babel-default-header-args:sql '())
 
-(defun org-babel-expand-body:sql (body params &optional processed-params)
-  "Expand BODY according to PARAMS, return the expanded body." body)
+(defun org-babel-expand-body:sql (body params)
+  "Expand BODY according to the values of PARAMS."
+  (org-babel-sql-expand-vars
+   body (mapcar #'cdr (org-babel-get-header params :var))))
 
 (defun org-babel-execute:sql (body params)
   "Execute a block of Sql code with Babel.
 This function is called by `org-babel-execute-src-block'."
-  (let* ((result-params (split-string (or (cdr (assoc :results params)) "")))
-        (processed-params (org-babel-process-params params))
+  (let* ((result-params (cdr (assoc :result-params params)))
          (cmdline (cdr (assoc :cmdline params)))
          (engine (cdr (assoc :engine params)))
-         (in-file (make-temp-file "org-babel-sql-in"))
+         (in-file (org-babel-temp-file "sql-in-"))
          (out-file (or (cdr (assoc :out-file params))
-                       (make-temp-file "org-babel-sql-out")))
+                       (org-babel-temp-file "sql-out-")))
          (command (case (intern engine)
-                    ('mysql (format "mysql %s -e \"source %s\" > %s"
-                                    (or cmdline "") in-file out-file))
+                    (msosql (format "osql %s -s \"\t\" -i %s -o %s"
+                                    (or cmdline "")
+                                    (org-babel-process-file-name in-file)
+                                    (org-babel-process-file-name out-file)))
+                    (mysql (format "mysql %s -e \"source %s\" > %s"
+                                   (or cmdline "")
+                                   (org-babel-process-file-name in-file)
+                                   (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)))))
     (with-temp-file in-file
       (insert (org-babel-expand-body:sql body params)))
     (message command)
     (shell-command command)
     (with-temp-buffer
-      (org-table-import out-file nil)
+      (org-table-import out-file '(16))
       (org-babel-reassemble-table
        (org-table-to-lisp)
-       (org-babel-pick-name (nth 4 processed-params) (cdr (assoc :colnames params)))
-       (org-babel-pick-name (nth 5 processed-params) (cdr (assoc :rownames params)))))))
-
+       (org-babel-pick-name (cdr (assoc :colname-names params))
+                           (cdr (assoc :colnames params)))
+       (org-babel-pick-name (cdr (assoc :rowname-names params))
+                           (cdr (assoc :rownames params)))))))
+
+(defun org-babel-sql-expand-vars (body vars)
+  "Expand the variables held in VARS in BODY."
+  (mapc
+   (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))
+           body)))
+   vars)
+  body)
 
 (defun org-babel-prep-session:sql (session params)
   "Raise an error because Sql sessions aren't implemented."
@@ -85,6 +121,5 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-sql)
 
-;; arch-tag: a43ff944-6de1-4566-a83c-626814e3dad2
 
 ;;; ob-sql.el ends here