Merge Org version 8.2.3a.

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

diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index c25e786fb61e42a7099ec151e100e6bb6f6d94ec..84d4688ab38a6c063e3b5313431e8b5cf7d746a4 100644 (file)
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -27,8 +27,6 @@
 
 ;;; Code:
 (require 'ob)
-(require 'ob-eval)
-(require 'ob-ref)
 
 (declare-function org-fill-template "org" (template alist))
 (declare-function org-table-convert-region "org-table"
@@ -98,23 +96,21 @@ This function is called by `org-babel-execute-src-block'."
          (cons "db " db)))
        ;; body of the code block
        (org-babel-expand-body:sqlite body params)))
-      (if (or (member "scalar" result-params)
-             (member "verbatim" result-params)
-             (member "html" result-params)
-             (member "code" result-params)
-             (equal (point-min) (point-max)))
-         (buffer-string)
-       (org-table-convert-region (point-min) (point-max)
-                                 (if (or (member :csv others)
-                                         (member :column others)
-                                         (member :line others)
-                                         (member :list others)
-                                         (member :html others) separator)
-                                     nil
-                                   '(4)))
-       (org-babel-sqlite-table-or-scalar
-        (org-babel-sqlite-offset-colnames
-         (org-table-to-lisp) headers-p))))))
+      (org-babel-result-cond result-params
+       (buffer-string)
+       (if (equal (point-min) (point-max))
+           ""
+         (org-table-convert-region (point-min) (point-max)
+                                   (if (or (member :csv others)
+                                           (member :column others)
+                                           (member :line others)
+                                           (member :list others)
+                                           (member :html others) separator)
+                                       nil
+                                     '(4)))
+         (org-babel-sqlite-table-or-scalar
+          (org-babel-sqlite-offset-colnames
+           (org-table-to-lisp) headers-p)))))))
 
 (defun org-babel-sqlite-expand-vars (body vars)
   "Expand the variables held in VARS in BODY."
@@ -147,7 +143,7 @@ This function is called by `org-babel-execute-src-block'."
     (mapcar (lambda (row)
              (if (equal 'hline row)
                  'hline
-               (mapcar #'org-babel-read row))) result)))
+               (mapcar #'org-babel-string-read row))) result)))
 
 (defun org-babel-sqlite-offset-colnames (table headers-p)
   "If HEADERS-P is non-nil then offset the first row as column names."