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

[mysql] Fix bug when options is empty #637

Merged
merged 4 commits into from
Jul 28, 2017
Merged

[mysql] Fix bug when options is empty #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba6cee8
[mysql] Fix bug when options is empty
Jul 28, 2017
977e90d
Changed syntax to be more pythonic, added a comment
Jul 28, 2017
014864c
Merge branch 'master' into antoine/fix-mysql-bug-noinnodb-options
antoinepouille Jul 28, 2017
cdfbd07
Fix syntax in CHANGELOG
Jul 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions mysql/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# CHANGELOG - mysql

1.0.4 / Unreleased
==================

### Changes

* [BUGFIX] Fix bug when options dict is empty. See [637][]

1.0.3 / 2017-05-11
==================

Expand Down
2 changes: 1 addition & 1 deletion mysql/check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ def _get_config(self, instance):
user = instance.get('user', '')
password = str(instance.get('pass', ''))
tags = instance.get('tags', [])
options = instance.get('options', {})
options = instance.get('options', {}) or {} # options could be None if empty in the YAML
queries = instance.get('queries', [])
ssl = instance.get('ssl', {})
connect_timeout = instance.get('connect_timeout', None)
Expand Down
2 changes: 1 addition & 1 deletion mysql/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": "0.1.0",
"name": "MySQL",
"display_name": "MySQL",
"version": "1.0.3",
"version": "1.0.4",
"support": "core",
"supported_os": [
"linux",
Expand Down