Hello all Org's developpers, I would like to provide a small improvement to ob-sql : the possibility to connect to an oracle database by using the alias defined in TNSNAMES file.
The patch joined here try to achive this. It also improve (slightly) the data fetching by removing unwanted trailing whitespaces provided by the LINESIZE directive.
> From d3e27d1c833e7f262a30bd0e370a077b6f57c97b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20T=C3=A9choueyres?= <pierre.techouey...@free.fr> Date: Thu, 8 Mar 2018 23:37:29 +0100 Subject: [PATCH] ob-sql.el: Improve Oracle connection and usage for ob-sql. * lisp/ob-sql.el (org-babel-sql-dbstring-oracle): don't use empty args. This allow use of alias defined in Oracle's TNSNAMES files. (org-babel-execute:sql): don't feed lines with trailing spaces. This also improve speed for retrieving data. --- lisp/ob-sql.el | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el index 959ede3de..3ad7906cf 100644 --- a/lisp/ob-sql.el +++ b/lisp/ob-sql.el @@ -111,8 +111,14 @@ Pass nil to omit that arg." (when database (concat "-d" database)))))) (defun org-babel-sql-dbstring-oracle (host port user password database) - "Make Oracle command line args for database connection." - (format "%s/%s@%s:%s/%s" user password host port database)) + "Make Oracle command line args for database connection. + +If PORT and DATABASE are nil then don't pass them. This allow you to +use names defined in your TNSNAMES file." + (format "%s/%s@%s%s" user password host + (if (and port database) + (format ":%s/%s" port database) + ""))) (defun org-babel-sql-dbstring-mssql (host user password database) "Make sqlcmd command line args for database connection. @@ -241,6 +247,7 @@ SET NEWPAGE 0 SET TAB OFF SET SPACE 0 SET LINESIZE 9999 +SET TRIMOUT ON TRIMSPOOL ON SET ECHO OFF SET FEEDBACK OFF SET VERIFY OFF -- 2.14.3
