Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes to postgresql to support defaults settings and older psycopg2 #876

Merged
merged 2 commits into from
Aug 14, 2012
Merged

Changes to postgresql to support defaults settings and older psycopg2 #876

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95fc5dd
Fix using postgres default values
Aug 14, 2012
7dcd1bd
Autocommit support for psycopg2 < 2.4.2
Aug 14, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 18 additions & 5 deletions library/postgresql_db
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,26 @@ def main():
encoding = module.params["encoding"]
state = module.params["state"]
changed = False

# To use defaults values, keyword arguments must be absent, so
# check which values are empty and don't include in the **kw
# dictionary
params_map = {
"login_host":"host",
"login_user":"user",
"login_password":"password"
}
kw = dict( (params_map[k], v) for (k, v) in module.params.iteritems()
if k in params_map and v != '' )
try:
db_connection = psycopg2.connect(host=module.params["login_host"],
user=module.params["login_user"],
password=module.params["login_password"],
database="template1")
db_connection = psycopg2.connect(database="template1", **kw)
# Enable autocommit so we can create databases
db_connection.autocommit = True
if psycopg2.__version__ >= '2.4.2':
db_connection.autocommit = True
else:
db_connection.set_isolation_level(psycopg2
.extensions
.ISOLATION_LEVEL_AUTOCOMMIT)
cursor = db_connection.cursor()
except Exception, e:
module.fail_json(msg="unable to connect to database: %s" % e)
Expand Down