mysql2 0.1.7 → 0.1.8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.8 (June 2nd, 2010)
+* fixes for AR adapter for timezone juggling
+* fixes to be able to run benchmarks and specs under 1.9.2
+
 ## 0.1.7 (May 22nd, 2010)
 * fix a bug when using the disconnect! method on a closed connection in the AR driver
 

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/benchmark/active_record.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'

data/benchmark/escape.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 
 require 'rubygems'
 require 'benchmark'

data/benchmark/query_with_mysql_casting.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 
 require 'rubygems'
 require 'benchmark'

data/benchmark/query_without_mysql_casting.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 
 require 'rubygems'
 require 'benchmark'

data/benchmark/sequel.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'

data/benchmark/setup_db.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 
 # This script is for generating psudo-random data into a single table consisting of nearly every
 # data type MySQL 5.1 supports.

data/ext/mysql2_ext.c

@@ -550,7 +550,7 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
         case MYSQL_TYPE_TIME: {     // TIME field
           int hour, min, sec, tokens;
           tokens = sscanf(row[i], "%2d:%2d:%2d", &hour, &min, &sec);
-          val = rb_funcall(rb_cTime, intern_local, 6, INT2NUM(0), INT2NUM(1), INT2NUM(1), INT2NUM(hour), INT2NUM(min), INT2NUM(sec));
+          val = rb_funcall(rb_cTime, intern_utc, 6, INT2NUM(0), INT2NUM(1), INT2NUM(1), INT2NUM(hour), INT2NUM(min), INT2NUM(sec));
           break;
         }
         case MYSQL_TYPE_TIMESTAMP:  // TIMESTAMP field
@@ -564,7 +564,7 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
               rb_raise(cMysql2Error, "Invalid date: %s", row[i]);
               val = Qnil;
             } else {
-              val = rb_funcall(rb_cTime, intern_local, 6, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec));
+              val = rb_funcall(rb_cTime, intern_utc, 6, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec));
             }
           }
           break;
