mysql2 0.4.0 → 0.4.1

data/spec/mysql2/result_spec.rb

@@ -53,19 +53,19 @@ RSpec.describe Mysql2::Result do
   context "#each" do
     it "should yield rows as hash's" do
       @result.each do |row|
-        expect(row.class).to eql(Hash)
+        expect(row).to be_an_instance_of(Hash)
       end
     end
 
     it "should yield rows as hash's with symbol keys if :symbolize_keys was set to true" do
       @result.each(:symbolize_keys => true) do |row|
-        expect(row.keys.first.class).to eql(Symbol)
+        expect(row.keys.first).to be_an_instance_of(Symbol)
       end
     end
 
     it "should be able to return results as an array" do
       @result.each(:as => :array) do |row|
-        expect(row.class).to eql(Array)
+        expect(row).to be_an_instance_of(Array)
       end
     end
 
@@ -109,7 +109,7 @@ RSpec.describe Mysql2::Result do
 
     it "should return an array of field names in proper order" do
       result = @client.query "SELECT 'a', 'b', 'c'"
-      expect(result.fields).to eql(['a', 'b', 'c'])
+      expect(result.fields).to eql(%w(a b c))
     end
   end
 
@@ -132,7 +132,7 @@ RSpec.describe Mysql2::Result do
 
     it "should not yield nil at the end of streaming" do
       result = @client.query('SELECT * FROM mysql2_test', :stream => true, :cache_rows => false)
-      result.each { |r| expect(r).not_to be_nil}
+      result.each { |r| expect(r).not_to be_nil }
     end
 
     it "#count should be zero for rows after streaming when there were no results" do
