dbcli/pgcli
1
1
Fork 0
mirror of https://github.com/dbcli/pgcli.git synced 2024-09-17 16:57:39 +03:00
Code Issues Projects Releases Wiki Activity

Add a command line option for --less-chatty. Fix #626.

Browse Source
This commit is contained in:
tk 2017-03-10 02:44:24 -06:00
parent 83442f8ebf
commit 6a42d4e91e
No known key found for this signature in database
GPG Key ID: 053FD4A64651994E
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pgcli/main.py
View File

@ -105,7 +105,7 @@ class PGCli(object):
def __init__(self, force_passwd_prompt=False, never_passwd_prompt=False,
pgexecute=None, pgclirc_file=None, row_limit=None,
single_connection=False, prompt=None):
single_connection=False, less_chatty=None, prompt=None):
self.force_passwd_prompt = force_passwd_prompt
self.never_passwd_prompt = never_passwd_prompt
@ -137,7 +137,11 @@ class PGCli(object):
self.syntax_style = c['main']['syntax_style']
self.cli_style = c['colors']
self.wider_completion_menu = c['main'].as_bool('wider_completion_menu')
self.less_chatty = c['main'].as_bool('less_chatty')
if less_chatty is not None:
self.less_chatty = less_chatty
else:
self.less_chatty = c['main'].as_bool('less_chatty') or False
self.null_string = c['main'].get('null_string', '<null>')
self.prompt_format = prompt if prompt is not None else c['main'].get('prompt', self.default_prompt)
self.on_error = c['main']['on_error'].upper()
@ -158,6 +162,7 @@ class PGCli(object):
'asterisk_column_order': c['main']['asterisk_column_order'],
'qualify_columns': c['main']['qualify_columns'],
'single_connection': single_connection,
'less_chatty': less_chatty,
'keyword_casing': keyword_casing,
}
@ -729,11 +734,15 @@ class PGCli(object):
help='Use DSN configured into the [alias_dsn] section of pgclirc file.')
@click.option('-R', '--row-limit', default=None, envvar='PGROWLIMIT', type=click.INT,
help='Set threshold for row limit prompt. Use 0 to disable prompt.')
@click.option('--less-chatty', 'less_chatty', is_flag=True,
default=None,
help='Skip intro on startup and goodbye on exit.')
@click.option('--prompt', help='Prompt format (Default: "\\u@\\h:\\d> ").')
@click.argument('database', default=lambda: None, envvar='PGDATABASE', nargs=1)
@click.argument('username', default=lambda: None, envvar='PGUSER', nargs=1)
def cli(database, user, host, port, prompt_passwd, never_prompt,
single_connection, dbname, username, version, pgclirc, dsn, row_limit, prompt):
single_connection, dbname, username, version, pgclirc, dsn, row_limit,
less_chatty, prompt):
if version:
print('Version:', __version__)
@ -756,7 +765,8 @@ def cli(database, user, host, port, prompt_passwd, never_prompt,
config_full_path)
pgcli = PGCli(prompt_passwd, never_prompt, pgclirc_file=pgclirc,
row_limit=row_limit, single_connection=single_connection, prompt=prompt)
row_limit=row_limit, single_connection=single_connection,
less_chatty=less_chatty, prompt=prompt)
# Choose which ever one has a valid value.
database = database or dbname