From b2e2c230b387d455982493f756b3db339c83e9a0 Mon Sep 17 00:00:00 2001 From: tuc55745 Date: Wed, 31 May 2023 17:12:29 -0400 Subject: [PATCH 1/2] Add SQLCL support in Oracle adapter --- autoload/db/adapter/oracle.vim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/autoload/db/adapter/oracle.vim b/autoload/db/adapter/oracle.vim index 34da05e1..bbe9cddf 100644 --- a/autoload/db/adapter/oracle.vim +++ b/autoload/db/adapter/oracle.vim @@ -14,7 +14,11 @@ endfunction function! db#adapter#oracle#interactive(url) abort let url = db#url#parse(a:url) - return [get(g:, 'dbext_default_ORA_bin', 'sqlplus'), '-L', + let sql_bin = 'sqlplus' + if executable('sql') + let sql_bin = 'sql' + endif + return [get(g:, 'dbext_default_ORA_bin', sql_bin ), '-L', \ get(url, 'user', 'system') . '/' . get(url, 'password', 'oracle') . \ '@' . s:conn(url)] endfunction From a4396165fa0f6420b2939a2f56cf354933b47646 Mon Sep 17 00:00:00 2001 From: tuc55745 Date: Mon, 26 Jun 2023 09:27:22 -0400 Subject: [PATCH 2/2] Add documentation for sqlcl overrid config in oracle --- autoload/db/adapter/oracle.vim | 6 +----- doc/dadbod.txt | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/autoload/db/adapter/oracle.vim b/autoload/db/adapter/oracle.vim index bbe9cddf..011165b7 100644 --- a/autoload/db/adapter/oracle.vim +++ b/autoload/db/adapter/oracle.vim @@ -14,11 +14,7 @@ endfunction function! db#adapter#oracle#interactive(url) abort let url = db#url#parse(a:url) - let sql_bin = 'sqlplus' - if executable('sql') - let sql_bin = 'sql' - endif - return [get(g:, 'dbext_default_ORA_bin', sql_bin ), '-L', + return [get(g:, 'dbext_default_ORA_bin', 'sqlplus' ), '-L', \ get(url, 'user', 'system') . '/' . get(url, 'password', 'oracle') . \ '@' . s:conn(url)] endfunction diff --git a/doc/dadbod.txt b/doc/dadbod.txt index 38bf73b2..d3b46019 100644 --- a/doc/dadbod.txt +++ b/doc/dadbod.txt @@ -134,7 +134,9 @@ Oracle ~ > oracle://[[:]@][][:]/[] oracle:/@[//][:]/ -< + +Sqlplus is the default binary used to connect, to override and use sqlcl +let g:dbext_default_ORA_bin = 'sql' *dadbod-osquery* osquery ~ >