From ae8986c024a1570a20ab7766a29ef8920398c295 Mon Sep 17 00:00:00 2001 From: johnybx Date: Thu, 18 May 2023 20:36:36 +0200 Subject: [PATCH 1/2] SQL Server adapter: supply password in environment variable --- autoload/db/adapter/sqlserver.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/db/adapter/sqlserver.vim b/autoload/db/adapter/sqlserver.vim index 7381a682..90703084 100644 --- a/autoload/db/adapter/sqlserver.vim +++ b/autoload/db/adapter/sqlserver.vim @@ -42,11 +42,11 @@ endfunction function! db#adapter#sqlserver#interactive(url) abort let url = db#url#parse(a:url) - return ['sqlcmd', '-S', s:server(url)] + + return ['env', 'SQLCMDPASSWORD=' . get(url, 'password'), 'sqlcmd', '-S', s:server(url)] + \ s:boolean_param_flag(url, 'encrypt', '-N') + \ s:boolean_param_flag(url, 'trustServerCertificate', '-C') + \ (has_key(url, 'user') ? [] : ['-E']) + - \ db#url#as_argv(url, '', '', '', '-U ', '-P ', '-d ') + \ db#url#as_argv(url, '', '', '', '-U ', '', '-d ') endfunction function! db#adapter#sqlserver#input(url, in) abort From 8f31dad671afc183dfdb9643f85d8d139fa1e656 Mon Sep 17 00:00:00 2001 From: johnybx Date: Fri, 19 May 2023 20:49:34 +0200 Subject: [PATCH 2/2] use empty string as default for password --- autoload/db/adapter/sqlserver.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/db/adapter/sqlserver.vim b/autoload/db/adapter/sqlserver.vim index 90703084..b58d0743 100644 --- a/autoload/db/adapter/sqlserver.vim +++ b/autoload/db/adapter/sqlserver.vim @@ -42,7 +42,7 @@ endfunction function! db#adapter#sqlserver#interactive(url) abort let url = db#url#parse(a:url) - return ['env', 'SQLCMDPASSWORD=' . get(url, 'password'), 'sqlcmd', '-S', s:server(url)] + + return ['env', 'SQLCMDPASSWORD=' . get(url, 'password', ''), 'sqlcmd', '-S', s:server(url)] + \ s:boolean_param_flag(url, 'encrypt', '-N') + \ s:boolean_param_flag(url, 'trustServerCertificate', '-C') + \ (has_key(url, 'user') ? [] : ['-E']) +