mysql2 0.1.4 → 0.1.5

data/spec/active_record/active_record_spec.rb

@@ -3,13 +3,17 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 require 'active_record'
 require 'active_record/connection_adapters/mysql2_adapter'
 
+class Mysql2Test2 < ActiveRecord::Base
+  set_table_name "mysql2_test2"
+end
+
 describe ActiveRecord::ConnectionAdapters::Mysql2Adapter do
   it "should be able to connect" do
     lambda {
       ActiveRecord::Base.establish_connection(:adapter => 'mysql2')
     }.should_not raise_error(Mysql2::Error)
   end
-  
+
   context "once connected" do
     before(:each) do
       @connection = ActiveRecord::Base.connection
@@ -20,4 +24,123 @@ describe ActiveRecord::ConnectionAdapters::Mysql2Adapter do
       @connection.execute("SELECT NOW() as n").first['n'].class.should eql(Time)
     end
   end
+
+  context "columns" do
+    before(:all) do
+      ActiveRecord::Base.establish_connection(:adapter => 'mysql2', :database => 'test')
+      Mysql2Test2.connection.execute %[
+        CREATE TABLE IF NOT EXISTS mysql2_test2 (
+          `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+          `null_test` varchar(10) DEFAULT NULL,
+          `bit_test` bit(64) NOT NULL DEFAULT b'1',
+          `boolean_test` tinyint(1) DEFAULT 0,
+          `tiny_int_test` tinyint(4) NOT NULL DEFAULT '1',
+          `small_int_test` smallint(6) NOT NULL DEFAULT '1',
+          `medium_int_test` mediumint(9) NOT NULL DEFAULT '1',
+          `int_test` int(11) NOT NULL DEFAULT '1',
+          `big_int_test` bigint(20) NOT NULL DEFAULT '1',
+          `float_test` float(10,3) NOT NULL DEFAULT '1.000',
+          `double_test` double(10,3) NOT NULL DEFAULT '1.000',
+          `decimal_test` decimal(10,3) NOT NULL DEFAULT '1.000',
+          `date_test` date NOT NULL DEFAULT '2010-01-01',
+          `date_time_test` datetime NOT NULL DEFAULT '2010-01-01 00:00:00',
+          `timestamp_test` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+          `time_test` time NOT NULL DEFAULT '00:00:00',
+          `year_test` year(4) NOT NULL DEFAULT '2010',
+          `char_test` char(10) NOT NULL DEFAULT 'abcdefghij',
+          `varchar_test` varchar(10) NOT NULL DEFAULT 'abcdefghij',
+          `binary_test` binary(10) NOT NULL DEFAULT 'abcdefghij',
+          `varbinary_test` varbinary(10) NOT NULL DEFAULT 'abcdefghij',
+          `tiny_blob_test` tinyblob NOT NULL,
+          `tiny_text_test` tinytext,
+          `blob_test` blob,
+          `text_test` text,
+          `medium_blob_test` mediumblob,
+          `medium_text_test` mediumtext,
+          `long_blob_test` longblob,
+          `long_text_test` longtext,
+          `enum_test` enum('val1','val2') NOT NULL DEFAULT 'val1',
+          `set_test` set('val1','val2') NOT NULL DEFAULT 'val1,val2',
+          PRIMARY KEY (`id`)
+        )
+      ]
+      Mysql2Test2.connection.execute "INSERT INTO mysql2_test2 (null_test) VALUES (NULL)"
+      @test_result = Mysql2Test2.connection.execute("SELECT * FROM mysql2_test2 ORDER BY id DESC LIMIT 1").first
+    end
+
+    after(:all) do
+      Mysql2Test2.connection.execute("DELETE FROM mysql2_test WHERE id=#{@test_result['id']}")
+    end
+
+    it "default value should be cast to the expected type of the field" do
+      test = Mysql2Test2.new
+      test.null_test.should be_nil
+      test.bit_test.should eql("b'1'")
+      test.boolean_test.should eql(false)
+      test.tiny_int_test.should eql(1)
+      test.small_int_test.should eql(1)
+      test.medium_int_test.should eql(1)
+      test.int_test.should eql(1)
+      test.big_int_test.should eql(1)
+      test.float_test.should eql('1.0000'.to_f)
+      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.should be_nil
+      test.time_test.class.should eql(Time)
+      test.year_test.should eql(2010)
+      test.char_test.should eql('abcdefghij')
+      test.varchar_test.should eql('abcdefghij')
+      test.binary_test.should eql('abcdefghij')
+      test.varbinary_test.should eql('abcdefghij')
+      test.tiny_blob_test.should eql("")
+      test.tiny_text_test.should be_nil
+      test.blob_test.should be_nil
+      test.text_test.should be_nil
+      test.medium_blob_test.should be_nil
+      test.medium_text_test.should be_nil
+      test.long_blob_test.should be_nil
+      test.long_text_test.should be_nil
+      test.long_blob_test.should be_nil
+      test.enum_test.should eql('val1')
+      test.set_test.should eql('val1,val2')
+      test.save
+    end
+
+    it "should have correct values when pulled from a db record" do
+      test = Mysql2Test2.last
+      test.null_test.should be_nil
+      test.bit_test.class.should eql(String)
+      test.boolean_test.should eql(false)
+      test.tiny_int_test.should eql(1)
+      test.small_int_test.should eql(1)
+      test.medium_int_test.should eql(1)
+      test.int_test.should eql(1)
+      test.big_int_test.should eql(1)
+      test.float_test.should eql('1.0000'.to_f)
+      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.year_test.should eql(2010)
+      test.char_test.should eql('abcdefghij')
+      test.varchar_test.should eql('abcdefghij')
+      test.binary_test.should eql('abcdefghij')
+      test.varbinary_test.should eql('abcdefghij')
+      test.tiny_blob_test.should eql("")
+      test.tiny_text_test.should be_nil
+      test.blob_test.should be_nil
+      test.text_test.should be_nil
+      test.medium_blob_test.should be_nil
+      test.medium_text_test.should be_nil
+      test.long_blob_test.should be_nil
+      test.long_text_test.should be_nil
+      test.long_blob_test.should be_nil
+      test.enum_test.should eql('val1')
+      test.set_test.should eql('val1,val2')
+    end
+  end
 end

data/spec/mysql2/client_spec.rb

@@ -34,6 +34,21 @@ describe Mysql2::Client do
     results[1]['Value'].class.should eql(String)
   end
 
+  it "should respond to #close" do
+    @client.should respond_to :close
+  end
+
+  it "should be able to close properly" do
+    @client.close.should be_nil
+  end
+
+  it "should raise an exception when closed twice" do
+    @client.close.should be_nil
+    lambda {
+      @client.close
+    }.should raise_error(Mysql2::Error)
+  end
+
   it "should respond to #query" do
     @client.should respond_to :query
   end

data/spec/mysql2/result_spec.rb

@@ -52,8 +52,9 @@ describe Mysql2::Result do
       @client.query "USE test"
       @client.query %[
         CREATE TABLE IF NOT EXISTS mysql2_test (
+          id MEDIUMINT NOT NULL AUTO_INCREMENT,
           null_test VARCHAR(10),
-          bit_test BIT,
+          bit_test BIT(64),
           tiny_int_test TINYINT,
           small_int_test SMALLINT,
           medium_int_test MEDIUMINT,
@@ -80,7 +81,8 @@ describe Mysql2::Result do
           long_blob_test LONGBLOB,
           long_text_test LONGTEXT,
           enum_test ENUM('val1', 'val2'),
-          set_test SET('val1', 'val2')
+          set_test SET('val1', 'val2'),
+          PRIMARY KEY (id)
         )
       ]
       @client.query %[
@@ -93,14 +95,18 @@ describe Mysql2::Result do
         )
 
         VALUES (
-          NULL, 1, 1, 10, 10, 10, 10,
+          NULL, b'101', 1, 10, 10, 10, 10,
           10.3, 10.3, 10.3, '2010-4-4', '2010-4-4 11:44:00', '2010-4-4 11:44:00', '11:44:00',
           2009, "test", "test", "test", "test", "test",
           "test", "test", "test", "test", "test",
           "test", "test", 'val1', 'val1,val2'
         )
       ]
-      @test_result = @client.query("SELECT * FROM mysql2_test LIMIT 1").first
+      @test_result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+    end
+
+    after(:all) do
+      @client.query("DELETE FROM mysql2_test WHERE id=#{@test_result['id']}")
     end
 
     it "should return nil for a NULL value" do
@@ -108,52 +114,94 @@ describe Mysql2::Result do
       @test_result['null_test'].should eql(nil)
     end
 
-    {
-      'bit_test' => 'BIT',
-      'tiny_int_test' => 'TINYINT',
-      'small_int_test' => 'SMALLINT',
-      'medium_int_test' => 'MEDIUMINT',
-      'int_test' => 'INT',
-      'big_int_test' => 'BIGINT',
-      'year_test' => 'YEAR'
-    }.each do |field, type|
-      it "should return a Fixnum for #{type}" do
-        [Fixnum, Bignum].should include(@test_result[field].class)
-      end
+    it "should return Fixnum for a BIT value" do
+      @test_result['bit_test'].class.should eql(String)
+      @test_result['bit_test'].should eql("\000\000\000\000\000\000\000\005")
     end
 
-    {
-      'decimal_test' => 'DECIMAL'
-    }.each do |field, type|
-      it "should return a Fixnum for #{type}" do
-        @test_result[field].class.should eql(BigDecimal)
-      end
+    it "should return Fixnum for a TINYINT value" do
+      [Fixnum, Bignum].should include(@test_result['tiny_int_test'].class)
+      @test_result['tiny_int_test'].should eql(1)
     end
 
-    {
-      'float_test' => 'FLOAT',
-      'double_test' => 'DOUBLE'
-    }.each do |field, type|
-      it "should return a Float for #{type}" do
-        @test_result[field].class.should eql(Float)
-      end
+    it "should return Fixnum for a SMALLINT value" do
+      [Fixnum, Bignum].should include(@test_result['small_int_test'].class)
+      @test_result['small_int_test'].should eql(10)
     end
 
-    {
-      'date_test' => 'DATE',
-      'date_time_test' => 'DATETIME',
-      'timestamp_test' => 'TIMESTAMP',
-      'time_test' => 'TIME'
-    }.each do |field, type|
-      it "should return a Time for #{type}" do
-        @test_result[field].class.should eql(Time)
-      end
+    it "should return Fixnum for a MEDIUMINT value" do
+      [Fixnum, Bignum].should include(@test_result['medium_int_test'].class)
+      @test_result['medium_int_test'].should eql(10)
+    end
+
+    it "should return Fixnum for an INT value" do
+      [Fixnum, Bignum].should include(@test_result['int_test'].class)
+      @test_result['int_test'].should eql(10)
+    end
+
+    it "should return Fixnum for a BIGINT value" do
+      [Fixnum, Bignum].should include(@test_result['big_int_test'].class)
+      @test_result['big_int_test'].should eql(10)
+    end
+
+    it "should return Fixnum for a YEAR value" do
+      [Fixnum, Bignum].should include(@test_result['year_test'].class)
+      @test_result['year_test'].should eql(2009)
+    end
+
+    it "should return BigDecimal for a DECIMAL value" do
+      @test_result['decimal_test'].class.should eql(BigDecimal)
+      @test_result['decimal_test'].should eql(10.3)
+    end
+
+    it "should return Float for a FLOAT value" do
+      @test_result['float_test'].class.should eql(Float)
+      @test_result['float_test'].should eql(10.3)
+    end
+
+    it "should return Float for a DOUBLE value" do
+      @test_result['double_test'].class.should eql(Float)
+      @test_result['double_test'].should eql(10.3)
+    end
+
+    it "should return Time for a DATETIME value" do
+      @test_result['date_time_test'].class.should eql(Time)
+      @test_result['date_time_test'].strftime("%F %T").should eql('2010-04-04 11:44:00')
+    end
+
+    it "should return Time for a TIMESTAMP value" do
+      @test_result['timestamp_test'].class.should eql(Time)
+      @test_result['timestamp_test'].strftime("%F %T").should eql('2010-04-04 11:44:00')
+    end
+
+    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')
+    end
+
+    it "should return Date for a DATE value" do
+      @test_result['date_test'].class.should eql(Date)
+      @test_result['date_test'].strftime("%F").should eql('2010-04-04')
+    end
+
+    it "should return String for an ENUM value" do
+      @test_result['enum_test'].class.should eql(String)
+      @test_result['enum_test'].should eql('val1')
+    end
+
+    it "should return String for a SET value" do
+      @test_result['set_test'].class.should eql(String)
+      @test_result['set_test'].should eql('val1,val2')
+    end
+
+    it "should return String for a BINARY value" do
+      @test_result['binary_test'].class.should eql(String)
+      @test_result['binary_test'].should eql("test#{"\000"*6}")
     end
 
     {
       'char_test' => 'CHAR',
       'varchar_test' => 'VARCHAR',
-      'binary_test' => 'BINARY',
       'varbinary_test' => 'VARBINARY',
       'tiny_blob_test' => 'TINYBLOB',
       'tiny_text_test' => 'TINYTEXT',
@@ -162,12 +210,11 @@ describe Mysql2::Result do
       'medium_blob_test' => 'MEDIUMBLOB',
       'medium_text_test' => 'MEDIUMTEXT',
       'long_blob_test' => 'LONGBLOB',
-      'long_text_test' => 'LONGTEXT',
-      'enum_test' => 'ENUM',
-      'set_test' => 'SET'
+      'long_text_test' => 'LONGTEXT'
     }.each do |field, type|
       it "should return a String for #{type}" do
         @test_result[field].class.should eql(String)
+        @test_result[field].should eql("test")
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Brian Lopez
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -07:00
+date: 2010-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +35,9 @@ files:
 - VERSION
 - benchmark/active_record.rb
 - benchmark/escape.rb
-- benchmark/query.rb
+- benchmark/query_with_mysql_casting.rb
+- benchmark/query_without_mysql_casting.rb
+- benchmark/sequel.rb
 - benchmark/setup_db.rb
 - examples/eventmachine.rb
 - ext/extconf.rb
@@ -45,6 +47,7 @@ files:
 - lib/arel/engines/sql/compilers/mysql2_compiler.rb
 - lib/mysql2.rb
 - lib/mysql2/em.rb
+- lib/sequel/adapters/mysql2.rb
 - mysql2.gemspec
 - spec/active_record/active_record_spec.rb
 - spec/em/em_spec.rb