do_mysql 0.10.6-java → 0.10.7-java

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'

data/ext/do_mysql/do_common.c

@@ -185,11 +185,16 @@ VALUE data_objects_parse_date(const char *date) {
       return Qnil;
   }
 
+#ifdef HAVE_NO_DATETIME_NEWBANG
+  return rb_funcall(rb_cDate, ID_NEW, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
+#else
+
   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));
+#endif
 }
 
 VALUE data_objects_parse_time(const char *date) {
@@ -299,6 +304,11 @@ VALUE data_objects_parse_date_time(const char *date) {
       rb_raise(eDataError, "Couldn't parse date: %s", date);
   }
 
+#ifdef HAVE_NO_DATETIME_NEWBANG
+  offset = data_objects_timezone_to_offset(hour_offset, minute_offset);
+  return rb_funcall(rb_cDateTime, ID_NEW, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day),
+                                             INT2NUM(hour), INT2NUM(min), INT2NUM(sec), offset);
+#else
   jd = data_objects_jd_from_date(year, month, day);
 
   /*
@@ -327,6 +337,7 @@ VALUE data_objects_parse_date_time(const char *date) {
   offset = data_objects_timezone_to_offset(hour_offset, minute_offset);
 
   return rb_funcall(rb_cDateTime, ID_NEW_DATE, 3, ajd, offset, INT2NUM(2299161));
+#endif
 }
 
 VALUE data_objects_cConnection_character_set(VALUE self) {

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 10
-  - 6
-  version: 0.10.6
+  - 7
+  version: 0.10.7
 platform: java
 authors: 
 - Dirkjan Bussink
@@ -15,27 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +02:00
-default_executable: 
+date: 2011-03-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 57
         segments: 
         - 0
         - 10
-        - 6
-        version: 0.10.6
-  name: data_objects
+        - 7
+        version: 0.10.7
   version_requirements: *id001
+  name: data_objects
   prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +44,11 @@ dependencies:
         - 2
         - 5
         version: "2.5"
-  name: rspec
   version_requirements: *id002
+  name: rspec
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +59,11 @@ dependencies:
         - 0
         - 7
         version: "0.7"
-  name: rake-compiler
   version_requirements: *id003
+  name: rake-compiler
   prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,25 +75,26 @@ dependencies:
         - 0
         - 4
         version: 5.0.4
-  name: jdbc-mysql
   version_requirements: *id004
+  name: jdbc-mysql
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 57
         segments: 
         - 0
         - 10
-        - 6
-        version: 0.10.6
-  name: do_jdbc
+        - 7
+        version: 0.10.7
   version_requirements: *id005
+  name: do_jdbc
   prerelease: false
+  type: :runtime
 description: Implements the DataObjects API for MySQL
 email: d.bussink@gmail.com
 executables: []
@@ -149,7 +148,6 @@ files:
 - tasks/spec.rake
 - tasks/ssl.rake
 - lib/do_mysql/do_mysql.jar
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -179,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.5.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: DataObjects MySQL Driver