saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #30221 from mbarrien/postgres-9.5

Browse source 
No rolcatupdate for user_exist in Postgres>=9.5 #26845
This commit is contained in:
Mike Place 2016-01-14 09:52:49 -07:00
commit ba8d128025
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/modules/postgres.py
View file

@ -658,6 +658,10 @@ def user_list(user=None, host=None, port=None, maintenance_db=None,
replication_column = 'pg_roles.rolreplication'
else:
replication_column = 'NULL'
if ver >= distutils.version.LooseVersion('9.5'):
rolcatupdate_column = 'NULL'
else:
rolcatupdate_column = 'pg_roles.rolcatupdate'
else:
log.error('Could not retrieve Postgres version. Is Postgresql server running?')
return False
@ -672,9 +676,9 @@ def user_list(user=None, host=None, port=None, maintenance_db=None,
'pg_roles.rolinherit as "inherits privileges", '
'pg_roles.rolcreaterole as "can create roles", '
'pg_roles.rolcreatedb as "can create databases", '
'pg_roles.rolcatupdate as "can update system catalogs", '
'{0} as "can update system catalogs", '
'pg_roles.rolcanlogin as "can login", '
'{0} as "replication", '
'{1} as "replication", '
'pg_roles.rolconnlimit as "connections", '
'pg_roles.rolvaliduntil::timestamp(0) as "expiry time", '
'pg_roles.rolconfig as "defaults variables" '
@ -682,7 +686,7 @@ def user_list(user=None, host=None, port=None, maintenance_db=None,
'FROM pg_roles '
, _x('LEFT JOIN pg_authid ON pg_roles.oid = pg_authid.oid ')
, _x('LEFT JOIN pg_shadow ON pg_roles.oid = pg_shadow.usesysid')
]).format(replication_column))
]).format(rolcatupdate_column, replication_column))
rows = psql_query(query,
runas=runas,