do_mysql 0.10.2-java → 0.10.3-java

data/ChangeLog.markdown

@@ -1,3 +1,7 @@
+## 0.10.3 2011-01-30
+* Reworked transactions
+* Fix a DST bug that could cause datetimes in the wrong timezone
+
 ## 0.10.2 2010-05-19
 * Make sure Text is returned in the proper encoding
 * Make Encoding.default_internal aware

data/Rakefile

@@ -11,7 +11,7 @@ JRUBY    = RUBY_PLATFORM =~ /java/
 IRONRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
 WINDOWS  = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i)
 SUDO     = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-BINARY_VERSION = '5.1.46'
+BINARY_VERSION = '5.1.54'
 
 CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_mysql/Makefile ext-java/target ])
 
@@ -38,7 +38,7 @@ begin
     gem.add_dependency 'data_objects', DataObjects::Mysql::VERSION
 
     gem.add_development_dependency 'bacon',         '~>1.1'
-    gem.add_development_dependency 'rake-compiler', '~>0.7'
+    gem.add_development_dependency 'rake-compiler', '= 0.7.0'
 
     gem.has_rdoc = false
     gem.rubyforge_project = 'dorb'

data/ext/do_mysql/do_mysql.c

@@ -8,9 +8,14 @@
 #include <errmsg.h>
 #include <mysqld_error.h>
 
+#include "mysql_compat.h"
 #include "compat.h"
 #include "error.h"
 
+#ifndef HAVE_CONST_MYSQL_TYPE_STRING
+#define HAVE_OLD_MYSQL_VERSION
+#endif
+
 #define CONST_GET(scope, constant) (rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant)))
 #define DRIVER_CLASS(klass, parent) (rb_define_class_under(mMysql, klass, parent))
 #define CHECK_AND_RAISE(mysql_result_value, query) if (0 != mysql_result_value) { raise_error(self, db, query); }
