do_mysql 0.10.14 → 0.10.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2284f99889297d934ae660c21d94e7f6288a9375
-  data.tar.gz: cbf9a08f4551ef2d7aa4560b78913731ceed457b
+  metadata.gz: ec29f420849aeb00fc521cfc5457f13e34cef76e
+  data.tar.gz: 8075995943a7868c015d41a682f866d19e5cee8c
 SHA512:
-  metadata.gz: 60e28114e1fe072f313b428f750496e33aec515ac455b2510924243d701bb8a27091ec2e5469beea7794f2724e285ba1c7e7917f69072e547a3e42974a4a9d00
-  data.tar.gz: d7d0627e74812ec145ce28ff507eee0e3c56b6162d367e1bb7c5366b47980be2607491711c2cc2e3d277026a21526d44e994077413c369bc06a28bcebae1b06f
+  metadata.gz: 78be705e67d255c09c28ea1dedb8d0253447e83196d7b3a34c9a354405a4745064efb6b17c00f8d5f7dfc9b4e1ccb0d77ce82ed79085c107fd58dfc99949d395
+  data.tar.gz: 8961519f1b69b182b5c2d7e91b0dbd1a5cf0121852500a63850f20e7a81212a64e25da28076e41b4a65142e6765adc1959f6490bbc2fd927691ca9920f114005

data/ChangeLog.markdown

@@ -1,3 +1,9 @@
+## 0.10.15 2015-02-15
+
+* Ruby 2.2 support
+* utf8mb4 support on do\_mysql
+* Windows support on 2.1.x and 2.2.x
+
 ## 0.10.14 2014-02-13
 
 * Don't do DNS lookup in transaction loading

data/ext/do_mysql/do_common.c

@@ -63,7 +63,7 @@ void data_objects_debug(VALUE connection, VALUE string, struct timeval *start) {
   rb_funcall(connection, DO_ID_LOG, 1, message);
 }
 
-void data_objects_raise_error(VALUE self, const struct errcodes *errors, int errnum, const char *message, VALUE query, VALUE state) {
+void data_objects_raise_error(VALUE self, const struct errcodes *errors, int errnum, VALUE message, VALUE query, VALUE state) {
   const char *exception_type = "SQLError";
   const struct errcodes *e;
   VALUE uri, exception;
@@ -82,7 +82,7 @@ void data_objects_raise_error(VALUE self, const struct errcodes *errors, int err
     data_objects_const_get(mDO, exception_type),
     DO_ID_NEW,
     5,
-    rb_str_new2(message),
+    message,
     INT2NUM(errnum),
     state,
     query,

data/ext/do_mysql/do_common.h

@@ -123,7 +123,7 @@ static inline void data_objects_define_errors(VALUE scope, const struct errcodes
   }
 }
 
-extern void data_objects_raise_error(VALUE self, const struct errcodes *errors, int errnum, const char *message, VALUE query, VALUE state);
+extern void data_objects_raise_error(VALUE self, const struct errcodes *errors, int errnum, VALUE message, VALUE query, VALUE state);
 
 extern VALUE data_objects_typecast(const char *value, long length, const VALUE type, int encoding);
 

data/ext/do_mysql/do_mysql.c

@@ -22,6 +22,17 @@
 #define do_mysql_cCommand_execute do_mysql_cCommand_execute_async
 #endif
 
+#ifndef HAVE_RB_THREAD_FD_SELECT
+#define rb_fdset_t fd_set
+#define rb_fd_isset(n, f) FD_ISSET(n, f)
+#define rb_fd_init(f) FD_ZERO(f)
+#define rb_fd_zero(f)  FD_ZERO(f)
+#define rb_fd_set(n, f)  FD_SET(n, f)
+#define rb_fd_clr(n, f) FD_CLR(n, f)
+#define rb_fd_term(f)
+#define rb_thread_fd_select rb_thread_select
+#endif
+
 #define CHECK_AND_RAISE(mysql_result_value, query) if (0 != mysql_result_value) { do_mysql_raise_error(self, db, query); }
 
 void do_mysql_full_connect(VALUE self, MYSQL *db);
@@ -105,7 +116,7 @@ VALUE do_mysql_typecast(const char *value, long length, const VALUE type, int en
 
 void do_mysql_raise_error(VALUE self, MYSQL *db, VALUE query) {
   int errnum = mysql_errno(db);
-  const char *message = mysql_error(db);
+  VALUE message = rb_str_new2(mysql_error(db));
   VALUE sql_state = Qnil;
 
 #ifdef HAVE_MYSQL_SQLSTATE
@@ -154,13 +165,13 @@ MYSQL_RES *do_mysql_cCommand_execute_async(VALUE self, VALUE connection, MYSQL *
   CHECK_AND_RAISE(retval, query);
 
   int socket_fd = db->net.fd;
-  fd_set rset;
+  rb_fdset_t rset;
 
   while (1) {
-    FD_ZERO(&rset);
-    FD_SET(socket_fd, &rset);
+    rb_fd_init(&rset);
+    rb_fd_set(socket_fd, &rset);
 
-    retval = rb_thread_select(socket_fd + 1, &rset, NULL, NULL, NULL);
+    retval = rb_thread_fd_select(socket_fd + 1, &rset, NULL, NULL, NULL);
 
     if (retval < 0) {
       rb_sys_fail(0);

data/ext/do_mysql/extconf.rb

@@ -82,6 +82,8 @@ have_func 'mysql_set_character_set', 'mysql.h'
 have_func 'mysql_get_server_version', 'mysql.h'
 have_struct_member 'MYSQL_FIELD', 'charsetnr', 'mysql.h'
 
+have_func('rb_thread_fd_select')
+
 unless DateTime.respond_to?(:new!)
   $CFLAGS << ' -DHAVE_NO_DATETIME_NEWBANG'
 end

data/lib/do_mysql/encoding.rb

@@ -20,6 +20,7 @@ module DataObjects
         "GBK"          => "gbk",
         "ISO-8859-9"   => "latin5",
         "UTF-8"        => "utf8",
+        "UTF-8-MB4"    => "utf8mb4",
         "UTF-16BE"     => "ucs2",
         "IBM866"       => "cp866",
         "macCentEuro"  => "macce",

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = '0.10.14'
+    VERSION = '0.10.15'
   end
 end

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.14'
+      gem.add_dependency 'do_jdbc',    '0.10.15'
     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`
+  `rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0:2.1.5:2.2.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.14
+  version: 0.10.15
 platform: ruby
 authors:
 - Dirkjan Bussink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_objects
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.14
+        version: 0.10.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.14
+        version: 0.10.15
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Implements the DataObjects API for MySQL
@@ -112,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: dorb
-rubygems_version: 2.2.0.preview.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 3
 summary: DataObjects MySQL Driver