2 files changed, 25 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/has_one_through_associations_test.rb b/activerecord/test/cases/associations/has_one_through_associations_test.rb
index 089cb0a3a2..19d1aa87a8 100644
--- a/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -289,6 +289,12 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_has_one_through_polymorphic_association
+    assert_raise(ActiveRecord::HasOneAssociationPolymorphicThroughError) do
+      @member.premium_club
+    end
+  end
+
   def test_has_one_through_belongs_to_should_update_when_the_through_foreign_key_changes
     minivan = minivans(:cool_first)
 
diff --git a/activerecord/test/cases/migration/change_schema_test.rb b/activerecord/test/cases/migration/change_schema_test.rb
index bd3dd29f4d..d91e7142b3 100644
--- a/activerecord/test/cases/migration/change_schema_test.rb
+++ b/activerecord/test/cases/migration/change_schema_test.rb
@@ -97,6 +97,25 @@ module ActiveRecord
         end
       end
 
+      def test_create_table_with_bigint
+        connection.create_table :testings do |t|
+          t.bigint :eight_int
+        end
+        columns = connection.columns(:testings)
+        eight   = columns.detect { |c| c.name == "eight_int"   }
+
+        if current_adapter?(:OracleAdapter)
+          assert_equal 'NUMBER(8)', eight.sql_type
+        elsif current_adapter?(:SQLite3Adapter)
+          assert_equal 'bigint', eight.sql_type
+        else
+          assert_equal :integer, eight.type
+          assert_equal 8, eight.limit
+        end
+      ensure
+        connection.drop_table :testings
+      end
+
       def test_create_table_with_limits
         connection.create_table :testings do |t|
           t.column :foo, :string, :limit => 255