Skip to content

Commit

Permalink
Add support for connecting to MySQL over SSL using the :sslca, :sslke…
Browse files Browse the repository at this point in the history
…y, and related options
  • Loading branch information
jeremyevans committed Nov 2, 2010
1 parent 5efcce6 commit c62b955
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
@@ -1,5 +1,7 @@
=== HEAD

* Add support for connecting to MySQL over SSL using the :sslca, :sslkey, and related options (jeremyevans)

* Fix Database#each_server when used with jdbc or do connection strings without separate :adapter option (jeremyevans) (#312)

* Much better support in the AS400 JDBC subadapter (bhauff)
Expand Down
1 change: 1 addition & 0 deletions lib/sequel/adapters/mysql.rb
Expand Up @@ -93,6 +93,7 @@ def connect(server)
conn = Mysql.init
conn.options(Mysql::READ_DEFAULT_GROUP, opts[:config_default_group] || "client")
conn.options(Mysql::OPT_LOCAL_INFILE, opts[:config_local_infile]) if opts.has_key?(:config_local_infile)
conn.ssl_set(opts[:sslkey], opts[:sslcert], opts[:sslca], opts[:sslcapath], opts[:sslcipher]) if opts[:sslca] || opts[:sslkey]
if encoding = opts[:encoding] || opts[:charset]
# Set encoding before connecting so that the mysql driver knows what
# encoding we want to use, but this can be overridden by READ_DEFAULT_GROUP.
Expand Down

0 comments on commit c62b955

Please sign in to comment.