do_mysql 0.10.11-x86-mingw32 → 0.10.12-x86-mingw32

data/ChangeLog.markdown

@@ -1,3 +1,8 @@
+## 0.10.12 2013-01-21
+
+* jdbc-mysql driver loading fix
+* Improve compatibility for anscient MySQL versions
+
 ## 0.10.11 2012-12-29
 
 * Rename C symbols to prevent name collitions

data/ext/do_mysql/do_mysql.c

@@ -341,13 +341,13 @@ void do_mysql_full_connect(VALUE self, MYSQL *db) {
 
 // For really anscient MySQL versions we don't attempt any strictness
 #ifdef HAVE_MYSQL_GET_SERVER_VERSION
-  //4.x versions do not support certain session parameters
-  if (mysql_get_server_version(db) < 50000) {
-    do_mysql_cCommand_execute(Qnil, self, db, rb_str_new2("SET SESSION sql_mode = 'ANSI,NO_DIR_IN_CREATE,NO_UNSIGNED_SUBTRACTION'"));
-  }
-  else {
+  //4.0 does not support sql_mode at all, while later 4.x versions do not support certain session parameters
+  if (mysql_get_server_version(db) >= 50000) {
     do_mysql_cCommand_execute(Qnil, self, db, rb_str_new2("SET SESSION sql_mode = 'ANSI,NO_BACKSLASH_ESCAPES,NO_DIR_IN_CREATE,NO_ENGINE_SUBSTITUTION,NO_UNSIGNED_SUBTRACTION,TRADITIONAL'"));
   }
+  else if (mysql_get_server_version(db) >= 40100) {
+    do_mysql_cCommand_execute(Qnil, self, db, rb_str_new2("SET SESSION sql_mode = 'ANSI,NO_DIR_IN_CREATE,NO_UNSIGNED_SUBTRACTION'"));
+  }
 #endif
 
   rb_iv_set(self, "@connection", Data_Wrap_Struct(rb_cObject, 0, 0, db));

data/lib/do_mysql.rb

@@ -13,6 +13,7 @@ if RUBY_PLATFORM =~ /java/
     java.lang.Thread.currentThread.getContextClassLoader().loadClass(DataObjects::Mysql::JDBC_DRIVER, true)
   rescue java.lang.ClassNotFoundException
     require 'jdbc/mysql' # the JDBC driver, packaged as a gem
+    Jdbc::MySQL.load_driver if Jdbc::MySQL.respond_to?(:load_driver)
   end
 
   # Another way of loading the JDBC Class. This seems to be more reliable

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = '0.10.11'
+    VERSION = '0.10.12'
   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.11'
+      gem.add_dependency 'do_jdbc',    '0.10.12'
     end
   end
 rescue LoadError

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 11
-  version: 0.10.11
+  - 12
+  version: 0.10.12
 platform: x86-mingw32
 authors: 
 - Dirkjan Bussink
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-29 00:00:00 +01:00
+date: 2013-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 10
-        - 11
-        version: 0.10.11
+        - 12
+        version: 0.10.12
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false