@@ -721,7 +721,7 @@ void Init_mysql2_ext() {
   rb_include_module(cMysql2Result, mEnumerable);
 
   intern_new = rb_intern("new");
-  intern_local = rb_intern("local");
+  intern_utc = rb_intern("utc");
 
   sym_symbolize_keys = ID2SYM(rb_intern("symbolize_keys"));
   sym_reconnect = ID2SYM(rb_intern("reconnect"));

data/ext/mysql2_ext.h

@@ -25,7 +25,7 @@ static int utf8Encoding, binaryEncoding;
 #endif
 
 static VALUE cBigDecimal, cDate, cDateTime;
-static ID intern_new, intern_local;
+static ID intern_new, intern_utc;
 
 /* Mysql2::Error */
 static VALUE cMysql2Error;

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -57,8 +57,8 @@ module ActiveRecord
           when :integer               then value.to_i rescue value ? 1 : 0
           when :float                 then value.to_f # returns self if it's already a Float
           when :decimal               then self.class.value_to_decimal(value)
-          when :datetime, :timestamp  then value.class == Time ? value : self.class.string_to_time(value)
-          when :time                  then value.class == Time ? value : self.class.string_to_dummy_time(value)
+          when :datetime, :timestamp  then value.class == Time ? value.in_time_zone : self.class.string_to_time(value)
+          when :time                  then value.class == Time ? value.in_time_zone : self.class.string_to_dummy_time(value)
           when :date                  then value.class == Date ? value : self.class.string_to_date(value)
           when :binary                then value
           when :boolean               then self.class.value_to_boolean(value)
@@ -73,8 +73,8 @@ module ActiveRecord
           when :integer               then "#{var_name}.to_i rescue #{var_name} ? 1 : 0"
           when :float                 then "#{var_name}.to_f"
           when :decimal               then "#{self.class.name}.value_to_decimal(#{var_name})"
-          when :datetime, :timestamp  then "#{var_name}.class == Time ? #{var_name} : #{self.class.name}.string_to_time(#{var_name})"
-          when :time                  then "#{var_name}.class == Time ? #{var_name} : #{self.class.name}.string_to_dummy_time(#{var_name})"
+          when :datetime, :timestamp  then "#{var_name}.class == Time ? #{var_name}.in_time_zone : #{self.class.name}.string_to_time(#{var_name})"
+          when :time                  then "#{var_name}.class == Time ? #{var_name}.in_time_zone : #{self.class.name}.string_to_dummy_time(#{var_name})"
           when :date                  then "#{var_name}.class == Date ? #{var_name} : #{self.class.name}.string_to_date(#{var_name})"
           when :binary                then nil
           when :boolean               then "#{self.class.name}.value_to_boolean(#{var_name})"

data/lib/mysql2.rb

@@ -5,5 +5,5 @@ require 'mysql2_ext'
 #
 # A modern, simple and very fast Mysql library for Ruby - binding to libmysql
 module Mysql2
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/mysql2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mysql2}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez"]
-  s.date = %q{2010-05-22}
+  s.date = %q{2010-06-02}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [

data/spec/active_record/active_record_spec.rb

@@ -27,6 +27,7 @@ describe ActiveRecord::ConnectionAdapters::Mysql2Adapter do
 
   context "columns" do
     before(:all) do
+      ActiveRecord::Base.default_timezone = 'Pacific Time (US & Canada)'
       ActiveRecord::Base.establish_connection(:adapter => 'mysql2', :database => 'test')
       Mysql2Test2.connection.execute %[
         CREATE TABLE IF NOT EXISTS mysql2_test2 (
@@ -86,9 +87,9 @@ describe ActiveRecord::ConnectionAdapters::Mysql2Adapter do
       test.double_test.should eql('1.0000'.to_f)
       test.decimal_test.should eql(BigDecimal.new('1.0000'))
       test.date_test.should eql(Date.parse('2010-01-01'))
-      test.date_time_test.should eql(Time.parse('2010-01-01 00:00:00'))
+      test.date_time_test.should eql(DateTime.parse('2010-01-01 00:00:00'))
       test.timestamp_test.should be_nil
-      test.time_test.class.should eql(Time)
+      test.time_test.class.should eql(DateTime)
       test.year_test.should eql(2010)
       test.char_test.should eql('abcdefghij')
       test.varchar_test.should eql('abcdefghij')
@@ -122,9 +123,9 @@ describe ActiveRecord::ConnectionAdapters::Mysql2Adapter do
       test.double_test.should eql('1.0000'.to_f)
       test.decimal_test.should eql(BigDecimal.new('1.0000'))
       test.date_test.should eql(Date.parse('2010-01-01'))
-      test.date_time_test.should eql(Time.parse('2010-01-01 00:00:00'))
-      test.timestamp_test.class.should eql(Time)
-      test.time_test.class.should eql(Time)
+      test.date_time_test.should eql(DateTime.parse('2010-01-01 00:00:00'))
+      test.timestamp_test.class.should eql(ActiveSupport::TimeWithZone)
+      test.time_test.class.should eql(ActiveSupport::TimeWithZone)
       test.year_test.should eql(2010)
       test.char_test.should eql('abcdefghij')
       test.varchar_test.should eql('abcdefghij')

data/spec/mysql2/result_spec.rb

@@ -176,7 +176,11 @@ describe Mysql2::Result do
 
     it "should return Time for a TIME value" do
       @test_result['time_test'].class.should eql(Time)
-      @test_result['time_test'].strftime("%F %T").should eql('2000-01-01 11:44:00')
+      if RUBY_VERSION =~ /1.9.2/
+        @test_result['time_test'].strftime("%F %T").should eql('0000-01-01 11:44:00')
+      else
+        @test_result['time_test'].strftime("%F %T").should eql('2000-01-01 11:44:00')
+      end
     end
 
     it "should return Date for a DATE value" do

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'mysql2'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Brian Lopez
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-22 00:00:00 -07:00
+date: 2010-06-02 00:00:00 -07:00
 default_executable: 
 dependencies: []