Skip to content

Commit

Permalink
version 7.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
cosminadrianpopescu committed Aug 8, 2017
1 parent a05e3c3 commit 33f14d5
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 2 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ it, here is the quick start:
*Running sql queries against a DBMS*:

* set the `g:sw_config_dir`, `g:sw_exe` and `g:sw_cache` variables
* for `cygwin` environments, please also set the `g:sw_plugin_path` variable
(this should point to the installation directory of the plugin). For
example: `c:/Users/cosmin/.vim/bundle/vim-sql-workbench`
* open your sql buffer
* if you have `CtrlP` installed you can do `CtrlP` and then select `SQL
Workbench profiles` and choose your profile
Expand Down Expand Up @@ -1159,6 +1162,8 @@ and
use `SWSqlWipeoutResultsSets` command.
* `g:sw_config_dir`: the config dir of the `SQL Workbench/J` (works only with
build 121.4 and more)
* `g:sw_plugin_path`: for `cygwin` environments: specify the plugin
installation path (for example `c:/Users/cosmin/.vim/bundle/vim-sql-workbench`)

Screen shots
========================================
Expand Down
2 changes: 2 additions & 0 deletions autoload/sw.vim
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,8 @@ function! sw#script_path()
let result = g:sw_plugin_path
endif

let result .= (result =~ '\v\/$' ? '' : '/')

return result
endfunction

Expand Down
3 changes: 2 additions & 1 deletion autoload/sw/profiles.vim
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ endfunction

function! sw#profiles#finish(profile, txt)
if !(a:txt =~ 'XSLT transformation.*finished successfully')
call sw#display_error("There was a problem fetching the profiles for Sql Workbench (maybe the g:sw_cache) variable is not set?")
call sw#display_error("There was a problem fetching the profiles for Sql Workbench (maybe the g:sw_cache) variable is not set? Please note that you need to either create the default folder (~/.cache/sw) either to set the variable to an existing folder for autocomplete or CtrlP integration to work")
call sw#display_error("The output of the command was " . a:txt)
endif
endfunction

Expand Down
6 changes: 6 additions & 0 deletions doc/vim-sql-workbench.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ it, here is the quick start:
Running sql queries against a DBMS:

* set the `g:sw_config_dir`, `g:sw_exe` and `g:sw_cache` variables
* for `cygwin` environments, please also set the `g:sw_plugin_path` variable
(this should point to the installation directory of the plugin). For
example: `c:/Users/cosmin/.vim/bundle/vim-sql-workbench`
* open your sql buffer
* if you have `CtrlP` installed you can do `CtrlP` and then select and choose your profile
* otherwise, you can do `:SWSqlBufferConnect` and then in the buffer execute
Expand Down Expand Up @@ -1213,3 +1216,6 @@ GENERAL SETTINGS: *vim-sql-workbench-general_settings
use `SWSqlWipeoutResultsSets` command.
* `g:sw_config_dir`: the config dir of the (works only with
build 121.4 and more)
* `g:sw_plugin_path`: for `cygwin` environments: specify the plugin
installation path (for example `c:/Users/cosmin/.vim/bundle/vim-sql-workbench`)

2 changes: 1 addition & 1 deletion plugin/sw.vim
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if !exists('g:sw_search_default_compare_types')
let g:sw_search_default_compare_types = 'contains'
endif

if !exists('g:cache')
if !exists('g:sw_cache')
let g:sw_cache = $HOME . '/.cache/sw'
endif

Expand Down

0 comments on commit 33f14d5

Please sign in to comment.