@@ -105,14 +110,18 @@ static VALUE infer_ruby_type(MYSQL_FIELD *field) {
       return Qnil;
     case MYSQL_TYPE_TINY:
       return rb_cTrueClass;
+#ifdef HAVE_CONST_MYSQL_TYPE_BIT
     case MYSQL_TYPE_BIT:
+#endif
     case MYSQL_TYPE_SHORT:
     case MYSQL_TYPE_LONG:
     case MYSQL_TYPE_INT24:
     case MYSQL_TYPE_LONGLONG:
     case MYSQL_TYPE_YEAR:
       return rb_cInteger;
+#ifdef HAVE_CONST_MYSQL_TYPE_NEWDECIMAL
     case MYSQL_TYPE_NEWDECIMAL:
+#endif
     case MYSQL_TYPE_DECIMAL:
       return rb_cBigDecimal;
     case MYSQL_TYPE_FLOAT:
@@ -130,11 +139,16 @@ static VALUE infer_ruby_type(MYSQL_FIELD *field) {
     case MYSQL_TYPE_MEDIUM_BLOB:
     case MYSQL_TYPE_LONG_BLOB:
     case MYSQL_TYPE_BLOB:
+#ifdef HAVE_ST_CHARSETNR
       if(field->charsetnr == 63) {
         return rb_cByteArray;
       } else {
         return rb_cString;
       }
+#else
+      // We assume a string here if we don't have a specific charset
+      return rb_cString;
+#endif
     default:
       return rb_cString;
   }
@@ -230,10 +244,10 @@ static VALUE parse_date_time(const char *date) {
 
 
   time_t gmt_offset;
-  int is_dst;
+  int dst_adjustment;
 
   time_t rawtime;
-  struct tm * timeinfo;
+  struct tm timeinfo;
 
   int tokens_read, max_tokens;
 
@@ -267,22 +281,48 @@ static VALUE parse_date_time(const char *date) {
     }
     // We read the Date and Time, default to the current locale's offset
 
+    tzset();
+
     // Get localtime
     time(&rawtime);
-    timeinfo = localtime(&rawtime);
+#ifdef HAVE_LOCALTIME_R
+    localtime_r(&rawtime, &timeinfo);
+#else
+    timeinfo = *localtime(&rawtime);
+#endif
+
+    timeinfo.tm_sec = sec;
+    timeinfo.tm_min = min;
+    timeinfo.tm_hour = hour;
+    timeinfo.tm_mday = day;
+    timeinfo.tm_mon = month;
+    timeinfo.tm_year = year - 1900;
+    timeinfo.tm_isdst = -1;
+
+    // Update tm_isdst
+    mktime(&timeinfo);
 
-    is_dst = timeinfo->tm_isdst * 3600;
+    if (timeinfo.tm_isdst) {
+      dst_adjustment = 3600;
+    } else {
+      dst_adjustment = 0;
+    }
 
     // Reset to GM Time
-    timeinfo = gmtime(&rawtime);
+#ifdef HAVE_GMTIME_R
+    gmtime_r(&rawtime, &timeinfo);
+#else
+    timeinfo = *gmtime(&rawtime);
+#endif
 
-    gmt_offset = mktime(timeinfo) - rawtime;
+    gmt_offset = rawtime - mktime(&timeinfo);
 
-    if ( is_dst > 0 )
-      gmt_offset -= is_dst;
+    if (dst_adjustment) {
+      gmt_offset += dst_adjustment;
+    }
 
-    hour_offset = -((int)gmt_offset / 3600);
-    minute_offset = -((int)gmt_offset % 3600 / 60);
+    hour_offset = ((int)gmt_offset / 3600);
+    minute_offset = ((int)gmt_offset % 3600 / 60);
 
   } else {
     // Something went terribly wrong
@@ -389,10 +429,15 @@ static void raise_error(VALUE self, MYSQL *db, VALUE query) {
 
   VALUE uri = rb_funcall(rb_iv_get(self, "@connection"), rb_intern("to_s"), 0);
 
+  VALUE sql_state = Qnil;
+#ifdef HAVE_MYSQL_SQLSTATE
+  sql_state = rb_str_new2(mysql_sqlstate(db));
+#endif
+
   exception = rb_funcall(CONST_GET(mDO, exception_type), ID_NEW, 5,
                          rb_str_new2(mysql_error_message),
                          INT2NUM(mysql_error_code),
-                         rb_str_new2(mysql_sqlstate(db)),
+                         sql_state,
                          query,
                          uri);
   rb_exc_raise(exception);
@@ -450,6 +495,7 @@ static MYSQL_RES* cCommand_execute_async(VALUE self, VALUE connection, MYSQL* db
   struct timeval start;
   const char* str = rb_str_ptr_readonly(query);
   size_t len      = rb_str_len(query);
+  MYSQL_RES* result;
 
   if((retval = mysql_ping(db)) && mysql_errno(db) == CR_SERVER_GONE_ERROR) {
     full_connect(connection, db);
@@ -485,7 +531,12 @@ static MYSQL_RES* cCommand_execute_async(VALUE self, VALUE connection, MYSQL* db
   CHECK_AND_RAISE(retval, query);
   data_objects_debug(connection, query, &start);
 
-  return mysql_store_result(db);
+  result = mysql_store_result(db);
+
+  if (!result)
+    CHECK_AND_RAISE(mysql_errno(db), query);
+
+  return result;
 }
 #endif
 
@@ -494,7 +545,7 @@ static void full_connect(VALUE self, MYSQL* db) {
   // Check to see if we're on the db machine.  If so, try to use the socket
   VALUE r_host, r_user, r_password, r_path, r_query, r_port;
 
-  const char *host = "localhost", *user = "root"; 
+  const char *host = "localhost", *user = "root";
   char *database = NULL, *socket = NULL, *password = NULL, *path = NULL;
   VALUE encoding = Qnil;
 
@@ -578,7 +629,7 @@ static void full_connect(VALUE self, MYSQL* db) {
     raise_error(self, db, Qnil);
   }
 
-#ifdef HAVE_MYSQL_SSL_SET
+#ifdef HAVE_MYSQL_GET_SSL_CIPHER
   const char *ssl_cipher_used = mysql_get_ssl_cipher(db);
 
   if (NULL != ssl_cipher_used) {
@@ -591,11 +642,20 @@ static void full_connect(VALUE self, MYSQL* db) {
   mysql_options(db, MYSQL_OPT_RECONNECT, &reconnect);
 #endif
 
+
+  // We only support encoding for MySQL versions providing mysql_set_character_set.
+  // Without this function there are potential issues with mysql_real_escape_string
+  // since that doesn't take the character set into consideration when setting it
+  // using a SET CHARACTER SET query. Since we don't want to stimulate these possible
+  // issues we simply ignore it and assume the user has configured this correctly.
+
+#ifdef HAVE_MYSQL_SET_CHARACTER_SET
   // Set the connections character set
   encoding = rb_iv_get(self, "@encoding");
 
   VALUE my_encoding = rb_hash_aref(CONST_GET(mEncoding, "MAP"), encoding);
   if(my_encoding != Qnil) {
+
     encoding_error = mysql_set_character_set(db, rb_str_ptr_readonly(my_encoding));
     if (0 != encoding_error) {
       raise_error(self, db, Qnil);
@@ -614,18 +674,23 @@ static void full_connect(VALUE self, MYSQL* db) {
     rb_iv_set(self, "@my_encoding", rb_str_new2("utf8"));
   }
 
+#endif
+
   // Disable sql_auto_is_null
   cCommand_execute(Qnil, self, db, rb_str_new2("SET sql_auto_is_null = 0"));
   // removed NO_AUTO_VALUE_ON_ZERO because of MySQL bug http://bugs.mysql.com/bug.php?id=42270
   // added NO_BACKSLASH_ESCAPES so that backslashes should not be escaped as in other databases
-   
-  //4.x versions do not support certain session parameters  
+
+// 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 ){
     cCommand_execute(Qnil, self, db, rb_str_new2("SET SESSION sql_mode = 'ANSI,NO_DIR_IN_CREATE,NO_UNSIGNED_SUBTRACTION'"));
   }else{
     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'"));
   }
- 
+#endif
+
   rb_iv_set(self, "@connection", Data_Wrap_Struct(rb_cObject, 0, 0, db));
 }
 
@@ -990,6 +1055,7 @@ static VALUE cReader_field_count(VALUE self) {
 
 void Init_do_mysql() {
   rb_require("bigdecimal");
+  rb_require("rational");
   rb_require("date");
   rb_require("data_objects");
 

data/ext/do_mysql/extconf.rb

@@ -66,10 +66,21 @@ else
   find_header('mysql.h', *lib_dirs.flatten.map { |p| p.gsub('/lib', '/include') })
 end
 
+have_func('localtime_r')
+have_func('gmtime_r')
+
 unless RUBY_PLATFORM =~ /mswin|mingw/
   have_header 'mysql.h'
-  have_func 'mysql_query'
-  have_func 'mysql_ssl_set'
+  have_const 'MYSQL_TYPE_STRING', 'mysql.h'
+  have_const 'MYSQL_TYPE_BIT', 'mysql.h'
+  have_const 'MYSQL_TYPE_NEWDECIMAL', 'mysql.h'
+  have_func 'mysql_query', 'mysql.h'
+  have_func 'mysql_ssl_set', 'mysql.h'
+  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_struct_member 'MYSQL_FIELD', 'charsetnr', 'mysql.h'
 end
 
 $CFLAGS << ' -Wall ' unless RUBY_PLATFORM =~ /mswin/

data/ext/do_mysql/mysql_compat.h

@@ -0,0 +1,25 @@
+#ifdef HAVE_OLD_MYSQL_VERSION
+#define MYSQL_TYPE_VAR_STRING   FIELD_TYPE_VAR_STRING
+#define MYSQL_TYPE_STRING       FIELD_TYPE_STRING
+#define MYSQL_TYPE_NEWDECIMAL   FIELD_TYPE_DECIMAL
+#define MYSQL_TYPE_SHORT        FIELD_TYPE_SHORT
+#define MYSQL_TYPE_LONG         FIELD_TYPE_LONG
+#define MYSQL_TYPE_FLOAT        FIELD_TYPE_FLOAT
+#define MYSQL_TYPE_DOUBLE       FIELD_TYPE_DOUBLE
+#define MYSQL_TYPE_LONGLONG     FIELD_TYPE_LONGLONG
+#define MYSQL_TYPE_INT24        FIELD_TYPE_INT24
+#define MYSQL_TYPE_YEAR         FIELD_TYPE_YEAR
+#define MYSQL_TYPE_TINY         FIELD_TYPE_TINY
+#define MYSQL_TYPE_TINY_BLOB    FIELD_TYPE_TINY_BLOB
+#define MYSQL_TYPE_MEDIUM_BLOB  FIELD_TYPE_MEDIUM_BLOB
+#define MYSQL_TYPE_LONG_BLOB    FIELD_TYPE_LONG_BLOB
+#define MYSQL_TYPE_BLOB         FIELD_TYPE_BLOB
+#define MYSQL_TYPE_DATE         FIELD_TYPE_DATE
+#define MYSQL_TYPE_NEWDATE      FIELD_TYPE_NEWDATE
+#define MYSQL_TYPE_DATETIME     FIELD_TYPE_DATETIME
+#define MYSQL_TYPE_TIME         FIELD_TYPE_TIME
+#define MYSQL_TYPE_TIMESTAMP    FIELD_TYPE_TIMESTAMP
+#define MYSQL_TYPE_ENUM         FIELD_TYPE_ENUM
+#define MYSQL_TYPE_SET          FIELD_TYPE_SET
+#define MYSQL_TYPE_NULL         FIELD_TYPE_NULL
+#endif

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = '0.10.2'
+    VERSION = '0.10.3'
   end
 end

data/spec/error/sql_error_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/error/sql_error_spec'
+
+describe 'DataObjects::Mysql raising SQLError' do
+  behaves_like 'raising a SQLError'
+end

data/spec/spec_helper.rb

@@ -141,6 +141,10 @@ module DataObjectsSpecHelpers
       update widgets set release_timestamp = NULL where id = 9
     EOF
 
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_datetime = '2008-07-14 00:31:12' where id = 10
+    EOF
+
     conn.close
 
   end

data/tasks/compile.rake

@@ -57,7 +57,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.2'
+      gem.add_dependency 'do_jdbc',    '0.10.3'
     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.6:1.9.1`
+  `rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.2`
 end
 
 desc 'Release all gems (native, binaries for JRuby and Windows)'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: do_mysql
 version: !ruby/object:Gem::Version 
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 3
+  version: 0.10.3
 platform: java
 authors: 
 - Dirkjan Bussink
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +02:00
+date: 2011-01-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 3
+        version: 0.10.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bacon
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 1
@@ -48,22 +53,27 @@ dependencies:
   name: rake-compiler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
-        version: "0.7"
+        - 0
+        version: 0.7.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jdbc-mysql
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 5
         - 0
@@ -75,14 +85,16 @@ dependencies:
   name: do_jdbc
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 3
+        version: 0.10.3
   type: :runtime
   version_requirements: *id005
 description: Implements the DataObjects API for MySQL
@@ -103,6 +115,7 @@ files:
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
+- spec/error/sql_error_spec.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
@@ -129,6 +142,7 @@ files:
 - ext/do_mysql/do_mysql.c
 - ext/do_mysql/compat.h
 - ext/do_mysql/error.h
+- ext/do_mysql/mysql_compat.h
 - LICENSE
 - Rakefile
 - ChangeLog.markdown
@@ -144,23 +158,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: DataObjects MySQL Driver
@@ -168,6 +186,7 @@ test_files:
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
+- spec/error/sql_error_spec.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb