Skip to content

Add shortcut (<leader>seb) to execute the complete buffer #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add shortcut (<leader>seb) to execute the complete buffer #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f052e7
Add shortcut (<leader>seb) to execute the complete buffer
Mar 7, 2016
31f04bb
fix encoding to latin1[dos] before sending to sqlplus
Mar 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions autoload/dbext.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3503,6 +3503,9 @@ function! s:DB_ORA_execSql(str)
exe 'redir! > ' . s:dbext_tempfile
silent echo output
redir END

" fix encoding to latin1[dos] before sending to sqlplus
execute 'sp ' . s:dbext_tempfile .' | write ++enc=latin1 ++ff=dos | q!'

let dbext_bin = s:DB_fullPath2Bin(dbext#DB_getWType("bin"))

Expand Down
26 changes: 26 additions & 0 deletions plugin/dbext.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ if !exists(':DBExecVisualSQL')
command! -nargs=0 -range DBExecVisualSQL :call dbext#DB_execSql(DB_getVisualBlock())
xmap <unique> <script> <Plug>DBExecVisualSQL :DBExecVisualSQL<CR>
endif
if !exists(':DBExecBufferSQL')
command! -nargs=0 -range DBExecBufferSQL :call dbext#DB_execSql(DB_getBuffer())
nmap <unique> <script> <Plug>DBExecBufferSQL :DBExecBufferSQL<CR>
endif
if !exists(':DBExecVisualSQLTopX')
command! -nargs=0 -range DBExecVisualSQLTopX :call dbext#DB_execSqlTopX(DB_getVisualBlock())
xmap <unique> <script> <Plug>DBExecVisualTopXSQL :DBExecVisualSQLTopX<CR>
Expand Down Expand Up @@ -245,6 +249,9 @@ if g:dbext_default_usermaps != 0
if maparg(g:dbext_map_prefix.'e', 'x') == ''
exec 'xmap <unique> '.g:dbext_map_prefix.'e <Plug>DBExecVisualSQL'
endif
if maparg(g:dbext_map_prefix.'eb', 'n') == ''
exec 'nmap <unique> '.g:dbext_map_prefix.'eb <Plug>DBExecBufferSQL'
endif
if maparg(g:dbext_map_prefix.'E', 'x') == ''
exec 'xmap <unique> '.g:dbext_map_prefix.'E <Plug>DBExecVisualTopXSQL'
endif
Expand Down Expand Up @@ -369,6 +376,7 @@ if has("gui_running") && has("menu") && g:dbext_default_menu_mode != 0

if g:dbext_map_or_cmd == 'map'
exec 'vnoremenu <script> '.menuRoot.'.Execute\ SQL\ (Visual\ selection)<TAB>'.leader.'se :DBExecVisualSQL<CR>'
exec 'noremenu <script> '.menuRoot.'.Execute\ SQL\ (Buffer)<TAB>'.leader.'seb :DBExecBufferSQL<CR>'
exec 'noremenu <script> '.menuRoot.'.Execute\ SQL\ (Under\ cursor)<TAB>'.leader.'se :call feedkeys("'.leader.'se")<CR>'
exec 'vnoremenu <script> '.menuRoot.'.Execute\ SQL\ TopX\ (Visual\ selection)<TAB>'.leader.'sE :DBExecVisualSQLTopX<CR>'
exec 'noremenu <script> '.menuRoot.'.Execute\ SQL\ TopX\ (Under\ cursor)<TAB>'.leader.'sE :call feedkeys("'.leader.'sE")<CR>'
Expand Down Expand Up @@ -410,6 +418,7 @@ if has("gui_running") && has("menu") && g:dbext_default_menu_mode != 0
exec 'noremenu <script> '.menuRoot.'.List\ Connections\ (DBI) :DBListConnections<CR>'
else
exec 'vnoremenu <script> '.menuRoot.'.Execute\ SQL\ (Visual\ selection)<TAB>'.leader.'se :DBExecVisualSQL<CR>'
exec 'noremenu <script> '.menuRoot.'.Execute\ SQL\ Buffer)<TAB>'.leader.'seb :DBExecBufferSQL<CR>'
exec 'noremenu <script> '.menuRoot.'.Execute\ SQL\ (Under\ cursor)<TAB>'.leader.'se :DBExecSQLUnderCursor<CR>'
exec 'vnoremenu <script> '.menuRoot.'.Execute\ SQL\ TopX\ (Visual\ selection)<TAB>'.leader.'sE :DBExecVisualSQLTopX<CR>'
exec 'noremenu <script> '.menuRoot.'.Execute\ SQL\ TopX\ (Under\ cursor)<TAB>'.leader.'sE :DBExecSQLUnderCursorTopX<CR>'
Expand Down Expand Up @@ -498,6 +507,23 @@ function! DB_getListColumn(...)
return dbext#DB_getListColumn(table_name, silent_mode, use_newline_sep)
endfunction

function! DB_getBuffer() range
let save = @"
" Mark the current line to return to
let curline = line("'<")
let curcol = virtcol("'<")

silent normal ggvGy
let vis_cmd = @"
let @" = save

" Return to previous location
" Accounting for beginning of the line
" call cursor(curline, curcol)

return vis_cmd
endfunction

function! DB_getVisualBlock() range
let save = @"
" Mark the current line to return to
Expand Down