From 147783528c5dbfdd7c5f2372d04ede4dfbdf8c1b Mon Sep 17 00:00:00 2001 From: "Kahlil (Kal) Hodgson" Date: Fri, 29 Nov 2013 10:50:01 +1100 Subject: [PATCH] postgres_db CHECKMODE changed status Make the changed status for postgres_db under CHECKMODE match the status that would be returned normally. --- database/postgresql_db | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/database/postgresql_db b/database/postgresql_db index f7274da8846..ddd3ccbc59c 100644 --- a/database/postgresql_db +++ b/database/postgresql_db @@ -192,6 +192,23 @@ def db_create(cursor, db, owner, template, encoding, lc_collate, lc_ctype): else: 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. # @@ -254,7 +271,12 @@ def main(): try: 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": changed = db_delete(cursor, db)