postgres_db CHECKMODE changed status
Make the changed status for postgres_db under CHECKMODE match the status that would be returned normally.pull/4420/head
parent
18b6372c63
commit
ab14ec840b
|
@ -192,6 +192,23 @@ def db_create(cursor, db, owner, template, encoding, lc_collate, lc_ctype):
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
def db_matches(cursor, db, owner, template, encoding, lc_collate, lc_ctype):
|
||||||
|
if not db_exists(cursor, db):
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
db_info = get_db_info(cursor, db)
|
||||||
|
if (encoding and
|
||||||
|
get_encoding_id(cursor, encoding) != db_info['encoding_id']):
|
||||||
|
return False
|
||||||
|
elif lc_collate and lc_collate != db_info['lc_collate']:
|
||||||
|
return False
|
||||||
|
elif lc_ctype and lc_ctype != db_info['lc_ctype']:
|
||||||
|
return False
|
||||||
|
elif owner and owner != db_info['owner']:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return True
|
||||||
|
|
||||||
# ===========================================
|
# ===========================================
|
||||||
# Module execution.
|
# Module execution.
|
||||||
#
|
#
|
||||||
|
@ -254,7 +271,12 @@ def main():
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if module.check_mode:
|
if module.check_mode:
|
||||||
module.exit_json(changed=True,db=db)
|
if state == "absent":
|
||||||
|
changed = not db_exists(cursor, db)
|
||||||
|
elif state == "present":
|
||||||
|
changed = not db_matches(cursor, db, owner, template, encoding,
|
||||||
|
lc_collate, lc_ctype)
|
||||||
|
module.exit_json(changed=changed,db=db)
|
||||||
|
|
||||||
if state == "absent":
|
if state == "absent":
|
||||||
changed = db_delete(cursor, db)
|
changed = db_delete(cursor, db)
|
||||||
|
|
Loading…
Reference in New Issue