From: Andreas Gerler <baron@bundesbrandschatzamt.de>
To: emacs-orgmode@gnu.org
Subject: Re: ob-sql dbconnection engine
Date: Sat, 28 Jan 2023 15:15:40 +0100 [thread overview]
Message-ID: <2FAAE35F-03C9-4933-B48E-97326801D476@bundesbrandschatzamt.de> (raw)
In-Reply-To: <D716F4A6-ECC4-497B-B462-08FFE42D08BA@bundesbrandschatzamt.de>
[-- Attachment #1.1: Type: text/plain, Size: 50 bytes --]
Hi!
and a new patch with proper commit message.
[-- Attachment #1.2: 0002-lisp-ob-sql.el-sql-connection-alist-engine.patch --]
[-- Type: application/octet-stream, Size: 2312 bytes --]
From 98c5f83ae289252610be8ce80452fad97f6433c7 Mon Sep 17 00:00:00 2001
From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Sat, 28 Jan 2023 14:49:02 +0100
Subject: [PATCH 2/2] lisp/ob-sql.el: sql-connection-alist engine
* ob-sql.el (org-babel-find-db-connection-param): with dbconnection use
sql-product for engine parameter.
Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
---
lisp/ob-sql.el | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
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))
--
2.39.0
[-- Attachment #1.3: Type: text/plain, Size: 1561 bytes --]
> On 28. Jan 2023, at 13:57, Andreas Gerler <baron@bundesbrandschatzamt.de> wrote:
>
> Hi!
>
> without the patch your org source block has to look like:
>
> #+begin_src sql :engine mysql :dbconnection mysqldb1
> SELECT * FROM nodes;
> #+end_src
>
> with that patch you can just type
>
> #+begin_src sql :dbconnection mysqldb1
> SELECT * FROM nodes;
> #+end_src
>
> because your engine is mapped to sql-product in your sql-connection-alist:
>
> (setq sql-connection-alist
> '((mysqldb1 (sql-product 'mysql)
> (sql-server "10.10.42.1")
> (sql-user "dbadmin")
> (sql-password "foo")
> (sql-database "testdb"))))
>
>
>> On 27. Jan 2023, at 14:15, Ihor Radchenko <yantar92@posteo.net> wrote:
>>
>> Andreas Gerler <baron@bundesbrandschatzamt.de> writes:
>>
>>> 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.
>>
>> Thanks for the patch!
>> Could you please explain in more details what the patch does?
>>
>> --
>> Ihor Radchenko // yantar92,
>> Org mode contributor,
>> Learn more about Org mode at <https://orgmode.org/>.
>> Support Org development at <https://liberapay.com/org-mode>,
>> or support my work at <https://liberapay.com/yantar92>
>>
>
>
>
> so long…
>
> Andreas Gerler
>
> —
>
> http://www.bundesbrandschatzamt.de/~baron
[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 874 bytes --]
next prev parent reply other threads:[~2023-01-28 14:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-21 12:20 ob-sql dbconnection engine Andreas Gerler
2023-01-27 13:15 ` Ihor Radchenko
2023-01-28 12:57 ` Andreas Gerler
2023-01-28 14:15 ` Andreas Gerler [this message]
2023-02-05 10:57 ` Ihor Radchenko
2023-02-08 15:28 ` Andreas Gerler
2023-02-09 11:16 ` Ihor Radchenko
2023-10-07 10:51 ` Ihor Radchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2FAAE35F-03C9-4933-B48E-97326801D476@bundesbrandschatzamt.de \
--to=baron@bundesbrandschatzamt.de \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).