2015-10-26 15:58:34 +00:00
|
|
|
;;; ob-sql.el --- Babel Functions for SQL -*- lexical-binding: t; -*-
|
2009-08-01 20:00:37 +00:00
|
|
|
|
2021-01-01 19:55:31 +00:00
|
|
|
;; Copyright (C) 2009-2021 Free Software Foundation, Inc.
|
2009-08-01 20:00:37 +00:00
|
|
|
|
|
|
|
;; Author: Eric Schulte
|
|
|
|
;; Keywords: literate programming, reproducible research
|
2018-01-16 16:22:00 +00:00
|
|
|
;; Homepage: https://orgmode.org
|
2009-08-01 20:00:37 +00:00
|
|
|
|
2010-06-25 16:32:35 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
2009-08-01 20:00:37 +00:00
|
|
|
|
2010-06-25 16:32:35 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2009-08-01 20:00:37 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2010-06-25 16:32:35 +00:00
|
|
|
;; 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,
|
2009-08-01 20:00:37 +00:00
|
|
|
;; 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.
|
2010-06-25 16:32:35 +00:00
|
|
|
|
2009-08-01 20:00:37 +00:00
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2009-08-01 20:00:37 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; Org-Babel support for evaluating sql source code.
|
2012-02-18 16:26:02 +00:00
|
|
|
;; (see also ob-sqlite.el)
|
2009-08-01 20:00:37 +00:00
|
|
|
;;
|
|
|
|
;; SQL is somewhat unique in that there are many different engines for
|
|
|
|
;; the evaluation of sql (Mysql, PostgreSQL, etc...), so much of this
|
|
|
|
;; file will have to be implemented engine by engine.
|
|
|
|
;;
|
|
|
|
;; Also SQL evaluation generally takes place inside of a database.
|
2009-08-02 01:05:18 +00:00
|
|
|
;;
|
2013-02-05 15:50:50 +00:00
|
|
|
;; Header args used:
|
|
|
|
;; - engine
|
|
|
|
;; - cmdline
|
|
|
|
;; - dbhost
|
2015-04-06 20:13:06 +00:00
|
|
|
;; - dbport
|
2013-02-05 15:50:50 +00:00
|
|
|
;; - dbuser
|
|
|
|
;; - dbpassword
|
2019-03-24 10:35:21 +00:00
|
|
|
;; - dbconnection (to reference connections in sql-connection-alist)
|
2013-02-05 15:50:50 +00:00
|
|
|
;; - database
|
|
|
|
;; - colnames (default, nil, means "yes")
|
|
|
|
;; - result-params
|
|
|
|
;; - out-file
|
2016-12-05 21:45:25 +00:00
|
|
|
;;
|
2013-02-05 15:50:50 +00:00
|
|
|
;; The following are used but not really implemented for SQL:
|
|
|
|
;; - colname-names
|
|
|
|
;; - rownames
|
|
|
|
;; - rowname-names
|
2009-08-02 01:05:18 +00:00
|
|
|
;;
|
2016-12-05 21:45:25 +00:00
|
|
|
;; Engines supported:
|
|
|
|
;; - mysql
|
|
|
|
;; - dbi
|
|
|
|
;; - mssql
|
|
|
|
;; - sqsh
|
2020-02-12 08:03:44 +00:00
|
|
|
;; - postgresql (postgres)
|
2016-12-05 21:45:25 +00:00
|
|
|
;; - oracle
|
2017-04-06 06:46:04 +00:00
|
|
|
;; - vertica
|
2016-12-05 21:45:25 +00:00
|
|
|
;;
|
2009-08-02 01:05:18 +00:00
|
|
|
;; TODO:
|
|
|
|
;;
|
|
|
|
;; - support for sessions
|
2016-12-05 21:45:25 +00:00
|
|
|
;; - support for more engines
|
2009-08-02 01:05:18 +00:00
|
|
|
;; - what's a reasonable way to drop table data into SQL?
|
2012-03-19 20:38:12 +00:00
|
|
|
;;
|
2009-08-01 20:00:37 +00:00
|
|
|
|
|
|
|
;;; Code:
|
2010-06-11 23:02:42 +00:00
|
|
|
(require 'ob)
|
2010-07-03 02:21:31 +00:00
|
|
|
|
|
|
|
(declare-function org-table-import "org-table" (file arg))
|
2012-10-02 09:19:29 +00:00
|
|
|
(declare-function orgtbl-to-csv "org-table" (table params))
|
|
|
|
(declare-function org-table-to-lisp "org-table" (&optional txt))
|
2016-06-08 05:49:54 +00:00
|
|
|
(declare-function cygwin-convert-file-name-to-windows "cygw32.c" (file &optional absolute-p))
|
2020-02-12 21:23:27 +00:00
|
|
|
(declare-function sql-set-product "sql" (product))
|
2009-08-01 20:00:37 +00:00
|
|
|
|
2019-04-16 19:53:15 +00:00
|
|
|
(defvar sql-connection-alist)
|
2010-06-25 17:12:54 +00:00
|
|
|
(defvar org-babel-default-header-args:sql '())
|
|
|
|
|
2013-02-05 15:50:50 +00:00
|
|
|
(defconst org-babel-header-args:sql
|
|
|
|
'((engine . :any)
|
|
|
|
(out-file . :any)
|
|
|
|
(dbhost . :any)
|
2015-04-06 20:13:06 +00:00
|
|
|
(dbport . :any)
|
2013-02-05 15:50:50 +00:00
|
|
|
(dbuser . :any)
|
|
|
|
(dbpassword . :any)
|
|
|
|
(database . :any))
|
|
|
|
"SQL-specific header arguments.")
|
2011-10-26 12:19:54 +00:00
|
|
|
|
2010-12-01 02:32:01 +00:00
|
|
|
(defun org-babel-expand-body:sql (body params)
|
|
|
|
"Expand BODY according to the values of PARAMS."
|
|
|
|
(org-babel-sql-expand-vars
|
2015-10-29 19:26:11 +00:00
|
|
|
body (org-babel--get-vars params)))
|
2010-12-01 02:32:01 +00:00
|
|
|
|
2020-02-12 08:03:44 +00:00
|
|
|
(defun org-babel-edit-prep:sql (info)
|
|
|
|
"Set `sql-product' in Org edit buffer.
|
|
|
|
Set `sql-product' in Org edit buffer according to the
|
|
|
|
corresponding :engine source block header argument."
|
|
|
|
(let ((product (cdr (assq :engine (nth 2 info)))))
|
|
|
|
(sql-set-product product)))
|
|
|
|
|
2015-04-06 20:13:06 +00:00
|
|
|
(defun org-babel-sql-dbstring-mysql (host port user password database)
|
2013-02-05 15:50:50 +00:00
|
|
|
"Make MySQL cmd line args for database connection. Pass nil to omit that arg."
|
|
|
|
(combine-and-quote-strings
|
2014-09-20 13:09:29 +00:00
|
|
|
(delq nil
|
2013-02-05 15:50:50 +00:00
|
|
|
(list (when host (concat "-h" host))
|
2015-04-06 20:13:06 +00:00
|
|
|
(when port (format "-P%d" port))
|
2013-02-05 15:50:50 +00:00
|
|
|
(when user (concat "-u" user))
|
|
|
|
(when password (concat "-p" password))
|
|
|
|
(when database (concat "-D" database))))))
|
|
|
|
|
2016-09-16 07:12:56 +00:00
|
|
|
(defun org-babel-sql-dbstring-postgresql (host port user database)
|
2014-09-20 13:02:36 +00:00
|
|
|
"Make PostgreSQL command line args for database connection.
|
|
|
|
Pass nil to omit that arg."
|
|
|
|
(combine-and-quote-strings
|
|
|
|
(delq nil
|
|
|
|
(list (when host (concat "-h" host))
|
2016-09-16 07:12:56 +00:00
|
|
|
(when port (format "-p%d" port))
|
2014-09-20 13:02:36 +00:00
|
|
|
(when user (concat "-U" user))
|
|
|
|
(when database (concat "-d" database))))))
|
|
|
|
|
2015-12-18 09:44:25 +00:00
|
|
|
(defun org-babel-sql-dbstring-oracle (host port user password database)
|
2018-03-08 22:37:29 +00:00
|
|
|
"Make Oracle command line arguments for database connection.
|
2018-03-15 18:15:14 +00:00
|
|
|
|
|
|
|
If HOST and PORT are nil then don't pass them. This allows you
|
|
|
|
to use names defined in your \"TNSNAMES\" file. So you can
|
|
|
|
connect with
|
|
|
|
|
|
|
|
<user>/<password>@<host>:<port>/<database>
|
|
|
|
|
|
|
|
or
|
|
|
|
|
|
|
|
<user>/<password>@<database>
|
|
|
|
|
|
|
|
using its alias."
|
|
|
|
(cond ((and user password database host port)
|
|
|
|
(format "%s/%s@%s:%s/%s" user password host port database))
|
|
|
|
((and user password database)
|
|
|
|
(format "%s/%s@%s" user password database))
|
|
|
|
(t (user-error "Missing information to connect to database"))))
|
2015-12-18 09:44:25 +00:00
|
|
|
|
2016-06-08 05:49:54 +00:00
|
|
|
(defun org-babel-sql-dbstring-mssql (host user password database)
|
2017-07-06 07:23:30 +00:00
|
|
|
"Make sqlcmd command line args for database connection.
|
2016-06-08 05:49:54 +00:00
|
|
|
`sqlcmd' is the preferred command line tool to access Microsoft
|
|
|
|
SQL Server on Windows and Linux platform."
|
|
|
|
(mapconcat #'identity
|
|
|
|
(delq nil
|
|
|
|
(list (when host (format "-S \"%s\"" host))
|
|
|
|
(when user (format "-U \"%s\"" user))
|
|
|
|
(when password (format "-P \"%s\"" password))
|
|
|
|
(when database (format "-d \"%s\"" database))))
|
|
|
|
" "))
|
|
|
|
|
2016-12-05 21:45:25 +00:00
|
|
|
(defun org-babel-sql-dbstring-sqsh (host user password database)
|
2017-09-29 23:40:18 +00:00
|
|
|
"Make sqsh command line args for database connection.
|
2016-12-05 21:45:25 +00:00
|
|
|
\"sqsh\" is one method to access Sybase or MS SQL via Linux platform"
|
|
|
|
(mapconcat #'identity
|
|
|
|
(delq nil
|
|
|
|
(list (when host (format "-S \"%s\"" host))
|
|
|
|
(when user (format "-U \"%s\"" user))
|
|
|
|
(when password (format "-P \"%s\"" password))
|
|
|
|
(when database (format "-D \"%s\"" database))))
|
|
|
|
" "))
|
|
|
|
|
2017-04-06 06:46:04 +00:00
|
|
|
(defun org-babel-sql-dbstring-vertica (host port user password database)
|
|
|
|
"Make Vertica command line args for database connection. Pass nil to omit that arg."
|
|
|
|
(mapconcat #'identity
|
|
|
|
(delq nil
|
|
|
|
(list (when host (format "-h %s" host))
|
|
|
|
(when port (format "-p %d" port))
|
|
|
|
(when user (format "-U %s" user))
|
|
|
|
(when password (format "-w %s" (shell-quote-argument password) ))
|
|
|
|
(when database (format "-d %s" database))))
|
|
|
|
" "))
|
2016-12-05 21:45:25 +00:00
|
|
|
|
2016-06-08 05:49:54 +00:00
|
|
|
(defun org-babel-sql-convert-standard-filename (file)
|
2017-04-16 07:24:06 +00:00
|
|
|
"Convert FILE to OS standard file name.
|
2016-06-08 05:49:54 +00:00
|
|
|
If in Cygwin environment, uses Cygwin specific function to
|
2017-04-16 07:24:06 +00:00
|
|
|
convert the file name. In a Windows-NT environment, do nothing.
|
|
|
|
Otherwise, use Emacs' standard conversion function."
|
|
|
|
(cond ((fboundp 'cygwin-convert-file-name-to-windows)
|
|
|
|
(format "%S" (cygwin-convert-file-name-to-windows file)))
|
|
|
|
((string= "windows-nt" system-type) file)
|
|
|
|
(t (format "%S" (convert-standard-filename file)))))
|
2016-06-08 05:49:54 +00:00
|
|
|
|
2019-03-24 10:35:21 +00:00
|
|
|
(defun org-babel-find-db-connection-param (params name)
|
|
|
|
"Return database connection parameter NAME.
|
|
|
|
Given a parameter NAME, if :dbconnection is defined in PARAMS
|
|
|
|
then look for the parameter into the corresponding connection
|
|
|
|
defined in `sql-connection-alist`, otherwise look into PARAMS.
|
|
|
|
Look `sql-connection-alist` (part of SQL mode) for how to define
|
|
|
|
database connections."
|
|
|
|
(if (assq :dbconnection params)
|
|
|
|
(let* ((dbconnection (cdr (assq :dbconnection params)))
|
|
|
|
(name-mapping '((:dbhost . sql-server)
|
|
|
|
(:dbport . sql-port)
|
|
|
|
(:dbuser . sql-user)
|
|
|
|
(:dbpassword . sql-password)
|
|
|
|
(:database . sql-database)))
|
|
|
|
(mapped-name (cdr (assq name name-mapping))))
|
|
|
|
(cadr (assq mapped-name
|
|
|
|
(cdr (assoc dbconnection sql-connection-alist)))))
|
|
|
|
(cdr (assq name params))))
|
|
|
|
|
2009-08-01 20:00:37 +00:00
|
|
|
(defun org-babel-execute:sql (body params)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Execute a block of Sql code with Babel.
|
|
|
|
This function is called by `org-babel-execute-src-block'."
|
2016-09-22 17:45:15 +00:00
|
|
|
(let* ((result-params (cdr (assq :result-params params)))
|
|
|
|
(cmdline (cdr (assq :cmdline params)))
|
2019-03-24 10:35:21 +00:00
|
|
|
(dbhost (org-babel-find-db-connection-param params :dbhost))
|
|
|
|
(dbport (org-babel-find-db-connection-param params :dbport))
|
|
|
|
(dbuser (org-babel-find-db-connection-param params :dbuser))
|
|
|
|
(dbpassword (org-babel-find-db-connection-param params :dbpassword))
|
|
|
|
(database (org-babel-find-db-connection-param params :database))
|
2016-09-22 17:45:15 +00:00
|
|
|
(engine (cdr (assq :engine params)))
|
|
|
|
(colnames-p (not (equal "no" (cdr (assq :colnames params)))))
|
2010-08-25 20:43:07 +00:00
|
|
|
(in-file (org-babel-temp-file "sql-in-"))
|
2016-09-22 17:45:15 +00:00
|
|
|
(out-file (or (cdr (assq :out-file params))
|
2010-08-25 20:43:07 +00:00
|
|
|
(org-babel-temp-file "sql-out-")))
|
2010-12-21 17:33:37 +00:00
|
|
|
(header-delim "")
|
2020-02-12 08:03:44 +00:00
|
|
|
(command (cl-case (intern engine)
|
|
|
|
(dbi (format "dbish --batch %s < %s | sed '%s' > %s"
|
|
|
|
(or cmdline "")
|
|
|
|
(org-babel-process-file-name in-file)
|
|
|
|
"/^+/d;s/^|//;s/(NULL)/ /g;$d"
|
|
|
|
(org-babel-process-file-name out-file)))
|
|
|
|
(monetdb (format "mclient -f tab %s < %s > %s"
|
|
|
|
(or cmdline "")
|
|
|
|
(org-babel-process-file-name in-file)
|
|
|
|
(org-babel-process-file-name out-file)))
|
|
|
|
(mssql (format "sqlcmd %s -s \"\t\" %s -i %s -o %s"
|
2016-12-05 21:45:25 +00:00
|
|
|
(or cmdline "")
|
2020-02-12 08:03:44 +00:00
|
|
|
(org-babel-sql-dbstring-mssql
|
2016-12-05 21:45:25 +00:00
|
|
|
dbhost dbuser dbpassword database)
|
|
|
|
(org-babel-sql-convert-standard-filename
|
|
|
|
(org-babel-process-file-name in-file))
|
|
|
|
(org-babel-sql-convert-standard-filename
|
|
|
|
(org-babel-process-file-name out-file))))
|
2020-02-12 08:03:44 +00:00
|
|
|
(mysql (format "mysql %s %s %s < %s > %s"
|
|
|
|
(org-babel-sql-dbstring-mysql
|
|
|
|
dbhost dbport dbuser dbpassword database)
|
|
|
|
(if colnames-p "" "-N")
|
|
|
|
(or cmdline "")
|
|
|
|
(org-babel-process-file-name in-file)
|
|
|
|
(org-babel-process-file-name out-file)))
|
|
|
|
((postgresql postgres) (format
|
2020-12-08 16:27:34 +00:00
|
|
|
"%s%s --set=\"ON_ERROR_STOP=1\" %s -A -P \
|
2020-02-12 08:03:44 +00:00
|
|
|
footer=off -F \"\t\" %s -f %s -o %s %s"
|
|
|
|
(if dbpassword
|
|
|
|
(format "PGPASSWORD=%s " dbpassword)
|
|
|
|
"")
|
2020-12-08 16:27:34 +00:00
|
|
|
(or (bound-and-true-p
|
|
|
|
sql-postgres-program)
|
|
|
|
"psql")
|
2020-02-12 08:03:44 +00:00
|
|
|
(if colnames-p "" "-t")
|
|
|
|
(org-babel-sql-dbstring-postgresql
|
|
|
|
dbhost dbport dbuser database)
|
|
|
|
(org-babel-process-file-name in-file)
|
|
|
|
(org-babel-process-file-name out-file)
|
|
|
|
(or cmdline "")))
|
|
|
|
(sqsh (format "sqsh %s %s -i %s -o %s -m csv"
|
|
|
|
(or cmdline "")
|
|
|
|
(org-babel-sql-dbstring-sqsh
|
|
|
|
dbhost dbuser dbpassword database)
|
|
|
|
(org-babel-sql-convert-standard-filename
|
|
|
|
(org-babel-process-file-name in-file))
|
|
|
|
(org-babel-sql-convert-standard-filename
|
|
|
|
(org-babel-process-file-name out-file))))
|
|
|
|
(vertica (format "vsql %s -f %s -o %s %s"
|
|
|
|
(org-babel-sql-dbstring-vertica
|
|
|
|
dbhost dbport dbuser dbpassword database)
|
|
|
|
(org-babel-process-file-name in-file)
|
|
|
|
(org-babel-process-file-name out-file)
|
|
|
|
(or cmdline "")))
|
|
|
|
(oracle (format
|
|
|
|
"sqlplus -s %s < %s > %s"
|
|
|
|
(org-babel-sql-dbstring-oracle
|
|
|
|
dbhost dbport dbuser dbpassword database)
|
|
|
|
(org-babel-process-file-name in-file)
|
|
|
|
(org-babel-process-file-name out-file)))
|
|
|
|
(t (user-error "No support for the %s SQL engine" engine)))))
|
2010-04-16 05:21:56 +00:00
|
|
|
(with-temp-file in-file
|
2012-05-17 01:26:56 +00:00
|
|
|
(insert
|
2015-12-20 15:57:07 +00:00
|
|
|
(pcase (intern engine)
|
|
|
|
(`dbi "/format partbox\n")
|
|
|
|
(`oracle "SET PAGESIZE 50000
|
2015-12-18 09:44:25 +00:00
|
|
|
SET NEWPAGE 0
|
|
|
|
SET TAB OFF
|
|
|
|
SET SPACE 0
|
|
|
|
SET LINESIZE 9999
|
2018-03-08 22:37:29 +00:00
|
|
|
SET TRIMOUT ON TRIMSPOOL ON
|
2015-12-18 09:44:25 +00:00
|
|
|
SET ECHO OFF
|
|
|
|
SET FEEDBACK OFF
|
|
|
|
SET VERIFY OFF
|
|
|
|
SET HEADING ON
|
|
|
|
SET MARKUP HTML OFF SPOOL OFF
|
|
|
|
SET COLSEP '|'
|
|
|
|
|
2016-06-08 05:49:54 +00:00
|
|
|
")
|
2016-12-05 21:45:25 +00:00
|
|
|
((or `mssql `sqsh) "SET NOCOUNT ON
|
2016-06-08 05:49:54 +00:00
|
|
|
|
2015-12-18 09:44:25 +00:00
|
|
|
")
|
2017-04-06 06:46:04 +00:00
|
|
|
(`vertica "\\a\n")
|
2015-12-20 15:57:07 +00:00
|
|
|
(_ ""))
|
2016-12-05 21:45:25 +00:00
|
|
|
(org-babel-expand-body:sql body params)
|
|
|
|
;; "sqsh" requires "go" inserted at EOF.
|
|
|
|
(if (string= engine "sqsh") "\ngo" "")))
|
2013-02-09 21:18:24 +00:00
|
|
|
(org-babel-eval command "")
|
2012-11-19 01:02:09 +00:00
|
|
|
(org-babel-result-cond result-params
|
|
|
|
(with-temp-buffer
|
2015-12-20 15:57:07 +00:00
|
|
|
(progn (insert-file-contents-literally out-file) (buffer-string)))
|
2010-12-21 17:33:37 +00:00
|
|
|
(with-temp-buffer
|
2013-02-24 08:15:02 +00:00
|
|
|
(cond
|
2020-02-12 08:03:44 +00:00
|
|
|
((memq (intern engine) '(dbi mysql postgresql postgres sqsh vertica))
|
2015-12-20 15:57:07 +00:00
|
|
|
;; Add header row delimiter after column-names header in first line
|
|
|
|
(cond
|
|
|
|
(colnames-p
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert-file-contents out-file)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(forward-line 1)
|
|
|
|
(insert "-\n")
|
|
|
|
(setq header-delim "-")
|
|
|
|
(write-file out-file)))))
|
|
|
|
(t
|
|
|
|
;; Need to figure out the delimiter 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))))
|
2016-12-05 21:45:25 +00:00
|
|
|
(org-table-import out-file (if (string= engine "sqsh") '(4) '(16)))
|
2011-10-18 16:15:04 +00:00
|
|
|
(org-babel-reassemble-table
|
|
|
|
(mapcar (lambda (x)
|
|
|
|
(if (string= (car x) header-delim)
|
|
|
|
'hline
|
|
|
|
x))
|
|
|
|
(org-table-to-lisp))
|
2016-09-22 17:45:15 +00:00
|
|
|
(org-babel-pick-name (cdr (assq :colname-names params))
|
|
|
|
(cdr (assq :colnames params)))
|
|
|
|
(org-babel-pick-name (cdr (assq :rowname-names params))
|
|
|
|
(cdr (assq :rownames params))))))))
|
2010-04-19 01:06:34 +00:00
|
|
|
|
2010-12-01 02:32:01 +00:00
|
|
|
(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
|
2015-09-17 23:08:20 +00:00
|
|
|
(format "$%s" (car pair))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* 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):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* 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):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* 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):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* 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):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(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))))
|
2010-12-01 02:32:01 +00:00
|
|
|
body)))
|
|
|
|
vars)
|
|
|
|
body)
|
2009-08-01 20:00:37 +00:00
|
|
|
|
2015-10-26 15:58:34 +00:00
|
|
|
(defun org-babel-prep-session:sql (_session _params)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Raise an error because Sql sessions aren't implemented."
|
2012-08-13 03:59:44 +00:00
|
|
|
(error "SQL sessions not yet implemented"))
|
2009-08-01 20:00:37 +00:00
|
|
|
|
2010-06-11 23:02:42 +00:00
|
|
|
(provide 'ob-sql)
|
2010-06-25 16:32:35 +00:00
|
|
|
|
2010-06-11 23:02:42 +00:00
|
|
|
;;; ob-sql.el ends here
|