mysql2 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9532497d6cec810bf247db1d89f9792d712f69802363e3365cd92f832933f65e
-  data.tar.gz: 469ef49b3d79efebfa9b716b8e7e833962fdf94be89955d0252311398b7c33c6
+  metadata.gz: d8e25b1a25080490b1bf04829d8f6616609391a094baa783d7da242342a4ff3b
+  data.tar.gz: 7dfab0d03b289b665807d21b29326b96711e5c1d3ae697e81f0e4ab7a5dd6280
 SHA512:
-  metadata.gz: '076963e960177838a9b0438efa04e0a2c34ef90d1c4b85542b9f510b6c4016a9032e3f1d08be3e987fcf1427da741f2e1ba02c27b58a8ca3a4b071cb16de255c'
-  data.tar.gz: 04227cd2b437d2af587d9411cf77776e9ef3dda1bdf31273e3ba1cf0958d060459096a9ab1a8ba2fb927004a6bcf0a0e941ae07fd0d172a3b56464125c9d31e7
+  metadata.gz: 3709403d316832055596c96af2e260e3de9d181ba558f551f0d5fe0d89abfec0ea242f6c30228eac02284e1e7287cbd315933fadc517fab88a10d588c4f0d8b6
+  data.tar.gz: 63c17fa1c273cefa454ea7f6cc0860014514e4c899ceb1bd856271cd238938a4d0fb263118eb64dde0a9568905d6410110fbe3b8359bff3fab8314607de6dd50

data/README.md

@@ -94,7 +94,7 @@ the library file `libmysqlclient.so` but is missing the header file `mysql.h`
 
 ### Mac OS X
 
-You may use Homebew, MacPorts, or a native MySQL installer package. The most
+You may use Homebrew, MacPorts, or a native MySQL installer package. The most
 common paths will be automatically searched. If you want to select a specific
 MySQL directory, use the `--with-mysql-dir` or `--with-mysql-config` options above.
 

data/ext/mysql2/client.c

@@ -1435,12 +1435,31 @@ static VALUE set_charset_name(VALUE self, VALUE value) {
 static VALUE set_ssl_options(VALUE self, VALUE key, VALUE cert, VALUE ca, VALUE capath, VALUE cipher) {
   GET_CLIENT(self);
 
+#ifdef HAVE_MYSQL_SSL_SET
   mysql_ssl_set(wrapper->client,
       NIL_P(key)    ? NULL : StringValueCStr(key),
       NIL_P(cert)   ? NULL : StringValueCStr(cert),
       NIL_P(ca)     ? NULL : StringValueCStr(ca),
       NIL_P(capath) ? NULL : StringValueCStr(capath),
       NIL_P(cipher) ? NULL : StringValueCStr(cipher));
+#else
+  /* mysql 8.3 does not provide mysql_ssl_set */
+  if (!NIL_P(key)) {
+    mysql_options(wrapper->client, MYSQL_OPT_SSL_KEY, StringValueCStr(key));
+  }
+  if (!NIL_P(cert)) {
+    mysql_options(wrapper->client, MYSQL_OPT_SSL_CERT, StringValueCStr(cert));
+  }
+  if (!NIL_P(ca)) {
+    mysql_options(wrapper->client, MYSQL_OPT_SSL_CA, StringValueCStr(ca));
+  }
+  if (!NIL_P(capath)) {
+    mysql_options(wrapper->client, MYSQL_OPT_SSL_CAPATH, StringValueCStr(capath));
+  }
+  if (!NIL_P(cipher)) {
+    mysql_options(wrapper->client, MYSQL_OPT_SSL_CIPHER, StringValueCStr(cipher));
+  }
+#endif
 
   return self;
 }

data/ext/mysql2/extconf.rb

@@ -164,6 +164,9 @@ have_const('MYSQL_OPTION_MULTI_STATEMENTS_OFF', mysql_h)
 # to retain compatibility with the typedef in earlier MySQLs.
 have_type('my_bool', mysql_h)
 
+# detect mysql functions
+have_func('mysql_ssl_set', mysql_h)
+
 ### Compiler flags to help catch errors
 
 # This is our wishlist. We use whichever flags work on the host.

data/ext/mysql2/mysql_enc_name_to_ruby.h

@@ -51,7 +51,7 @@ mysql2_mysql_enc_name_to_rb_hash (str, len)
       74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
       74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
       74, 74, 74, 74, 74, 74, 74, 74, 15,  5,
-       0, 74,  5, 25, 40, 10, 20, 50, 74, 74,
+       0, 30,  5, 25, 40, 10, 20, 50, 74, 74,
       74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
       74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
       74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
@@ -89,7 +89,7 @@ mysql2_mysql_enc_name_to_rb (str, len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 41,
+      TOTAL_KEYWORDS = 42,
       MIN_WORD_LENGTH = 3,
       MAX_WORD_LENGTH = 8,
       MIN_HASH_VALUE = 3,
@@ -133,7 +133,8 @@ mysql2_mysql_enc_name_to_rb (str, len)
       {"big5", "Big5"},
       {"euckr", "EUC-KR"},
       {"latin2", "ISO-8859-2"},
-      {""}, {""},
+      {"utf8mb3", "UTF-8"},
+      {""},
       {"dec8", NULL},
       {"cp850", "CP850"},
       {"latin1", "ISO-8859-1"},

data/ext/mysql2/mysql_enc_to_ruby.h

@@ -306,5 +306,20 @@ static const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-8",
   "UTF-8",
   "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
   "UTF-8"
 };

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.5.5".freeze
+  VERSION = "0.5.6".freeze
 end

data/support/mysql_enc_to_ruby.rb

@@ -33,6 +33,7 @@ mysql_to_rb = {
   "macroman" => "macRoman",
   "cp852"    => "CP852",
   "latin7"   => "ISO-8859-13",
+  "utf8mb3"  => "UTF-8",
   "utf8mb4"  => "UTF-8",
   "cp1251"   => "Windows-1251",
   "utf16"    => "UTF-16",

data/support/ruby_enc_to_mysql.rb

@@ -28,6 +28,7 @@ mysql_to_rb = {
   "macroman" => "macRoman",
   "cp852"    => "CP852",
   "latin7"   => "ISO-8859-13",
+  "utf8mb3"  => "UTF-8",
   "utf8mb4"  => "UTF-8",
   "cp1251"   => "Windows-1251",
   "utf16"    => "UTF-16",

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Brian Lopez
 - Aaron Stone
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-22 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email:
 - seniorlopez@gmail.com
 - aaron@serendipity.cx
@@ -57,12 +57,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/brianmario/mysql2/issues
-  changelog_uri: https://github.com/brianmario/mysql2/releases/tag/0.5.5
-  documentation_uri: https://www.rubydoc.info/gems/mysql2/0.5.5
+  changelog_uri: https://github.com/brianmario/mysql2/releases/tag/0.5.6
+  documentation_uri: https://www.rubydoc.info/gems/mysql2/0.5.6
   homepage_uri: https://github.com/brianmario/mysql2
-  source_code_uri: https://github.com/brianmario/mysql2/tree/0.5.5
+  source_code_uri: https://github.com/brianmario/mysql2/tree/0.5.6
   msys2_mingw_dependencies: libmariadbclient
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -78,8 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.6.0.dev
+signing_key:
 specification_version: 4
 summary: A simple, fast Mysql library for Ruby, binding to libmysql
 test_files: []