valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #42544 from perlchild/postgresql_schema

Browse Source 
Postgresql schema
This commit is contained in:
Mike Place 2017-07-27 12:40:20 -05:00 committed by GitHub
commit f3051a355b
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/modules/postgres.py
View File

@ -1955,7 +1955,7 @@ def schema_create(dbname, name, owner=None,
'''
# check if schema exists
if schema_exists(dbname, name,
if schema_exists(dbname, name, user=user,
db_user=db_user, db_password=db_password,
db_host=db_host, db_port=db_port):
log.info('\'{0}\' already exists in \'{1}\''.format(name, dbname))
@ -2010,7 +2010,7 @@ def schema_remove(dbname, name,
'''
# check if schema exists
if not schema_exists(dbname, name,
if not schema_exists(dbname, name, user=None,
db_user=db_user, db_password=db_password,
db_host=db_host, db_port=db_port):
log.info('Schema \'{0}\' does not exist in \'{1}\''.format(name, dbname))
@ -2024,7 +2024,7 @@ def schema_remove(dbname, name,
maintenance_db=dbname,
host=db_host, user=db_user, port=db_port, password=db_password)
if not schema_exists(dbname, name,
if not schema_exists(dbname, name, user,
db_user=db_user, db_password=db_password,
db_host=db_host, db_port=db_port):
return True
@ -2033,7 +2033,7 @@ def schema_remove(dbname, name,
return False
def schema_exists(dbname, name,
def schema_exists(dbname, name, user=None,
db_user=None, db_password=None,
db_host=None, db_port=None):
'''
@ -2051,6 +2051,9 @@ def schema_exists(dbname, name,
name
Schema name we look for
user
The system user the operation should be performed on behalf of
db_user
database username if different from config or default
@ -2065,14 +2068,14 @@ def schema_exists(dbname, name,
'''
return bool(
schema_get(dbname, name,
schema_get(dbname, name, user=user,
db_user=db_user,
db_host=db_host,
db_port=db_port,
db_password=db_password))
def schema_get(dbname, name,
def schema_get(dbname, name, user=None,
db_user=None, db_password=None,
db_host=None, db_port=None):
'''
@ -2090,6 +2093,9 @@ def schema_get(dbname, name,
name
Schema name we look for
user
The system user the operation should be performed on behalf of
db_user
database username if different from config or default
@ -2102,7 +2108,7 @@ def schema_get(dbname, name,
db_port
Database port if different from config or default
'''
all_schemas = schema_list(dbname,
all_schemas = schema_list(dbname, user=user,
db_user=db_user,
db_host=db_host,
db_port=db_port,
@ -2114,7 +2120,7 @@ def schema_get(dbname, name,
return False
def schema_list(dbname,
def schema_list(dbname, user=None,
db_user=None, db_password=None,
db_host=None, db_port=None):
'''
@ -2129,6 +2135,9 @@ def schema_list(dbname,
dbname
Database name we query on
user
The system user the operation should be performed on behalf of
db_user
database username if different from config or default
@ -2153,7 +2162,7 @@ def schema_list(dbname,
'LEFT JOIN pg_roles ON pg_roles.oid = pg_namespace.nspowner '
]))
rows = psql_query(query,
rows = psql_query(query, runas=user,
host=db_host,
user=db_user,
port=db_port,

17
salt/states/postgres_schema.py
View File

@ -29,7 +29,7 @@ def __virtual__():
def present(dbname, name,
owner=None,
owner=None, user=None,
db_user=None, db_password=None,
db_host=None, db_port=None):
'''
@ -41,8 +41,8 @@ def present(dbname, name,
name
The name of the schema to manage
owner
The database user that will be the owner of the schema
user
system user all operations should be performed on behalf of
db_user
database username if different from config or default
@ -67,7 +67,8 @@ def present(dbname, name,
'db_user': db_user,
'db_password': db_password,
'db_host': db_host,
'db_port': db_port
'db_port': db_port,
'runas': user
}
# check if schema exists
@ -105,7 +106,7 @@ def present(dbname, name,
return ret
def absent(dbname, name,
def absent(dbname, name, user=None,
db_user=None, db_password=None,
db_host=None, db_port=None):
'''
@ -117,6 +118,9 @@ def absent(dbname, name,
name
The name of the schema to remove
user
system user all operations should be performed on behalf of
db_user
database username if different from config or default
@ -139,7 +143,8 @@ def absent(dbname, name,
'db_user': db_user,
'db_password': db_password,
'db_host': db_host,
'db_port': db_port
'db_port': db_port,
'runas': user
}
# check if schema exists and remove it