rattail/rattail-fabric
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Accept port arg when running postgresql script

Browse source
This commit is contained in:
Lance Edgar 2018-03-01 18:51:45 -06:00
parent 764af27c31
commit 90e5133995
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rattail_fabric/postgresql.py
View file

@ -62,18 +62,20 @@ def sql(sql, database='', port=None):
return sudo(cmd, shell=False) return sudo(cmd, shell=False)
def script(path, database='', user=None, password=None): def script(path, database='', port=None, user=None, password=None):
""" """
Execute a SQL script. By default this will run as 'postgres' user, but can Execute a SQL script. By default this will run as 'postgres' user, but can
use PGPASSWORD authentication if necessary. use PGPASSWORD authentication if necessary.
""" """
port = '--port={}'.format(port) if port else ''
if user and password: if user and password:
with hide('running'): with hide('running'):
return sudo(" PGPASSWORD='{}' psql --host=localhost --username='{}' --file='{}' {}".format( kw = dict(pw=password, user=user, port=port, path=path, db=database)
password, user, path, database)) return sudo(" PGPASSWORD='{pw}' psql --host=localhost {port} --username='{user}' --file='{path}' {db}".format(**kw))
else: # run as postgres else: # run as postgres
return sudo("sudo -u postgres psql --file='{}' {}".format(path, database), shell=False) kw = dict(port=port, path=path, db=database)
return sudo("sudo -u postgres psql {port} --file='{path}' {db}".format(**kw), shell=False)
def user_exists(name, port=None): def user_exists(name, port=None):