@@ -158,7 +158,7 @@ RSpec.describe Mysql2::Result do
       res = client.query "SELECT * FROM streamingTest", :stream => true, :cache_rows => false
 
       expect {
-        res.each_with_index do |row, i|
+        res.each_with_index do |_, i|
           # Exhaust the first result packet then trigger a timeout
           sleep 2 if i > 0 && i % 1000 == 0
         end
@@ -174,25 +174,25 @@ RSpec.describe Mysql2::Result do
     it "should return nil values for NULL and strings for everything else when :cast is false" do
       result = @client.query('SELECT null_test, tiny_int_test, bool_cast_test, int_test, date_test, enum_test FROM mysql2_test WHERE bool_cast_test = 1 LIMIT 1', :cast => false).first
       expect(result["null_test"]).to be_nil
-      expect(result["tiny_int_test"]).to  eql("1")
+      expect(result["tiny_int_test"]).to eql("1")
       expect(result["bool_cast_test"]).to eql("1")
-      expect(result["int_test"]).to       eql("10")
-      expect(result["date_test"]).to      eql("2010-04-04")
-      expect(result["enum_test"]).to      eql("val1")
+      expect(result["int_test"]).to eql("10")
+      expect(result["date_test"]).to eql("2010-04-04")
+      expect(result["enum_test"]).to eql("val1")
     end
 
     it "should return nil for a NULL value" do
-      expect(@test_result['null_test'].class).to eql(NilClass)
+      expect(@test_result['null_test']).to be_an_instance_of(NilClass)
       expect(@test_result['null_test']).to eql(nil)
     end
 
     it "should return String for a BIT(64) value" do
-      expect(@test_result['bit_test'].class).to eql(String)
+      expect(@test_result['bit_test']).to be_an_instance_of(String)
       expect(@test_result['bit_test']).to eql("\000\000\000\000\000\000\000\005")
     end
 
     it "should return String for a BIT(1) value" do
-      expect(@test_result['single_bit_test'].class).to eql(String)
+      expect(@test_result['single_bit_test']).to be_an_instance_of(String)
       expect(@test_result['single_bit_test']).to eql("\001")
     end
 
@@ -259,89 +259,89 @@ RSpec.describe Mysql2::Result do
     end
 
     it "should return BigDecimal for a DECIMAL value" do
-      expect(@test_result['decimal_test'].class).to eql(BigDecimal)
+      expect(@test_result['decimal_test']).to be_an_instance_of(BigDecimal)
       expect(@test_result['decimal_test']).to eql(10.3)
     end
 
     it "should return Float for a FLOAT value" do
-      expect(@test_result['float_test'].class).to eql(Float)
+      expect(@test_result['float_test']).to be_an_instance_of(Float)
       expect(@test_result['float_test']).to eql(10.3)
     end
 
     it "should return Float for a DOUBLE value" do
-      expect(@test_result['double_test'].class).to eql(Float)
+      expect(@test_result['double_test']).to be_an_instance_of(Float)
       expect(@test_result['double_test']).to eql(10.3)
     end
 
     it "should return Time for a DATETIME value when within the supported range" do
-      expect(@test_result['date_time_test'].class).to eql(Time)
+      expect(@test_result['date_time_test']).to be_an_instance_of(Time)
       expect(@test_result['date_time_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2010-04-04 11:44:00')
     end
 
     if 1.size == 4 # 32bit
-      unless RUBY_VERSION =~ /1.8/
-        klass = Time
+      klass = if RUBY_VERSION =~ /1.8/
+        DateTime
       else
-        klass = DateTime
+        Time
       end
 
       it "should return DateTime when timestamp is < 1901-12-13 20:45:52" do
-                                      # 1901-12-13T20:45:52 is the min for 32bit Ruby 1.8
+        # 1901-12-13T20:45:52 is the min for 32bit Ruby 1.8
         r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
-        expect(r.first['test'].class).to eql(klass)
+        expect(r.first['test']).to be_an_instance_of(klass)
       end
 
       it "should return DateTime when timestamp is > 2038-01-19T03:14:07" do
-                                      # 2038-01-19T03:14:07 is the max for 32bit Ruby 1.8
+        # 2038-01-19T03:14:07 is the max for 32bit Ruby 1.8
         r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
-        expect(r.first['test'].class).to eql(klass)
+        expect(r.first['test']).to be_an_instance_of(klass)
       end
     elsif 1.size == 8 # 64bit
-      unless RUBY_VERSION =~ /1.8/
-        it "should return Time when timestamp is < 1901-12-13 20:45:52" do
-          r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
-          expect(r.first['test'].class).to eql(Time)
-        end
-
-        it "should return Time when timestamp is > 2038-01-19T03:14:07" do
-          r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
-          expect(r.first['test'].class).to eql(Time)
-        end
-      else
+      if RUBY_VERSION =~ /1.8/
         it "should return Time when timestamp is > 0138-12-31 11:59:59" do
           r = @client.query("SELECT CAST('0139-1-1 00:00:00' AS DATETIME) as test")
-          expect(r.first['test'].class).to eql(Time)
+          expect(r.first['test']).to be_an_instance_of(Time)
         end
 
         it "should return DateTime when timestamp is < 0139-1-1T00:00:00" do
           r = @client.query("SELECT CAST('0138-12-31 11:59:59' AS DATETIME) as test")
-          expect(r.first['test'].class).to eql(DateTime)
+          expect(r.first['test']).to be_an_instance_of(DateTime)
+        end
+
+        it "should return Time when timestamp is > 2038-01-19T03:14:07" do
+          r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
+          expect(r.first['test']).to be_an_instance_of(Time)
+        end
+      else
+        it "should return Time when timestamp is < 1901-12-13 20:45:52" do
+          r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
+          expect(r.first['test']).to be_an_instance_of(Time)
         end
 
         it "should return Time when timestamp is > 2038-01-19T03:14:07" do
           r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
-          expect(r.first['test'].class).to eql(Time)
+          expect(r.first['test']).to be_an_instance_of(Time)
         end
       end
     end
 
     it "should return Time for a TIMESTAMP value when within the supported range" do
-      expect(@test_result['timestamp_test'].class).to eql(Time)
+      expect(@test_result['timestamp_test']).to be_an_instance_of(Time)
       expect(@test_result['timestamp_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2010-04-04 11:44:00')
     end
 
     it "should return Time for a TIME value" do
-      expect(@test_result['time_test'].class).to eql(Time)
+      expect(@test_result['time_test']).to be_an_instance_of(Time)
       expect(@test_result['time_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2000-01-01 11:44:00')
     end
 
     it "should return Date for a DATE value" do
-      expect(@test_result['date_test'].class).to eql(Date)
+      expect(@test_result['date_test']).to be_an_instance_of(Date)
       expect(@test_result['date_test'].strftime("%Y-%m-%d")).to eql('2010-04-04')
     end
 
     it "should return String for an ENUM value" do
-      expect(@test_result['enum_test'].class).to eql(String)
+      expect(@test_result['enum_test']).to be_an_instance_of(String)
       expect(@test_result['enum_test']).to eql('val1')
     end
 
@@ -379,7 +379,7 @@ RSpec.describe Mysql2::Result do
     end
 
     it "should return String for a SET value" do
-      expect(@test_result['set_test'].class).to eql(String)
+      expect(@test_result['set_test']).to be_an_instance_of(String)
       expect(@test_result['set_test']).to eql('val1,val2')
     end
 
@@ -412,8 +412,8 @@ RSpec.describe Mysql2::Result do
     end
 
     it "should return String for a BINARY value" do
-      expect(@test_result['binary_test'].class).to eql(String)
-      expect(@test_result['binary_test']).to eql("test#{"\000"*6}")
+      expect(@test_result['binary_test']).to be_an_instance_of(String)
+      expect(@test_result['binary_test']).to eql("test#{"\000" * 6}")
     end
 
     context "string encoding for BINARY values" do
@@ -450,17 +450,17 @@ RSpec.describe Mysql2::Result do
       'medium_blob_test' => 'MEDIUMBLOB',
       'medium_text_test' => 'MEDIUMTEXT',
       'long_blob_test' => 'LONGBLOB',
-      'long_text_test' => 'LONGTEXT'
+      'long_text_test' => 'LONGTEXT',
     }.each do |field, type|
       it "should return a String for #{type}" do
-        expect(@test_result[field].class).to eql(String)
+        expect(@test_result[field]).to be_an_instance_of(String)
         expect(@test_result[field]).to eql("test")
       end
 
       context "string encoding for #{type} values" do
         before { pending('Encoding is undefined') unless defined?(Encoding) }
 
-        if ['VARBINARY', 'TINYBLOB', 'BLOB', 'MEDIUMBLOB', 'LONGBLOB'].include?(type)
+        if %w(VARBINARY TINYBLOB BLOB MEDIUMBLOB LONGBLOB).include?(type)
           it "should default to binary if Encoding.default_internal is nil" do
             with_internal_encoding nil do
               result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first

data/spec/mysql2/statement_spec.rb

@@ -8,8 +8,10 @@ RSpec.describe Mysql2::Statement do
 
   it "should create a statement" do
     statement = nil
-    expect { statement = @client.prepare 'SELECT 1' }.not_to raise_error
-    expect(statement).to be_kind_of Mysql2::Statement
+    expect { statement = @client.prepare 'SELECT 1' }.to change {
+      @client.query("SHOW STATUS LIKE 'Prepared_stmt_count'").first['Value'].to_i
+    }.by(1)
+    expect(statement).to be_an_instance_of(Mysql2::Statement)
   end
 
   it "should raise an exception when server disconnects" do
@@ -53,8 +55,8 @@ RSpec.describe Mysql2::Statement do
     statement = @client.prepare 'SELECT 1'
     result = statement.execute
     rows = []
-    result.each {|r| rows << r}
-    expect(rows).to eq([{"1"=>1}])
+    result.each { |r| rows << r }
+    expect(rows).to eq([{ "1" => 1 }])
   end
 
   it "should keep its result after other query" do
@@ -64,8 +66,8 @@ RSpec.describe Mysql2::Statement do
     stmt = @client.prepare('SELECT a FROM mysql2_stmt_q WHERE a = ?')
     result1 = stmt.execute(1)
     result2 = stmt.execute(2)
-    expect(result2.first).to eq({"a"=>2})
-    expect(result1.first).to eq({"a"=>1})
+    expect(result2.first).to eq("a" => 2)
+    expect(result1.first).to eq("a" => 1)
     @client.query 'DROP TABLE IF EXISTS mysql2_stmt_q'
   end
 
@@ -91,11 +93,11 @@ RSpec.describe Mysql2::Statement do
     @client.query 'INSERT INTO mysql2_stmt_q (a, b) VALUES (1, "Hello"), (2, "World")'
     statement = @client.prepare 'SELECT * FROM mysql2_stmt_q WHERE a < ?'
     results = statement.execute(2)
-    expect(results.first).to eq({"a" => 1, "b" => "Hello"})
+    expect(results.first).to eq("a" => 1, "b" => "Hello")
 
     statement = @client.prepare 'SELECT * FROM mysql2_stmt_q WHERE b LIKE ?'
     results = statement.execute('%orld')
-    expect(results.first).to eq({"a" => 2, "b" => "World"})
+    expect(results.first).to eq("a" => 2, "b" => "World")
 
     @client.query 'DROP TABLE IF EXISTS mysql2_stmt_q'
   end
@@ -103,7 +105,7 @@ RSpec.describe Mysql2::Statement do
   it "should select dates" do
     statement = @client.prepare 'SELECT NOW()'
     result = statement.execute
-    expect(result.first.first[1]).to be_kind_of Time
+    expect(result.first.first[1]).to be_an_instance_of(Time)
   end
 
   it "should tell us about the fields" do
@@ -130,10 +132,10 @@ RSpec.describe Mysql2::Statement do
 
     it "should be able to retrieve utf8 field names correctly" do
       stmt = @client.prepare 'SELECT * FROM `テーブル`'
-      expect(stmt.fields).to eq(['整数', '文字列'])
+      expect(stmt.fields).to eq(%w(整数 文字列))
       result = stmt.execute
 
-      expect(result.to_a).to eq([{"整数"=>1, "文字列"=>"イチ"}, {"整数"=>2, "文字列"=>"弐"}, {"整数"=>3, "文字列"=>"さん"}])
+      expect(result.to_a).to eq([{ "整数" => 1, "文字列" => "イチ" }, { "整数" => 2, "文字列" => "弐" }, { "整数" => 3, "文字列" => "さん" }])
     end
 
     it "should be able to retrieve utf8 param query correctly" do
@@ -142,7 +144,7 @@ RSpec.describe Mysql2::Statement do
 
       result = stmt.execute 'イチ'
 
-      expect(result.to_a).to eq([{"整数"=>1}])
+      expect(result.to_a).to eq([{ "整数" => 1 }])
     end
 
     it "should be able to retrieve query with param in different encoding correctly" do
@@ -152,9 +154,8 @@ RSpec.describe Mysql2::Statement do
       param = 'イチ'.encode("EUC-JP")
       result = stmt.execute param
 
-      expect(result.to_a).to eq([{"整数"=>1}])
+      expect(result.to_a).to eq([{ "整数" => 1 }])
     end
-
   end if defined? Encoding
 
   context "streaming result" do
@@ -162,7 +163,7 @@ RSpec.describe Mysql2::Statement do
       n = 1
       stmt = @client.prepare("SELECT 1 UNION SELECT 2")
 
-      @client.query_options.merge!({:stream => true, :cache_rows => false, :as => :array})
+      @client.query_options.merge!(:stream => true, :cache_rows => false, :as => :array)
 
       stmt.execute.each do |r|
         case n
@@ -185,7 +186,7 @@ RSpec.describe Mysql2::Statement do
     it "should yield rows as hash's" do
       @result = @client.prepare("SELECT 1").execute
       @result.each do |row|
-        expect(row.class).to eql(Hash)
+        expect(row).to be_an_instance_of(Hash)
       end
     end
 
@@ -193,7 +194,7 @@ RSpec.describe Mysql2::Statement do
       @client.query_options[:symbolize_keys] = true
       @result = @client.prepare("SELECT 1").execute
       @result.each do |row|
-        expect(row.keys.first.class).to eql(Symbol)
+        expect(row.keys.first).to be_an_instance_of(Symbol)
       end
       @client.query_options[:symbolize_keys] = false
     end
@@ -203,7 +204,7 @@ RSpec.describe Mysql2::Statement do
 
       @result = @client.prepare("SELECT 1").execute
       @result.each do |row|
-        expect(row.class).to eql(Array)
+        expect(row).to be_an_instance_of(Array)
       end
 
       @client.query_options[:as] = :hash
@@ -259,7 +260,7 @@ RSpec.describe Mysql2::Statement do
 
     it "should return an array of field names in proper order" do
       result = @client.prepare("SELECT 'a', 'b', 'c'").execute
-      expect(result.fields).to eql(['a', 'b', 'c'])
+      expect(result.fields).to eql(%w(a b c))
     end
   end
 
@@ -270,17 +271,17 @@ RSpec.describe Mysql2::Statement do
     end
 
     it "should return nil for a NULL value" do
-      expect(@test_result['null_test'].class).to eql(NilClass)
+      expect(@test_result['null_test']).to be_an_instance_of(NilClass)
       expect(@test_result['null_test']).to eql(nil)
     end
 
     it "should return String for a BIT(64) value" do
-      expect(@test_result['bit_test'].class).to eql(String)
+      expect(@test_result['bit_test']).to be_an_instance_of(String)
       expect(@test_result['bit_test']).to eql("\000\000\000\000\000\000\000\005")
     end
 
     it "should return String for a BIT(1) value" do
-      expect(@test_result['single_bit_test'].class).to eql(String)
+      expect(@test_result['single_bit_test']).to be_an_instance_of(String)
       expect(@test_result['single_bit_test']).to eql("\001")
     end
 
@@ -347,89 +348,89 @@ RSpec.describe Mysql2::Statement do
     end
 
     it "should return BigDecimal for a DECIMAL value" do
-      expect(@test_result['decimal_test'].class).to eql(BigDecimal)
+      expect(@test_result['decimal_test']).to be_an_instance_of(BigDecimal)
       expect(@test_result['decimal_test']).to eql(10.3)
     end
 
     it "should return Float for a FLOAT value" do
-      expect(@test_result['float_test'].class).to eql(Float)
+      expect(@test_result['float_test']).to be_an_instance_of(Float)
       expect(@test_result['float_test']).to be_within(1e-5).of(10.3)
     end
 
     it "should return Float for a DOUBLE value" do
-      expect(@test_result['double_test'].class).to eql(Float)
+      expect(@test_result['double_test']).to be_an_instance_of(Float)
       expect(@test_result['double_test']).to eql(10.3)
     end
 
     it "should return Time for a DATETIME value when within the supported range" do
-      expect(@test_result['date_time_test'].class).to eql(Time)
+      expect(@test_result['date_time_test']).to be_an_instance_of(Time)
       expect(@test_result['date_time_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2010-04-04 11:44:00')
     end
 
     if 1.size == 4 # 32bit
-      unless RUBY_VERSION =~ /1.8/
-        klass = Time
+      klass = if RUBY_VERSION =~ /1.8/
+        DateTime
       else
-        klass = DateTime
+        Time
       end
 
       it "should return DateTime when timestamp is < 1901-12-13 20:45:52" do
-                                      # 1901-12-13T20:45:52 is the min for 32bit Ruby 1.8
+        # 1901-12-13T20:45:52 is the min for 32bit Ruby 1.8
         r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
-        expect(r.first['test'].class).to eql(klass)
+        expect(r.first['test']).to be_an_instance_of(klass)
       end
 
       it "should return DateTime when timestamp is > 2038-01-19T03:14:07" do
-                                      # 2038-01-19T03:14:07 is the max for 32bit Ruby 1.8
+        # 2038-01-19T03:14:07 is the max for 32bit Ruby 1.8
         r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
-        expect(r.first['test'].class).to eql(klass)
+        expect(r.first['test']).to be_an_instance_of(klass)
       end
     elsif 1.size == 8 # 64bit
-      unless RUBY_VERSION =~ /1.8/
-        it "should return Time when timestamp is < 1901-12-13 20:45:52" do
-          r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
-          expect(r.first['test'].class).to eql(Time)
-        end
-
-        it "should return Time when timestamp is > 2038-01-19T03:14:07" do
-          r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
-          expect(r.first['test'].class).to eql(Time)
-        end
-      else
+      if RUBY_VERSION =~ /1.8/
         it "should return Time when timestamp is > 0138-12-31 11:59:59" do
           r = @client.query("SELECT CAST('0139-1-1 00:00:00' AS DATETIME) as test")
-          expect(r.first['test'].class).to eql(Time)
+          expect(r.first['test']).to be_an_instance_of(Time)
         end
 
         it "should return DateTime when timestamp is < 0139-1-1T00:00:00" do
           r = @client.query("SELECT CAST('0138-12-31 11:59:59' AS DATETIME) as test")
-          expect(r.first['test'].class).to eql(DateTime)
+          expect(r.first['test']).to be_an_instance_of(DateTime)
+        end
+
+        it "should return Time when timestamp is > 2038-01-19T03:14:07" do
+          r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
+          expect(r.first['test']).to be_an_instance_of(Time)
+        end
+      else
+        it "should return Time when timestamp is < 1901-12-13 20:45:52" do
+          r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
+          expect(r.first['test']).to be_an_instance_of(Time)
         end
 
         it "should return Time when timestamp is > 2038-01-19T03:14:07" do
           r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
-          expect(r.first['test'].class).to eql(Time)
+          expect(r.first['test']).to be_an_instance_of(Time)
         end
       end
     end
 
     it "should return Time for a TIMESTAMP value when within the supported range" do
-      expect(@test_result['timestamp_test'].class).to eql(Time)
+      expect(@test_result['timestamp_test']).to be_an_instance_of(Time)
       expect(@test_result['timestamp_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2010-04-04 11:44:00')
     end
 
     it "should return Time for a TIME value" do
-      expect(@test_result['time_test'].class).to eql(Time)
+      expect(@test_result['time_test']).to be_an_instance_of(Time)
       expect(@test_result['time_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2000-01-01 11:44:00')
     end
 
     it "should return Date for a DATE value" do
-      expect(@test_result['date_test'].class).to eql(Date)
+      expect(@test_result['date_test']).to be_an_instance_of(Date)
       expect(@test_result['date_test'].strftime("%Y-%m-%d")).to eql('2010-04-04')
     end
 
     it "should return String for an ENUM value" do
-      expect(@test_result['enum_test'].class).to eql(String)
+      expect(@test_result['enum_test']).to be_an_instance_of(String)
       expect(@test_result['enum_test']).to eql('val1')
     end
 
@@ -467,7 +468,7 @@ RSpec.describe Mysql2::Statement do
     end
 
     it "should return String for a SET value" do
-      expect(@test_result['set_test'].class).to eql(String)
+      expect(@test_result['set_test']).to be_an_instance_of(String)
       expect(@test_result['set_test']).to eql('val1,val2')
     end
 
@@ -500,8 +501,8 @@ RSpec.describe Mysql2::Statement do
     end
 
     it "should return String for a BINARY value" do
-      expect(@test_result['binary_test'].class).to eql(String)
-      expect(@test_result['binary_test']).to eql("test#{"\000"*6}")
+      expect(@test_result['binary_test']).to be_an_instance_of(String)
+      expect(@test_result['binary_test']).to eql("test#{"\000" * 6}")
     end
 
     context "string encoding for BINARY values" do
@@ -538,17 +539,17 @@ RSpec.describe Mysql2::Statement do
       'medium_blob_test' => 'MEDIUMBLOB',
       'medium_text_test' => 'MEDIUMTEXT',
       'long_blob_test' => 'LONGBLOB',
-      'long_text_test' => 'LONGTEXT'
+      'long_text_test' => 'LONGTEXT',
     }.each do |field, type|
       it "should return a String for #{type}" do
-        expect(@test_result[field].class).to eql(String)
+        expect(@test_result[field]).to be_an_instance_of(String)
         expect(@test_result[field]).to eql("test")
       end
 
       context "string encoding for #{type} values" do
         before { pending('Encoding is undefined') unless defined?(Encoding) }
 
-        if ['VARBINARY', 'TINYBLOB', 'BLOB', 'MEDIUMBLOB', 'LONGBLOB'].include?(type)
+        if %w(VARBINARY TINYBLOB BLOB MEDIUMBLOB LONGBLOB).include?(type)
           it "should default to binary if Encoding.default_internal is nil" do
             with_internal_encoding nil do
               result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
@@ -595,4 +596,89 @@ RSpec.describe Mysql2::Statement do
       end
     end
   end
+
+  context 'last_id' do
+    before(:each) do
+      @client.query 'USE test'
+      @client.query 'CREATE TABLE IF NOT EXISTS lastIdTest (`id` BIGINT NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))'
+    end
+
+    after(:each) do
+      @client.query 'DROP TABLE lastIdTest'
+    end
+
+    it 'should return last insert id' do
+      stmt = @client.prepare 'INSERT INTO lastIdTest (blah) VALUES (?)'
+      expect(stmt.last_id).to eq 0
+      stmt.execute 1
+      expect(stmt.last_id).to eq 1
+    end
+
+    it 'should handle bigint ids' do
+      stmt = @client.prepare 'INSERT INTO lastIdTest (id, blah) VALUES (?, ?)'
+      stmt.execute 5000000000, 5000
+      expect(stmt.last_id).to eql(5000000000)
+
+      stmt = @client.prepare 'INSERT INTO lastIdTest (blah) VALUES (?)'
+      stmt.execute 5001
+      expect(stmt.last_id).to eql(5000000001)
+    end
+  end
+
+  context 'affected_rows' do
+    before :each do
+      @client.query 'USE test'
+      @client.query 'CREATE TABLE IF NOT EXISTS lastIdTest (`id` BIGINT NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))'
+    end
+
+    after :each do
+      @client.query 'DROP TABLE lastIdTest'
+    end
+
+    it 'should return number of rows affected by an insert' do
+      stmt = @client.prepare 'INSERT INTO lastIdTest (blah) VALUES (?)'
+      expect(stmt.affected_rows).to eq 0
+      stmt.execute 1
+      expect(stmt.affected_rows).to eq 1
+    end
+
+    it 'should return number of rows affected by an update' do
+      stmt = @client.prepare 'INSERT INTO lastIdTest (blah) VALUES (?)'
+      stmt.execute 1
+      expect(stmt.affected_rows).to eq 1
+      stmt.execute 2
+      expect(stmt.affected_rows).to eq 1
+
+      stmt = @client.prepare 'UPDATE lastIdTest SET blah=? WHERE blah=?'
+      stmt.execute 0, 1
+      expect(stmt.affected_rows).to eq 1
+    end
+
+    it 'should return number of rows affected by a delete' do
+      stmt = @client.prepare 'INSERT INTO lastIdTest (blah) VALUES (?)'
+      stmt.execute 1
+      expect(stmt.affected_rows).to eq 1
+      stmt.execute 2
+      expect(stmt.affected_rows).to eq 1
+
+      stmt = @client.prepare 'DELETE FROM lastIdTest WHERE blah=?'
+      stmt.execute 1
+      expect(stmt.affected_rows).to eq 1
+    end
+  end
+
+  context 'close' do
+    it 'should free server resources' do
+      stmt = @client.prepare 'SELECT 1'
+      expect { stmt.close }.to change {
+        @client.query("SHOW STATUS LIKE 'Prepared_stmt_count'").first['Value'].to_i
+      }.by(-1)
+    end
+
+    it 'should raise an error on subsequent execution' do
+      stmt = @client.prepare 'SELECT 1'
+      stmt.close
+      expect { stmt.execute }.to raise_error(Mysql2::Error, /Invalid statement handle/)
+    end
+  end
 end