File tree 2 files changed +7
-5
lines changed
2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -107,6 +107,8 @@ def self.cmd_options(options)
107
107
options . each do |opt |
108
108
if opt == 'GRANT'
109
109
option_string << ' WITH GRANT OPTION'
110
+ elsif op = opt . match ( /^REQUIRE\s (SSL|X509)$/ )
111
+ option_string << " #{ op [ 0 ] } "
110
112
end
111
113
end
112
114
option_string
Original file line number Diff line number Diff line change @@ -46,11 +46,11 @@ def self.instances
46
46
end
47
47
end
48
48
# Same here, but to remove OPTION leaving just GRANT.
49
- if rest . match ( /WITH \s GRANT \s OPTION/ )
50
- options = [ 'GRANT' ]
51
- else
52
- options = [ 'NONE' ]
53
- end
49
+ options = [ ]
50
+ options << 'GRANT' if rest . match ( /WITH \s GRANT \s OPTION/ )
51
+ req_opt = rest . match ( /REQUIRE \s (SSL|X509)/ )
52
+ options << req_opt [ 0 ] if req_opt
53
+ options << 'NONE' if options . empty?
54
54
# fix double backslash that MySQL prints, so resources match
55
55
table . gsub! ( "\\ \\ " , "\\ " )
56
56
# We need to return an array of instances so capture these
You can’t perform that action at this time.
0 commit comments