xinb
/
zsh-completions
mirror of https://github.com/zsh-users/zsh-completions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Grigorii Horos 2020-07-07 01:22:26 +03:00
parent 401e8d8daf 3b247d3071
commit 0bd6316a37
No known key found for this signature in database
GPG Key ID: 690E27A17D89A380
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/_pgsql_utils
View File

@ -89,7 +89,7 @@ _pgsql_users () {
_pgsql_user_sql='select r.rolname from pg_catalog.pg_roles r where r.rolcanlogin = true' _pgsql_user_sql='select r.rolname from pg_catalog.pg_roles r where r.rolcanlogin = true'
compadd "$@" - $( psql $_pgsql_params[@] -Aqt -c $_pgsql_user_sql template1 2>/dev/null ) compadd "$@" - $( psql $_pgsql_params[@] -XAqt -c $_pgsql_user_sql template1 2>/dev/null )
} }
@ -122,7 +122,7 @@ _pgsql_tables () {
order by 1" order by 1"
compadd "$@" - \ compadd "$@" - \
$( psql $_pgsql_params[@] -Aqt -c $_pgsql_table_sql $db 2>/dev/null ) $( psql $_pgsql_params[@] -AXqt -c $_pgsql_table_sql $db 2>/dev/null )
} }
_pgsql_schemas () { _pgsql_schemas () {
@ -139,7 +139,7 @@ _pgsql_schemas () {
order by 1;" order by 1;"
compadd "$@" - \ compadd "$@" - \
$( psql $_pgsql_params[@] -Aqt -c $_pgsql_schema_sql $db 2>/dev/null ) $( psql $_pgsql_params[@] -AXqt -c $_pgsql_schema_sql $db 2>/dev/null )
} }
_pgsql_databases () { _pgsql_databases () {
@ -147,10 +147,9 @@ _pgsql_databases () {
_pgsql_get_identity _pgsql_get_identity
local _pgsql_services _pgsql_service_files local _pgsql_services _pgsql_service_files
_pgsql_service_files=( _pgsql_service_files=(~/.pg_service.conf)
~/.pg_service.conf (( $+commands[pg_config] )) && _pgsql_service_files+=$(pg_config --sysconfdir)/pg_service.conf
$(pg_config --sysconfdir)/pg_service.conf
)
_pgsql_services=$( grep -h '^\[.*\]' $_pgsql_service_files 2>/dev/null \ _pgsql_services=$( grep -h '^\[.*\]' $_pgsql_service_files 2>/dev/null \
| sed -e 's/^\[/service=/' -e 's/\].*$//' ) | sed -e 's/^\[/service=/' -e 's/\].*$//' )
@ -160,7 +159,7 @@ _pgsql_databases () {
compadd "$@" - \ compadd "$@" - \
${(f)_pgsql_services} \ ${(f)_pgsql_services} \
$( psql $_pgsql_params[@] -Atq -c $_pgsql_db_sql template1 2>/dev/null ) $( psql $_pgsql_params[@] -AXtq -c $_pgsql_db_sql template1 2>/dev/null )
} }
_pgsql_encodings () { _pgsql_encodings () {
@ -170,7 +169,7 @@ _pgsql_encodings () {
local _pgsql_db_sql local _pgsql_db_sql
_pgsql_db_sql="select pg_encoding_to_char(i) from generate_series(0,100) i;" _pgsql_db_sql="select pg_encoding_to_char(i) from generate_series(0,100) i;"
compadd "$@" - $( psql $_pgsql_params[@] -Atq -c $_pgsql_db_sql template1 ) compadd "$@" - $( psql $_pgsql_params[@] -AXtq -c $_pgsql_db_sql template1 )
} }