From: Andreas Gerler Date: Fri, 17 Jan 2025 10:07:39 +0000 (+0100) Subject: fix for ob-sql X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=2001692a565708e9df253b686cd9a42a36027579;p=emacsconfig.git fix for ob-sql * elpa/org-9.7.17/ob-sql.el: reverted some changes from upstream Signed-off-by: Andreas Gerler --- diff --git a/elpa/org-9.7.17/ob-sql.el b/elpa/org-9.7.17/ob-sql.el index 5ece354e..1a10ea7f 100644 --- a/elpa/org-9.7.17/ob-sql.el +++ b/elpa/org-9.7.17/ob-sql.el @@ -229,10 +229,16 @@ 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))))))))) + ;; (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. @@ -245,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))