Fix typos.

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

diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 9cab52caa31a18f1e4579bf4bdd3516c0185e918..7a5c7c8a46a383e15211eb59b685056dd83d88c2 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, 2011  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.4
+;; Version: 7.7
 
 ;; This file is part of GNU Emacs.
 
@@ -32,7 +32,7 @@
 ;;
 ;; Also SQL evaluation generally takes place inside of a database.
 ;;
-;; For now lets just allow a generic ':cmdline' header argument.
+;; For now let's just allow a generic ':cmdline' header argument.
 ;;
 ;; TODO:
 ;;
@@ -40,7 +40,7 @@
 ;; - add more useful header arguments (user, passwd, database, etc...)
 ;; - support for more engines (currently only supports mysql)
 ;; - what's a reasonable way to drop table data into SQL?
-;; 
+;;
 
 ;;; Code:
 (require 'ob)
@@ -65,16 +65,18 @@ This function is called by `org-babel-execute-src-block'."
          (in-file (org-babel-temp-file "sql-in-"))
          (out-file (or (cdr (assoc :out-file params))
                        (org-babel-temp-file "sql-out-")))
+        (header-delim "")
          (command (case (intern engine)
                     ('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"
+                    ('mysql (format "mysql %s < %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"
+                   ('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 "")))
@@ -84,9 +86,26 @@ This function is called by `org-babel-execute-src-block'."
     (message command)
     (shell-command command)
     (with-temp-buffer
+      ;; need to figure out what the delimiter is for the header row
+      (with-temp-buffer
+        (insert-file-contents out-file)
+        (goto-char (point-min))
+        (when (re-search-forward "^\\(-+\\)[^-]" nil t)
+          (setq header-delim (match-string-no-properties 1)))
+        (goto-char (point-max))
+        (forward-char -1)
+        (while (looking-at "\n")
+          (delete-char 1)
+          (goto-char (point-max))
+          (forward-char -1))
+        (write-file out-file))
       (org-table-import out-file '(16))
       (org-babel-reassemble-table
-       (org-table-to-lisp)
+       (mapcar (lambda (x)
+                 (if (string= (car x) header-delim)
+                     'hline
+                   x))
+               (org-table-to-lisp))
        (org-babel-pick-name (cdr (assoc :colname-names params))
                            (cdr (assoc :colnames params)))
        (org-babel-pick-name (cdr (assoc :rowname-names params))
@@ -121,6 +140,6 @@ 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