do_mysql 0.10.16-java → 0.10.17-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01b2680113efb8e5f129d8ea4a01247a93e00ee3
-  data.tar.gz: 3a23d0669b9f13b189e8c959055ee1ebd371b6fc
+  metadata.gz: 19d156069f01c95b708ae4b39584eac156c7db2b
+  data.tar.gz: 5da301c9eff52311e39aeb680276d21260df4772
 SHA512:
-  metadata.gz: 1a26814c83b15d54652249ad945a7b0f3b1c8719995c7e1863642adcce58d34ac0f829388fc0c2534057059d946a63f504bfdc0d2a62e2ec3041387cf933b09c
-  data.tar.gz: bf4d4ba17f0913c8bc64f2596f67c047afb5fa2ccbbcc71756aa839827b8018c5aa7377a907a5937c2c9d88f5a2c1aee8421a19aa997707adc400245e4804986
+  metadata.gz: 8b023c6161691488d5b74823158bf63b26c7aacef93e37697f26bdae8e6ce95818ebc43d7c64697e9228fce115e52e22ab10498b99549be340856cbb5c7fc41c
+  data.tar.gz: fef40fe45d3606316b7a6c29763c4c7eb29d19d8d1853348067814e2594b8a22fe0508ce55795421a89ec0f0dd38619f8e0673c69c8f8ab9959c779825edaa44

data/ChangeLog.markdown

@@ -1,3 +1,14 @@
+## 0.10.17 2016-01-24
+
+* Improve utf8mb4 support
+* Fix memory leak
+* Support for MySQL 5.7
+* Fix bug with DateTime and wrong timezone offsets 
+
+## 0.10.16 2015-05-17
+
+No changes
+
 ## 0.10.15 2015-02-15
 
 * Ruby 2.2 support

data/ext/do_mysql/do_common.c

@@ -3,6 +3,9 @@
 #include <math.h>
 #include <ctype.h>
 #include <time.h>
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
 
 #include "do_common.h"
 

data/ext/do_mysql/do_mysql.c

@@ -1,5 +1,8 @@
 #include <ruby.h>
 #include <time.h>
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
 #include <string.h>
 
 #include <mysql.h>
