2 files changed, 19 insertions, 0 deletions
diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
index 46da1b0a2b..1dbeb66af6 100644
--- a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
@@ -1,6 +1,7 @@
 require "cases/helper"
 require 'bigdecimal'
 require 'yaml'
+require 'securerandom'
 
 module ActiveRecord
   module ConnectionAdapters
@@ -12,6 +13,14 @@ module ActiveRecord
             :timeout => 100
         end
 
+        def test_type_cast_binary_encoding_without_logger
+          @conn.extend(Module.new { def logger; end })
+          column = Struct.new(:type, :name).new(:string, "foo")
+          binary = SecureRandom.hex
+          expected = binary.dup.encode!('utf-8')
+          assert_equal expected, @conn.type_cast(binary, column)
+        end
+
         def test_type_cast_symbol
           assert_equal 'foo', @conn.type_cast(:foo, nil)
         end
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 4078b7eb0b..23bdb09514 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -625,6 +625,16 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_time_zone_aware_attribute_saved
+    in_time_zone 1 do
+      record = @target.create(:written_on => '2012-02-20 10:00')
+
+      record.written_on = '2012-02-20 09:00'
+      record.save
+      assert_equal Time.zone.local(2012, 02, 20, 9), record.reload.written_on
+    end
+  end
+
   def test_setting_time_zone_aware_attribute_to_blank_string_returns_nil
     in_time_zone "Pacific Time (US & Canada)" do
       record   = @target.new