do_mysql 0.10.6-x86-mingw32 → 0.10.7-x86-mingw32

data/ChangeLog.markdown

@@ -1,3 +1,7 @@
+## 0.10.7 2011-10-13
+
+* Ruby 1.9.3 compatibility
+
 ## 0.10.6 2011-05-22
 
 Bugfixes

data/Rakefile

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'rubygems'
 require 'bundler'
+require 'rubygems/package_task'
 Bundler::GemHelper.install_tasks
 
 require 'rake'
@@ -14,7 +15,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.56'
+BINARY_VERSION = '5.1.60'
 
 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 ])
 

data/ext/do_mysql/do_common.c

@@ -53,9 +53,10 @@ VALUE data_objects_const_get(VALUE scope, const char *constant) {
 void data_objects_debug(VALUE connection, VALUE string, struct timeval *start) {
   struct timeval stop;
   VALUE message;
+  do_int64 duration;
 
   gettimeofday(&stop, NULL);
-  do_int64 duration = (stop.tv_sec - start->tv_sec) * 1000000 + stop.tv_usec - start->tv_usec;
+  duration = (stop.tv_sec - start->tv_sec) * 1000000 + stop.tv_usec - start->tv_usec;
 
   message = rb_funcall(cDO_Logger_Message, ID_NEW, 3, string, rb_time_new(start->tv_sec, start->tv_usec), INT2NUM(duration));
 
@@ -65,6 +66,7 @@ void data_objects_debug(VALUE connection, VALUE string, struct timeval *start) {
 void data_objects_raise_error(VALUE self, const struct errcodes *errors, int errnum, const char *message, VALUE query, VALUE state) {
   const char *exception_type = "SQLError";
   const struct errcodes *e;
+  VALUE uri, exception;
 
   for (e = errors; e->error_name; e++) {
     if (e->error_no == errnum) {
@@ -74,9 +76,9 @@ void data_objects_raise_error(VALUE self, const struct errcodes *errors, int err
     }
   }
 
-  VALUE uri = rb_funcall(rb_iv_get(self, "@connection"), rb_intern("to_s"), 0);
+  uri = rb_funcall(rb_iv_get(self, "@connection"), rb_intern("to_s"), 0);
 
-  VALUE exception = rb_funcall(
+  exception = rb_funcall(
     data_objects_const_get(mDO, exception_type),
     ID_NEW,
     5,
@@ -116,8 +118,8 @@ void data_objects_assert_file_exists(char *file, const char *message) {
 }
 
 VALUE data_objects_build_query_from_args(VALUE klass, int count, VALUE *args) {
-  VALUE array = rb_ary_new();
   int i;
+  VALUE array = rb_ary_new();
 
   for (i = 0; i < count; i++) {
     rb_ary_push(array, args[i]);
@@ -176,8 +178,6 @@ VALUE data_objects_timezone_to_offset(int hour_offset, int minute_offset) {
 VALUE data_objects_parse_date(const char *date) {
   static char const *const _fmt_date = "%4d-%2d-%2d";
   int year = 0, month = 0, day = 0;
-  int jd, ajd;
-  VALUE rational;
 
   switch (sscanf(date, _fmt_date, &year, &month, &day)) {
     case 0:
@@ -185,11 +185,7 @@ VALUE data_objects_parse_date(const char *date) {
       return Qnil;
   }
 
-  jd       = data_objects_jd_from_date(year, month, day);
-  ajd      = (jd * 2) - 1;        // Math from Date.jd_to_ajd
-  rational = rb_funcall(rb_mKernel, ID_RATIONAL, 2, INT2NUM(ajd), INT2NUM(2));
-
-  return rb_funcall(rb_cDate, ID_NEW_DATE, 3, rational, INT2NUM(0), INT2NUM(2299161));
+  return rb_funcall(rb_cDate, ID_NEW, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
 }
 
 VALUE data_objects_parse_time(const char *date) {
@@ -219,10 +215,9 @@ VALUE data_objects_parse_date_time(const char *date) {
   int tokens_read;
   const char *fmt_datetime;
 
-  VALUE ajd, offset;
+  VALUE offset;
 
-  int year, month, day, hour, min, sec, hour_offset, minute_offset, jd;
-  do_int64 num, den;
+  int year, month, day, hour, min, sec, hour_offset, minute_offset;
 
   struct tm timeinfo;
   time_t target_time;
@@ -299,34 +294,9 @@ VALUE data_objects_parse_date_time(const char *date) {
       rb_raise(eDataError, "Couldn't parse date: %s", date);
   }
 
-  jd = data_objects_jd_from_date(year, month, day);
-
-  /*
-   * Generate ajd with fractional days for the time.
-   * Extracted from Date#jd_to_ajd, Date#day_fraction_to_time, and Rational#+ and #-.
-   *
-   * TODO: These are 64bit numbers; is reduce() really necessary?
-   */
-
-  num = (hour * 1440) + (min * 24);
-  num -= (hour_offset * 1440) + (minute_offset * 24);
-  den = (24 * 1440);
-  data_objects_reduce(&num, &den);
-
-  num = (num * 86400) + (sec * den);
-  den = den * 86400;
-  data_objects_reduce(&num, &den);
-
-  num += jd * den;
-
-  num = (num * 2) - den;
-  den *= 2;
-  data_objects_reduce(&num, &den);
-
-  ajd = rb_funcall(rb_mKernel, ID_RATIONAL, 2, rb_ull2inum(num), rb_ull2inum(den));
   offset = data_objects_timezone_to_offset(hour_offset, minute_offset);
-
-  return rb_funcall(rb_cDateTime, ID_NEW_DATE, 3, ajd, offset, INT2NUM(2299161));
+  return rb_funcall(rb_cDateTime, ID_NEW, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day),
+                                             INT2NUM(hour), INT2NUM(min), INT2NUM(sec), offset);
 }
 
 VALUE data_objects_cConnection_character_set(VALUE self) {
@@ -360,17 +330,15 @@ VALUE data_objects_cConnection_quote_date(VALUE self, VALUE value) {
  * into Ruby-strings so we can easily typecast later
  */
 VALUE data_objects_cCommand_set_types(int argc, VALUE *argv, VALUE self) {
+  VALUE entry, sub_entry;
+  int i, j;
   VALUE type_strings = rb_ary_new();
   VALUE array = rb_ary_new();
 
-  int i, j;
-
   for (i = 0; i < argc; i++) {
     rb_ary_push(array, argv[i]);
   }
 
-  VALUE entry, sub_entry;
-
   for (i = 0; i < RARRAY_LEN(array); i++) {
     entry = rb_ary_entry(array, i);
 

data/ext/do_mysql/extconf.rb

@@ -1,6 +1,7 @@
 ENV["RC_ARCHS"] = "" if RUBY_PLATFORM =~ /darwin/
 
 require 'mkmf'
+require 'date'
 
 # Allow for custom compiler to be specified.
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
@@ -81,6 +82,10 @@ have_func 'mysql_set_character_set', 'mysql.h'
 have_func 'mysql_get_server_version', 'mysql.h'
 have_struct_member 'MYSQL_FIELD', 'charsetnr', 'mysql.h'
 
+unless DateTime.respond_to?(:new!)
+  $CFLAGS << ' -DHAVE_NO_DATETIME_NEWBANG'
+end
+
 $CFLAGS << ' -Wall '
 
 if RUBY_VERSION < '1.8.6'

data/lib/do_mysql/version.rb

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

data/tasks/spec.rake

@@ -2,7 +2,6 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec => [:clean, :compile]) do |spec|
   spec.pattern      = './spec/**/*_spec.rb'
-  spec.skip_bundler = true
 end
 
 RSpec::Core::RakeTask.new(:rcov => [:clean, :compile]) do |rcov|

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 10
-  - 6
-  version: 0.10.6
+  - 7
+  version: 0.10.7
 platform: x86-mingw32
 authors: 
 - Dirkjan Bussink
@@ -19,51 +18,45 @@ date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  name: data_objects
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 10
-        - 6
-        version: 0.10.6
-  name: data_objects
-  version_requirements: *id001
-  prerelease: false
+        - 7
+        version: 0.10.7
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  name: rspec
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 5
         version: "2.5"
-  name: rspec
-  version_requirements: *id002
-  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  name: rake-compiler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 7
         version: "0.7"
-  name: rake-compiler
-  version_requirements: *id003
-  prerelease: false
+  requirement: *id003
 description: Implements the DataObjects API for MySQL
 email: d.bussink@gmail.com
 executables: []
@@ -127,13 +120,13 @@ post_install_message: |+
       ======================================================================================================
   
         You've installed the binary version of do_mysql.
-        It was built using MySQL version 5.1.56.
+        It was built using MySQL version 5.1.60.
         It's recommended to use the exact same version to avoid potential issues.
   
         At the time of building this gem, the necessary DLL files where available
         in the following download:
   
-        http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-noinstall-5.1.56-win32.zip/from/pick
+        http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-noinstall-5.1.60-win32.zip/from/pick
   
         You can put the lib\opt\libmysql.dll available in this package in your Ruby bin
         directory, for example C:\Ruby\bin
@@ -145,27 +138,23 @@ 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.5.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DataObjects MySQL Driver