ob-sql dbconnection engine

[Andreas Gerler <baron@bundesbrandschatzamt.de>]

[-- Attachment #1.1: Type: text/plain, Size: 232 bytes --]

Hi!

as I am still learning more elisp it took me some try and error but I can use the sql-product now within dbconnection.
Using :engine still works as well.
Still wondering if there is a more elegant way for the if clause.


[-- Attachment #1.2: ob-sql.el.diff --]
[-- Type: application/octet-stream, Size: 1768 bytes --]

diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index f73e7003f..c6a192ae3 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -231,10 +231,14 @@ database connections."
                                   (:dbuser . sql-user)
                                   (:dbpassword . sql-password)
                                   (:dbinstance . sql-dbinstance)
-                                  (:database . sql-database)))
+                                  (:database . sql-database)
+                                  (:engine . sql-product)))
                   (mapped-name (cdr (assq name name-mapping))))
-             (cadr (assq mapped-name
-                         (cdr (assoc-string dbconnection sql-connection-alist t))))))))
+             (if (string-equal ":engine" name)
+                 (symbol-name (cadr (cadr (assq mapped-name
+                                   (cdr (assoc-string dbconnection sql-connection-alist t))))))
+               (cadr (assq mapped-name
+                           (cdr (assoc-string dbconnection sql-connection-alist t)))))))))
 
 (defun org-babel-execute:sql (body params)
   "Execute a block of Sql code with Babel.
@@ -247,7 +251,7 @@ This function is called by `org-babel-execute-src-block'."
          (dbpassword (org-babel-find-db-connection-param params :dbpassword))
          (dbinstance (org-babel-find-db-connection-param params :dbinstance))
          (database (org-babel-find-db-connection-param params :database))
-         (engine (cdr (assq :engine params)))
+         (engine  (org-babel-find-db-connection-param params :engine))
          (colnames-p (not (equal "no" (cdr (assq :colnames params)))))
          (in-file (org-babel-temp-file "sql-in-"))
          (out-file (or (cdr (assq :out-file params))

[-- Attachment #1.3: Type: text/plain, Size: 88 bytes --]



so long…

Andreas Gerler

—

http://www.bundesbrandschatzamt.de/~baron


[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 874 bytes --]