From c62b955ebb1ff83ceefd4e5bf190a06992f4e705 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Tue, 2 Nov 2010 11:55:14 -0700 Subject: [PATCH] Add support for connecting to MySQL over SSL using the :sslca, :sslkey, and related options --- CHANGELOG | 2 ++ lib/sequel/adapters/mysql.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 47774fbaac..6b41aeb89b 100644 --- a/CHANGELOG +++ b/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) diff --git a/lib/sequel/adapters/mysql.rb b/lib/sequel/adapters/mysql.rb index 5c913b508e..dc5ed10b72 100644 --- a/lib/sequel/adapters/mysql.rb +++ b/lib/sequel/adapters/mysql.rb @@ -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.