
* lisp/org/ob-abc.el (org-babel-expand-body:abc): Use dolist. (org-babel-execute:abc): Fix regexp quoting. * lisp/org/ob-calc.el (org--var-syms): Rename from `var-syms'. * lisp/org/ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding. * lisp/org/ob-table.el (sbe): Move debug declaration. * lisp/org/org-clock.el (org--msg-extra): Rename from `msg-extra'. * lisp/org/org.el (org-version): Avoid var name starting with _. (org-inhibit-startup, org-called-with-limited-levels) (org-link-search-inhibit-query, org-time-was-given) (org-end-time-was-given, org-def, org-defdecode, org-with-time): * lisp/org/org-colview.el (org-agenda-overriding-columns-format): * lisp/org/org-agenda.el (org-agenda-multi, org-depend-tag-blocked) (org-agenda-show-log-scoped): * lisp/org/ob-python.el (py-which-bufname, python-shell-buffer-name): * lisp/org/ob-haskell.el (org-export-copy-to-kill-ring): * lisp/org/ob-exp.el (org-link-search-inhibit-query): * lisp/org/ob-R.el (ess-eval-visibly-p): * lisp/org/ob-core.el (org-src-window-setup): Declare before use. (org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'. * lisp/org/ox-odt.el (org-odt-hfy-face-to-css): * lisp/org/org-src.el (org-src-associate-babel-session, org-src-get-lang-mode): * lisp/org/org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex) (org-bibtex-check): * lisp/org/ob-tangle.el (org-babel-tangle, org-babel-spec-to-string) (org-babel-tangle-single-block, org-babel-tangle-comment-links): * ob-table.el (sbe): * lisp/org/ob-sqlite.el (org-babel-sqlite-expand-vars): * lisp/org/ob-sql.el (org-babel-sql-expand-vars): * lisp/org/ob-shen.el (org-babel-execute:shen): * lisp/org/ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate): * lisp/org/ob-scala.el (org-babel-scala-evaluate): * lisp/org/ob-ruby.el (org-babel-ruby-table-or-string) (org-babel-ruby-evaluate): * ob-python.el (org-babel-python-table-or-string) (org-babel-python-evaluate-external-process) (org-babel-python-evaluate-session): * lisp/org/ob-picolisp.el (org-babel-execute:picolisp): * lisp/org/ob-perl.el (org-babel-perl-evaluate): * lisp/org/ob-maxima.el (org-babel-execute:maxima): * lisp/org/ob-lisp.el (org-babel-execute:lisp): * lisp/org/ob-java.el (org-babel-execute:java): * lisp/org/ob-io.el (org-babel-io-evaluate): * ob-haskell.el (org-babel-execute:haskell): * lisp/org/ob-fortran.el (org-babel-execute:fortran): * ob-exp.el (org-babel-exp-code): * lisp/org/ob-emacs-lisp.el (org-babel-execute:emacs-lisp): * lisp/org/ob-ditaa.el (org-babel-execute:ditaa): * ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash) (org-babel-parse-header-arguments, org-babel-reassemble-table) (org-babel-goto-src-block-head, org-babel-mark-block) (org-babel-expand-noweb-references, org-babel-script-escape) (org-babel-process-file-name): * lisp/org/ob-clojure.el (org-babel-execute:clojure): * ob-calc.el (org-babel-execute:calc): * lisp/org/ob-awk.el (org-babel-execute:awk): * ob-abc.el (org-babel-execute:abc): * ob-R.el (org-babel-expand-body:R): * lisp/org/ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
162 lines
5.4 KiB
EmacsLisp
162 lines
5.4 KiB
EmacsLisp
;;; ob-sqlite.el --- org-babel functions for sqlite database interaction
|
|
|
|
;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric Schulte
|
|
;; Keywords: literate programming, reproducible research
|
|
;; Homepage: http://orgmode.org
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Org-Babel support for evaluating sqlite source code.
|
|
|
|
;;; Code:
|
|
(require 'ob)
|
|
|
|
(declare-function org-fill-template "org" (template alist))
|
|
(declare-function org-table-convert-region "org-table"
|
|
(beg0 end0 &optional separator))
|
|
(declare-function orgtbl-to-csv "org-table" (table params))
|
|
(declare-function org-table-to-lisp "org-table" (&optional txt))
|
|
|
|
(defvar org-babel-default-header-args:sqlite '())
|
|
|
|
(defvar org-babel-header-args:sqlite
|
|
'((db . :any)
|
|
(header . :any)
|
|
(echo . :any)
|
|
(bail . :any)
|
|
(csv . :any)
|
|
(column . :any)
|
|
(html . :any)
|
|
(line . :any)
|
|
(list . :any)
|
|
(separator . :any)
|
|
(nullvalue . :any))
|
|
"Sqlite specific header args.")
|
|
|
|
(defun org-babel-expand-body:sqlite (body params)
|
|
"Expand BODY according to the values of PARAMS."
|
|
(org-babel-sqlite-expand-vars
|
|
body (mapcar #'cdr (org-babel-get-header params :var))))
|
|
|
|
(defvar org-babel-sqlite3-command "sqlite3")
|
|
|
|
(defun org-babel-execute:sqlite (body params)
|
|
"Execute a block of Sqlite code with Babel.
|
|
This function is called by `org-babel-execute-src-block'."
|
|
(let ((result-params (split-string (or (cdr (assoc :results params)) "")))
|
|
(db (cdr (assoc :db params)))
|
|
(separator (cdr (assoc :separator params)))
|
|
(nullvalue (cdr (assoc :nullvalue params)))
|
|
(headers-p (equal "yes" (cdr (assoc :colnames params))))
|
|
(others (delq nil (mapcar
|
|
(lambda (arg) (car (assoc arg params)))
|
|
(list :header :echo :bail :column
|
|
:csv :html :line :list))))
|
|
exit-code)
|
|
(unless db (error "ob-sqlite: can't evaluate without a database"))
|
|
(with-temp-buffer
|
|
(insert
|
|
(org-babel-eval
|
|
(org-fill-template
|
|
"%cmd %header %separator %nullvalue %others %csv %db "
|
|
(list
|
|
(cons "cmd" org-babel-sqlite3-command)
|
|
(cons "header" (if headers-p "-header" "-noheader"))
|
|
(cons "separator"
|
|
(if separator (format "-separator %s" separator) ""))
|
|
(cons "nullvalue"
|
|
(if nullvalue (format "-nullvalue %s" nullvalue) ""))
|
|
(cons "others"
|
|
(mapconcat
|
|
(lambda (arg) (format "-%s" (substring (symbol-name arg) 1)))
|
|
others " "))
|
|
;; for easy table parsing, default header type should be -csv
|
|
(cons "csv" (if (or (member :csv others) (member :column others)
|
|
(member :line others) (member :list others)
|
|
(member :html others) separator)
|
|
""
|
|
"-csv"))
|
|
(cons "db " db)))
|
|
;; body of the code block
|
|
(org-babel-expand-body:sqlite body params)))
|
|
(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."
|
|
;; FIXME: Redundancy with org-babel-sql-expand-vars!
|
|
(mapc
|
|
(lambda (pair)
|
|
(setq body
|
|
(replace-regexp-in-string
|
|
(format "\$%s" (car pair)) ;FIXME: "\$" == "$"!
|
|
(let ((val (cdr pair)))
|
|
(if (listp val)
|
|
(let ((data-file (org-babel-temp-file "sqlite-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)
|
|
|
|
(defun org-babel-sqlite-table-or-scalar (result)
|
|
"If RESULT looks like a trivial table, then unwrap it."
|
|
(if (and (equal 1 (length result))
|
|
(equal 1 (length (car result))))
|
|
(org-babel-read (caar result))
|
|
(mapcar (lambda (row)
|
|
(if (equal 'hline row)
|
|
'hline
|
|
(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."
|
|
(if headers-p
|
|
(cons (car table) (cons 'hline (cdr table)))
|
|
table))
|
|
|
|
(defun org-babel-prep-session:sqlite (session params)
|
|
"Raise an error because support for SQLite sessions isn't implemented.
|
|
Prepare SESSION according to the header arguments specified in PARAMS."
|
|
(error "SQLite sessions not yet implemented"))
|
|
|
|
(provide 'ob-sqlite)
|
|
|
|
|
|
|
|
;;; ob-sqlite.el ends here
|