@@ -166,14 +169,15 @@ MYSQL_RES *do_mysql_cCommand_execute_async(VALUE self, VALUE connection, MYSQL *
 
   int socket_fd = db->net.fd;
   rb_fdset_t rset;
+  rb_fd_init(&rset);
+  rb_fd_set(socket_fd, &rset);
 
   while (1) {
-    rb_fd_init(&rset);
-    rb_fd_set(socket_fd, &rset);
 
     retval = rb_thread_fd_select(socket_fd + 1, &rset, NULL, NULL, NULL);
 
     if (retval < 0) {
+      rb_fd_term(&rset);
       rb_sys_fail(0);
     }
 
@@ -185,6 +189,7 @@ MYSQL_RES *do_mysql_cCommand_execute_async(VALUE self, VALUE connection, MYSQL *
       break;
     }
   }
+  rb_fd_term(&rset);
 
   retval = mysql_read_query_result(db);
   CHECK_AND_RAISE(retval, query);
@@ -329,7 +334,11 @@ void do_mysql_full_connect(VALUE self, MYSQL *db) {
     }
     else {
 #ifdef HAVE_RUBY_ENCODING_H
-      rb_iv_set(self, "@encoding_id", INT2FIX(rb_enc_find_index(rb_str_ptr_readonly(encoding))));
+      const char* ruby_encoding = rb_str_ptr_readonly(encoding);
+      if (strcasecmp("UTF-8-MB4", ruby_encoding) == 0) {
+        ruby_encoding = "UTF-8";
+      }
+      rb_iv_set(self, "@encoding_id", INT2FIX(rb_enc_find_index(ruby_encoding)));
 #endif
 
       rb_iv_set(self, "@my_encoding", my_encoding);
@@ -465,7 +474,16 @@ VALUE do_mysql_cConnection_quote_string(VALUE self, VALUE string) {
   VALUE result;
 
   // Escape 'source' using the current encoding in use on the conection 'db'
+#ifdef HAVE_MYSQL_REAL_ESCAPE_STRING_QUOTE
+  quoted_length = mysql_real_escape_string_quote(db, escaped + 1, source, source_len, '\'');
+#else
   quoted_length = mysql_real_escape_string(db, escaped + 1, source, source_len);
+#endif
+
+  if (quoted_length == (unsigned long)-1) {
+    free(escaped);
+    rb_raise(rb_eArgError, "Failed to quote string. Make sure to (re)compile do_mysql against the correct libmysqlclient");
+  }
 
   // Wrap the escaped string in single-quotes, this is DO's convention
   escaped[0] = escaped[quoted_length + 1] = '\'';

data/ext/do_mysql/extconf.rb

@@ -80,6 +80,7 @@ have_func 'mysql_sqlstate', 'mysql.h'
 have_func 'mysql_get_ssl_cipher', 'mysql.h'
 have_func 'mysql_set_character_set', 'mysql.h'
 have_func 'mysql_get_server_version', 'mysql.h'
+have_func 'mysql_real_escape_string_quote', 'mysql.h'
 have_struct_member 'MYSQL_FIELD', 'charsetnr', 'mysql.h'
 
 have_func('rb_thread_fd_select')

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = '0.10.16'
+    VERSION = '0.10.17'
   end
 end

data/spec/encoding_spec.rb

@@ -6,5 +6,42 @@ require 'data_objects/spec/shared/encoding_spec'
 describe DataObjects::Mysql::Connection do
   it_should_behave_like 'a driver supporting different encodings'
   it_should_behave_like 'returning correctly encoded strings for the default database encoding'
-  it_should_behave_like 'returning correctly encoded strings for the default internal encoding'
+  it_should_behave_like 'returning correctly encoded strings for the default internal encoding' unless JRUBY
+
+  unless JRUBY
+    describe 'sets the character set through the URI' do
+      before do
+        @utf8mb4_connection = DataObjects::Connection.new("#{CONFIG.scheme}://#{CONFIG.user}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}?encoding=UTF-8-MB4")
+      end
+
+      after { @utf8mb4_connection.close }
+
+      it { @utf8mb4_connection.character_set.should == 'UTF-8-MB4' }
+
+      describe 'writing a multibyte String' do
+        it 'should write a multibyte String' do
+          @command = @utf8mb4_connection.create_command('INSERT INTO users_mb4 (name) VALUES(?)')
+          expect { @command.execute_non_query("😀") }.not_to raise_error(DataObjects::DataError)
+        end
+      end
+
+      describe 'reading a String' do
+        before do
+          @reader = @utf8mb4_connection.create_command("SELECT name FROM users_mb4").execute_reader
+          @reader.next!
+          @values = @reader.values
+        end
+
+        after do
+          @reader.close
+        end
+
+        it 'should return UTF-8 encoded String' do
+          @values.first.should be_kind_of(String)
+          @values.first.encoding.name.should == 'UTF-8'
+          @values.first.should == "😀"
+        end
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -62,6 +62,10 @@ module DataObjectsSpecHelpers
       DROP TABLE IF EXISTS `users`
     EOF
 
+    conn.create_command(<<-EOF).execute_non_query
+      DROP TABLE IF EXISTS `users_mb4`
+    EOF
+
     conn.create_command(<<-EOF).execute_non_query
       DROP TABLE IF EXISTS `stuff`
     EOF
@@ -79,6 +83,14 @@ module DataObjectsSpecHelpers
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
     EOF
 
+    conn.create_command(<<-EOF).execute_non_query
+      CREATE TABLE `users_mb4` (
+        `id` int(11) NOT NULL auto_increment,
+        `name` varchar(200),
+        PRIMARY KEY  (`id`)
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+    EOF
+
     conn.create_command(<<-EOF).execute_non_query
       CREATE TABLE `invoices` (
         `invoice_number` varchar(50) NOT NULL,

data/tasks/compile.rake

@@ -56,7 +56,7 @@ begin
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|
       gem.add_dependency 'jdbc-mysql', '>=5.0.4'
-      gem.add_dependency 'do_jdbc',    '0.10.16'
+      gem.add_dependency 'do_jdbc',    '0.10.17'
     end
   end
 rescue LoadError

data/tasks/release.rake

@@ -3,7 +3,7 @@ task :build_all do
   `rake clean`
   `rake build`
   `rake java gem`
-  `rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0:2.1.5:2.2.0`
+  `rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0:2.1.8:2.2.4:2.3.0`
 end
 
 desc 'Release all gems (native, binaries for JRuby and Windows)'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: do_mysql
 version: !ruby/object:Gem::Version
-  version: 0.10.16
+  version: 0.10.17
 platform: java
 authors:
 - Dirkjan Bussink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_objects
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.16
+        version: 0.10.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.16
+        version: 0.10.17
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.16
+        version: 0.10.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.16
+        version: 0.10.17
 description: Implements the DataObjects API for MySQL
 email: d.bussink@gmail.com
 executables: []