[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] ob-sql: Respect database param when using dbconnection
From: |
Kyle Meyer |
Subject: |
Re: [PATCH] ob-sql: Respect database param when using dbconnection |
Date: |
Mon, 01 Jun 2020 02:16:06 +0000 |
Daniel Kraus writes:
> I use ob-sql with the :dbconnection param so I don't have my username and
> password in my org file.
> But often I don't want to use the default database from the dbconnection
> alist but
> rather specify it explicitly with :database.
> Attached is a patch that fixes this.
Thanks for the patch.
> Subject: [PATCH] ob-sql: Respect database param when using dbconnection
>
> ---
> lisp/ob-sql.el | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Would you mind formatting your commit message as described at
<https://orgmode.org/worg/org-contribute.html>? It'd also be good to
have an ORG-NEWS entry for this, I think.
> diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
> index 7c359b988..d7a8bf0a0 100644
> --- a/lisp/ob-sql.el
> +++ b/lisp/ob-sql.el
> @@ -191,7 +191,8 @@ 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)
> + (if (and (assq :dbconnection params)
> + (not (and (assq :database params) (eq name :database))))
> (let* ((dbconnection (cdr (assq :dbconnection params)))
> (name-mapping '((:dbhost . sql-server)
> (:dbport . sql-port)
>From what I can gather from your description, this looks reasonable.
I'm not an ob-sql user, so perhaps I missing something, but would it
make sense for any connection parameter to take precedence if explicitly
given in the source block header (i.e. something like the patch below)?
[+cc Stefano, who added the :dbconneciton feature.]
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index 7c359b988..e7186938f 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -191,17 +191,17 @@ (defun org-babel-find-db-connection-param (params name)
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))))
+ (or (cdr (assq name params))
+ (and (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))))))))
(defun org-babel-execute:sql (body params)
"Execute a block of Sql code with Babel.