mirror of https://github.com/dbcli/pgcli
Merge branch 'master' into pr1047
This commit is contained in:
commit
fe1b202c55
|
@ -1,9 +1,15 @@
|
|||
dist: xenial
|
||||
|
||||
sudo: required
|
||||
|
||||
language: python
|
||||
|
||||
python:
|
||||
- "2.7"
|
||||
- "3.4"
|
||||
- "3.5"
|
||||
- "3.6"
|
||||
- "3.7"
|
||||
|
||||
before_install:
|
||||
- which python
|
||||
|
@ -43,4 +49,4 @@ services:
|
|||
- postgresql
|
||||
|
||||
addons:
|
||||
postgresql: "9.3"
|
||||
postgresql: "9.6"
|
||||
|
|
|
@ -8,7 +8,13 @@ Bug fixes:
|
|||
* Fix for "no attribute KeyringLocked" (#1040). (Thanks: `Irina Truong`_)
|
||||
* Pgcli no longer works with password containing spaces (#1043). (Thanks: `Irina Truong`_)
|
||||
* Load keyring only when keyring is enabled in the config file (#1041). (Thanks: `Zhaolong Zhu`_)
|
||||
* No longer depend on sqlparse as being less than 0.3.0 with the release of sqlparse 0.3.0. (`VVelox`)
|
||||
* No longer depend on sqlparse as being less than 0.3.0 with the release of sqlparse 0.3.0. (Thanks: `VVelox`_)
|
||||
* Fix the broken support for pgservice . (Thanks: `Xavier Francisco`_)
|
||||
|
||||
Internal:
|
||||
---------
|
||||
|
||||
* Add python 3.7 to travis build matrix. (Thanks: `Irina Truong`_)
|
||||
|
||||
2.1.0
|
||||
=====
|
||||
|
@ -965,4 +971,5 @@ Improvements:
|
|||
.. _`Nathan Verzemnieks`: https://github.com/njvrzm
|
||||
.. _`raylu`: https://github.com/raylu
|
||||
.. _`Zhaolong Zhu`: https://github.com/zzl0
|
||||
|
||||
.. _`Xavier Francisco`: https://github.com/Qu4tro
|
||||
.. _`VVelox`: https://github.com/VVelox
|
||||
|
|
|
@ -233,13 +233,21 @@ class PGExecute(object):
|
|||
'dsn': dsn,
|
||||
}
|
||||
new_params.update(kwargs)
|
||||
conn_params.update({
|
||||
k: unicode2utf8(v) for k, v in new_params.items() if v is not None
|
||||
})
|
||||
|
||||
if 'password' in conn_params and 'dsn' in conn_params:
|
||||
conn_params['dsn'] = make_dsn(
|
||||
conn_params['dsn'], password=conn_params.pop('password'))
|
||||
if new_params['dsn']:
|
||||
new_params = {
|
||||
'dsn': new_params['dsn'],
|
||||
'password': new_params['password']
|
||||
}
|
||||
|
||||
if new_params['password']:
|
||||
new_params['dsn'] = "{0} password={1}".format(
|
||||
new_params['dsn'], new_params.pop('password')
|
||||
)
|
||||
|
||||
conn_params.update({
|
||||
k: unicode2utf8(v) for k, v in new_params.items() if v
|
||||
})
|
||||
|
||||
conn = psycopg2.connect(**conn_params)
|
||||
cursor = conn.cursor()
|
||||
|
|
1
setup.py
1
setup.py
|
@ -62,6 +62,7 @@ setup(
|
|||
'Programming Language :: Python :: 3.4',
|
||||
'Programming Language :: Python :: 3.5',
|
||||
'Programming Language :: Python :: 3.6',
|
||||
'Programming Language :: Python :: 3.7',
|
||||
'Programming Language :: SQL',
|
||||
'Topic :: Database',
|
||||
'Topic :: Database :: Front-Ends',
|
||||
|
|
Loading…
Reference in New Issue