activerecord 1.14.4 → 1.15.0

data/test/lifecycle_test.rb

@@ -46,13 +46,22 @@ end
 
 class MultiObserver < ActiveRecord::Observer
   attr_reader :record
-  
+
   def self.observed_class() [ Topic, Developer ] end
 
+  cattr_reader :last_inherited
+  @@last_inherited = nil
+
+  def observed_class_inherited_with_testing(subclass)
+    observed_class_inherited_without_testing(subclass)
+    @@last_inherited = subclass
+  end
+
+  alias_method_chain :observed_class_inherited, :testing
+
   def after_find(record)
     @record = record
   end
-
 end
 
 class LifecycleTest < Test::Unit::TestCase
@@ -63,54 +72,66 @@ class LifecycleTest < Test::Unit::TestCase
     Topic.find(1).destroy
     assert_equal 0, Topic.count
   end
-  
+
   def test_after_save
     ActiveRecord::Base.observers = :topic_manual_observer
+    ActiveRecord::Base.instantiate_observers
 
     topic = Topic.find(1)
     topic.title = "hello"
     topic.save
-    
+
     assert TopicManualObserver.instance.has_been_notified?
     assert_equal :after_save, TopicManualObserver.instance.callbacks.last["callback_method"]
   end
-  
+
   def test_observer_update_on_save
     ActiveRecord::Base.observers = TopicManualObserver
+    ActiveRecord::Base.instantiate_observers
 
-    topic = Topic.find(1)    
+    topic = Topic.find(1)
     assert TopicManualObserver.instance.has_been_notified?
     assert_equal :after_find, TopicManualObserver.instance.callbacks.first["callback_method"]
   end
-  
+
   def test_auto_observer
     topic_observer = TopicaObserver.instance
 
-    topic = Topic.find(1)    
-    assert_equal topic_observer.topic.title, topic.title
+    topic = Topic.find(1)
+    assert_equal topic.title, topic_observer.topic.title
   end
-  
-  def test_infered_auto_observer
+
+  def test_inferred_auto_observer
     topic_observer = TopicObserver.instance
 
-    topic = Topic.find(1)    
-    assert_equal topic_observer.topic.title, topic.title
+    topic = Topic.find(1)
+    assert_equal topic.title, topic_observer.topic.title
   end
-  
+
   def test_observing_two_classes
     multi_observer = MultiObserver.instance
 
     topic = Topic.find(1)
-    assert_equal multi_observer.record.title, topic.title
+    assert_equal topic.title, multi_observer.record.title
 
-    developer = Developer.find(1)    
-    assert_equal multi_observer.record.name, developer.name
+    developer = Developer.find(1)
+    assert_equal developer.name, multi_observer.record.name
   end
-  
+
   def test_observing_subclasses
     multi_observer = MultiObserver.instance
 
     developer = SpecialDeveloper.find(1)
-    assert_equal multi_observer.record.name, developer.name
+    assert_equal developer.name, multi_observer.record.name
+
+    klass = Class.new(Developer)
+    assert_equal klass, multi_observer.last_inherited
+
+    developer = klass.find(1)
+    assert_equal developer.name, multi_observer.record.name
+  end
+
+  def test_invalid_observer
+    assert_raise(ArgumentError) { Topic.observers = Object.new; Topic.instantiate_observers }
   end
 end

data/test/locking_test.rb

@@ -2,45 +2,189 @@ require 'abstract_unit'
 require 'fixtures/person'
 require 'fixtures/legacy_thing'
 
-class LockingTest < Test::Unit::TestCase
+class LockWithoutDefault < ActiveRecord::Base; end
+
+class LockWithCustomColumnWithoutDefault < ActiveRecord::Base
+  set_table_name :lock_without_defaults_cust
+  set_locking_column :custom_lock_version
+end
+
+class OptimisticLockingTest < Test::Unit::TestCase
   fixtures :people, :legacy_things
 
   def test_lock_existing
     p1 = Person.find(1)
     p2 = Person.find(1)
-    
-    p1.first_name = "Michael"
-    p1.save
-    
-    assert_raises(ActiveRecord::StaleObjectError) {
-      p2.first_name = "should fail"
-      p2.save
-    }
+    assert_equal 0, p1.lock_version
+    assert_equal 0, p2.lock_version
+
+    p1.save!
+    assert_equal 1, p1.lock_version
+    assert_equal 0, p2.lock_version
+
+    assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
   end
 
   def test_lock_new
-    p1 = Person.create({ "first_name"=>"anika"})
+    p1 = Person.new(:first_name => 'anika')
+    assert_equal 0, p1.lock_version
+
+    p1.save!
     p2 = Person.find(p1.id)
-    assert_equal p1.id, p2.id
-    p1.first_name = "Anika"
-    p1.save
-    
-    assert_raises(ActiveRecord::StaleObjectError) {
-      p2.first_name = "should fail"
-      p2.save
-    }
+    assert_equal 0, p1.lock_version
+    assert_equal 0, p2.lock_version
+
+    p1.save!
+    assert_equal 1, p1.lock_version
+    assert_equal 0, p2.lock_version
+
+    assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
   end
-  
+
   def test_lock_column_name_existing
     t1 = LegacyThing.find(1)
     t2 = LegacyThing.find(1)
-    t1.tps_report_number = 400
-    t1.save
+    assert_equal 0, t1.version
+    assert_equal 0, t2.version
+
+    t1.save!
+    assert_equal 1, t1.version
+    assert_equal 0, t2.version
 
-    assert_raises(ActiveRecord::StaleObjectError) {
-      t2.tps_report_number = 300
-      t2.save
-    }
-  end 
+    assert_raises(ActiveRecord::StaleObjectError) { t2.save! }
+  end
+
+  def test_lock_column_is_mass_assignable
+    p1 = Person.create(:first_name => 'bianca')
+    assert_equal 0, p1.lock_version
+    assert_equal p1.lock_version, Person.new(p1.attributes).lock_version
+
+    p1.save!
+    assert_equal 1, p1.lock_version
+    assert_equal p1.lock_version, Person.new(p1.attributes).lock_version
+  end
+
+  def test_lock_without_default_sets_version_to_zero
+    t1 = LockWithoutDefault.new
+    assert_equal 0, t1.lock_version
+  end
+
+  def test_lock_with_custom_column_without_default_sets_version_to_zero
+    t1 = LockWithCustomColumnWithoutDefault.new
+    assert_equal 0, t1.custom_lock_version
+  end
+end
 
+
+# TODO: test against the generated SQL since testing locking behavior itself
+# is so cumbersome. Will deadlock Ruby threads if the underlying db.execute
+# blocks, so separate script called by Kernel#system is needed.
+# (See exec vs. async_exec in the PostgreSQL adapter.)
+
+# TODO: The SQL Server and Sybase adapters currently have no support for pessimistic locking
+
+unless current_adapter?(:SQLServerAdapter, :SybaseAdapter)
+  class PessimisticLockingTest < Test::Unit::TestCase
+    self.use_transactional_fixtures = false
+    fixtures :people, :readers
+
+    def setup
+      # Avoid introspection queries during tests.
+      Person.columns; Reader.columns
+
+      @allow_concurrency = ActiveRecord::Base.allow_concurrency
+      ActiveRecord::Base.allow_concurrency = true
+    end
+
+    def teardown
+      ActiveRecord::Base.allow_concurrency = @allow_concurrency
+    end
+
+    # Test typical find.
+    def test_sane_find_with_lock
+      assert_nothing_raised do
+        Person.transaction do
+          Person.find 1, :lock => true
+        end
+      end
+    end
+
+    # Test scoped lock.
+    def test_sane_find_with_scoped_lock
+      assert_nothing_raised do
+        Person.transaction do
+          Person.with_scope(:find => { :lock => true }) do
+            Person.find 1
+          end
+        end
+      end
+    end
+
+    # PostgreSQL protests SELECT ... FOR UPDATE on an outer join.
+    unless current_adapter?(:PostgreSQLAdapter)
+      # Test locked eager find.
+      def test_eager_find_with_lock
+        assert_nothing_raised do
+          Person.transaction do
+            Person.find 1, :include => :readers, :lock => true
+          end
+        end
+      end
+    end
+
+    # Locking a record reloads it.
+    def test_sane_lock_method
+      assert_nothing_raised do
+        Person.transaction do
+          person = Person.find 1
+          old, person.first_name = person.first_name, 'fooman'
+          person.lock!
+          assert_equal old, person.first_name
+        end
+      end
+    end
+
+    if current_adapter?(:PostgreSQLAdapter, :OracleAdapter)
+      def test_no_locks_no_wait
+        first, second = duel { Person.find 1 }
+        assert first.end > second.end
+      end
+
+      def test_second_lock_waits
+        assert [0.2, 1, 5].any? { |zzz|
+          first, second = duel(zzz) { Person.find 1, :lock => true }
+          second.end > first.end
+        }
+      end
+
+      protected
+        def duel(zzz = 5)
+          t0, t1, t2, t3 = nil, nil, nil, nil
+
+          a = Thread.new do
+            t0 = Time.now
+            Person.transaction do
+              yield
+              sleep zzz       # block thread 2 for zzz seconds
+            end
+            t1 = Time.now
+          end
+
+          b = Thread.new do
+            sleep zzz / 2.0   # ensure thread 1 tx starts first
+            t2 = Time.now
+            Person.transaction { yield }
+            t3 = Time.now
+          end
+
+          a.join
+          b.join
+
+          assert t1 > t0 + zzz
+          assert t2 > t0
+          assert t3 > t2
+          [t0.to_f..t1.to_f, t2.to_f..t3.to_f]
+        end
+    end
+  end
 end

data/test/method_scoping_test.rb

@@ -57,7 +57,7 @@ class MethodScopingTest < Test::Unit::TestCase
 
     Developer.with_scope(:find => { :conditions => 'salary = 100000' }) do
       assert_equal 8, Developer.count
-      assert_equal 1, Developer.count("name LIKE 'fixture_1%'")
+      assert_equal 1, Developer.count(:conditions => "name LIKE 'fixture_1%'")
     end        
   end
 
@@ -74,7 +74,7 @@ class MethodScopingTest < Test::Unit::TestCase
   def test_scoped_count_include
     # with the include, will retrieve only developers for the given project
     Developer.with_scope(:find => { :include => :projects }) do
-      assert_equal 1, Developer.count('projects.id = 2')
+      assert_equal 1, Developer.count(:conditions => 'projects.id = 2')
     end
   end
 

data/test/migration_test.rb

@@ -1,9 +1,15 @@
 require 'abstract_unit'
+require 'bigdecimal/util'
+
 require 'fixtures/person'
+require 'fixtures/topic'
 require File.dirname(__FILE__) + '/fixtures/migrations/1_people_have_last_names'
 require File.dirname(__FILE__) + '/fixtures/migrations/2_we_need_reminders'
+require File.dirname(__FILE__) + '/fixtures/migrations_with_decimal/1_give_me_big_numbers'
+
+if ActiveRecord::Base.connection.supports_migrations?
+  class BigNumber < ActiveRecord::Base; end
 
-if ActiveRecord::Base.connection.supports_migrations? 
   class Reminder < ActiveRecord::Base; end
 
   class ActiveRecord::Migration
@@ -28,37 +34,46 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Base.connection.initialize_schema_information
       ActiveRecord::Base.connection.update "UPDATE #{ActiveRecord::Migrator.schema_info_table_name} SET version = 0"
 
-      Reminder.connection.drop_table("reminders") rescue nil
-      Reminder.connection.drop_table("people_reminders") rescue nil
-      Reminder.connection.drop_table("prefix_reminders_suffix") rescue nil
+      %w(reminders people_reminders prefix_reminders_suffix).each do |table|
+        Reminder.connection.drop_table(table) rescue nil
+      end
       Reminder.reset_column_information
 
-      Person.connection.remove_column("people", "last_name") rescue nil
-      Person.connection.remove_column("people", "key") rescue nil
-      Person.connection.remove_column("people", "bio") rescue nil
-      Person.connection.remove_column("people", "age") rescue nil
-      Person.connection.remove_column("people", "height") rescue nil
-      Person.connection.remove_column("people", "birthday") rescue nil
-      Person.connection.remove_column("people", "favorite_day") rescue nil
-      Person.connection.remove_column("people", "male") rescue nil
-      Person.connection.remove_column("people", "administrator") rescue nil
+      %w(last_name key bio age height wealth birthday favorite_day
+         male administrator).each do |column|
+        Person.connection.remove_column('people', column) rescue nil
+      end
+      Person.connection.remove_column("people", "first_name") rescue nil
+      Person.connection.remove_column("people", "middle_name") rescue nil
+      Person.connection.add_column("people", "first_name", :string, :limit => 40)
       Person.reset_column_information
     end
 
     def test_add_index
-      Person.connection.add_column "people", "last_name", :string        
+      # Limit size of last_name and key columns to support Firebird index limitations
+      Person.connection.add_column "people", "last_name", :string, :limit => 100
+      Person.connection.add_column "people", "key", :string, :limit => 100
       Person.connection.add_column "people", "administrator", :boolean
-      Person.connection.add_column "people", "key", :string
-      
+
       assert_nothing_raised { Person.connection.add_index("people", "last_name") }
       assert_nothing_raised { Person.connection.remove_index("people", "last_name") }
 
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
-      assert_nothing_raised { Person.connection.remove_index("people", "last_name") }
-      
+      # Orcl nds shrt indx nms.  Sybs 2.
+      unless current_adapter?(:OracleAdapter, :SybaseAdapter)
+        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
+        assert_nothing_raised { Person.connection.remove_index("people", :column => ["last_name", "first_name"]) }
+        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
+        assert_nothing_raised { Person.connection.remove_index("people", :name => "index_people_on_last_name_and_first_name") }
+        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
+        assert_nothing_raised { Person.connection.remove_index("people", "last_name_and_first_name") }
+        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
+        assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
+      end
+
       # quoting
-      assert_nothing_raised { Person.connection.add_index("people", ["key"], :name => "key", :unique => true) }
-      assert_nothing_raised { Person.connection.remove_index("people", :name => "key") }
+      # Note: changed index name from "key" to "key_idx" since "key" is a Firebird reserved word
+      assert_nothing_raised { Person.connection.add_index("people", ["key"], :name => "key_idx", :unique => true) }
+      assert_nothing_raised { Person.connection.remove_index("people", :name => "key_idx", :unique => true) }
 
       # Sybase adapter does not support indexes on :boolean columns
       unless current_adapter?(:SybaseAdapter)
@@ -79,8 +94,10 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
 
     def test_create_table_with_not_null_column
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string, :null => false
+      assert_nothing_raised do
+        Person.connection.create_table :testings do |t|
+          t.column :foo, :string, :null => false
+        end
       end
 
       assert_raises(ActiveRecord::StatementInvalid) do
@@ -105,30 +122,61 @@ if ActiveRecord::Base.connection.supports_migrations?
       four = columns.detect { |c| c.name == "four" }
 
       assert_equal "hello", one.default
-      if current_adapter?(:OracleAdapter)
-        # Oracle doesn't support native booleans
-        assert_equal true, two.default == 1
-        assert_equal false, three.default != 0
-      else
-        assert_equal true, two.default
-        assert_equal false, three.default
-      end
+      assert_equal true, two.default
+      assert_equal false, three.default
       assert_equal 1, four.default
 
     ensure
       Person.connection.drop_table :testings rescue nil
     end
-  
+
+    def test_create_table_with_limits
+      assert_nothing_raised do
+        Person.connection.create_table :testings do |t|
+          t.column :foo, :string, :limit => 255
+
+          t.column :default_int, :integer
+
+          t.column :one_int,   :integer, :limit => 1
+          t.column :four_int,  :integer, :limit => 4
+          t.column :eight_int, :integer, :limit => 8
+        end
+      end
+
+      columns = Person.connection.columns(:testings)
+      foo = columns.detect { |c| c.name == "foo" }
+      assert_equal 255, foo.limit
+
+      default = columns.detect { |c| c.name == "default_int" }
+      one     = columns.detect { |c| c.name == "one_int"     }
+      four    = columns.detect { |c| c.name == "four_int"    }
+      eight   = columns.detect { |c| c.name == "eight_int"   }
+
+      if current_adapter?(:PostgreSQLAdapter)
+        assert_equal 'integer', default.sql_type
+        assert_equal 'smallint', one.sql_type
+        assert_equal 'integer', four.sql_type
+        assert_equal 'bigint', eight.sql_type
+      elsif current_adapter?(:OracleAdapter)
+        assert_equal 'NUMBER(38)', default.sql_type
+        assert_equal 'NUMBER(1)', one.sql_type
+        assert_equal 'NUMBER(4)', four.sql_type
+        assert_equal 'NUMBER(8)', eight.sql_type
+      end
+    ensure
+      Person.connection.drop_table :testings rescue nil
+    end
+
     # SQL Server and Sybase will not allow you to add a NOT NULL column
     # to a table without specifying a default value, so the
-    # following test must be skipped  
-    unless current_adapter?(:SQLServerAdapter) || current_adapter?(:SybaseAdapter)
+    # following test must be skipped
+    unless current_adapter?(:SQLServerAdapter, :SybaseAdapter)
       def test_add_column_not_null_without_default
         Person.connection.create_table :testings do |t|
           t.column :foo, :string
         end
         Person.connection.add_column :testings, :bar, :string, :null => false
-  
+
         assert_raises(ActiveRecord::StatementInvalid) do
           Person.connection.execute "insert into testings (foo, bar) values ('hello', NULL)"
         end
@@ -136,52 +184,113 @@ if ActiveRecord::Base.connection.supports_migrations?
         Person.connection.drop_table :testings rescue nil
       end
     end
-    
+
     def test_add_column_not_null_with_default
       Person.connection.create_table :testings do |t|
         t.column :foo, :string
       end
-      Person.connection.add_column :testings, :bar, :string, :null => false, :default => "default"
+      
+      con = Person.connection     
+      Person.connection.enable_identity_insert("testings", true) if current_adapter?(:SybaseAdapter)
+      Person.connection.execute "insert into testings (#{con.quote_column_name('id')}, #{con.quote_column_name('foo')}) values (1, 'hello')"
+      Person.connection.enable_identity_insert("testings", false) if current_adapter?(:SybaseAdapter)
+      assert_nothing_raised {Person.connection.add_column :testings, :bar, :string, :null => false, :default => "default" }
 
       assert_raises(ActiveRecord::StatementInvalid) do
-        Person.connection.execute "insert into testings (foo, bar) values ('hello', NULL)"
+        Person.connection.execute "insert into testings (#{con.quote_column_name('id')}, #{con.quote_column_name('foo')}, #{con.quote_column_name('bar')}) values (2, 'hello', NULL)"
       end
     ensure
       Person.connection.drop_table :testings rescue nil
     end
-  
+
+    # We specifically do a manual INSERT here, and then test only the SELECT
+    # functionality. This allows us to more easily catch INSERT being broken,
+    # but SELECT actually working fine.
+    def test_native_decimal_insert_manual_vs_automatic
+      # SQLite3 always uses float in violation of SQL
+      # 16 decimal places
+      correct_value = (current_adapter?(:SQLiteAdapter) ? '0.123456789012346E20' : '0012345678901234567890.0123456789').to_d
+
+      Person.delete_all
+      Person.connection.add_column "people", "wealth", :decimal, :precision => '30', :scale => '10'
+      Person.reset_column_information
+
+      # Do a manual insertion
+      if current_adapter?(:OracleAdapter)
+        Person.connection.execute "insert into people (id, wealth) values (people_seq.nextval, 12345678901234567890.0123456789)"
+      else
+        Person.connection.execute "insert into people (wealth) values (12345678901234567890.0123456789)"
+      end
+
+      # SELECT
+      row = Person.find(:first)
+      assert_kind_of BigDecimal, row.wealth
+
+      # If this assert fails, that means the SELECT is broken!
+      assert_equal correct_value, row.wealth
+
+      # Reset to old state
+      Person.delete_all
+
+      # Now use the Rails insertion
+      assert_nothing_raised { Person.create :wealth => BigDecimal.new("12345678901234567890.0123456789") }
+
+      # SELECT
+      row = Person.find(:first)
+      assert_kind_of BigDecimal, row.wealth
+
+      # If these asserts fail, that means the INSERT (create function, or cast to SQL) is broken!
+      assert_equal correct_value, row.wealth
+
+      # Reset to old state
+      Person.connection.del_column "people", "wealth" rescue nil
+      Person.reset_column_information
+    end
+
     def test_native_types
       Person.delete_all
       Person.connection.add_column "people", "last_name", :string
       Person.connection.add_column "people", "bio", :text
       Person.connection.add_column "people", "age", :integer
       Person.connection.add_column "people", "height", :float
+      Person.connection.add_column "people", "wealth", :decimal, :precision => '30', :scale => '10'
       Person.connection.add_column "people", "birthday", :datetime
       Person.connection.add_column "people", "favorite_day", :date
       Person.connection.add_column "people", "male", :boolean
-      assert_nothing_raised { Person.create :first_name => 'bob', :last_name => 'bobsen', :bio => "I was born ....", :age => 18, :height => 1.78, :birthday => 18.years.ago, :favorite_day => 10.days.ago, :male => true }
+      assert_nothing_raised { Person.create :first_name => 'bob', :last_name => 'bobsen', :bio => "I was born ....", :age => 18, :height => 1.78, :wealth => BigDecimal.new("12345678901234567890.0123456789"), :birthday => 18.years.ago, :favorite_day => 10.days.ago, :male => true }
       bob = Person.find(:first)
-        
-      assert_equal bob.first_name, 'bob'
-      assert_equal bob.last_name, 'bobsen'
-      assert_equal bob.bio, "I was born ...."
-      assert_equal bob.age, 18
-      assert_equal bob.male?, true
-    
+
+      assert_equal 'bob', bob.first_name
+      assert_equal 'bobsen', bob.last_name
+      assert_equal "I was born ....", bob.bio
+      assert_equal 18, bob.age
+
+      # Test for 30 significent digits (beyond the 16 of float), 10 of them
+      # after the decimal place.
+      if current_adapter?(:SQLiteAdapter)
+        # SQLite3 uses float in violation of SQL. Test for 16 decimal places.
+        assert_equal BigDecimal.new('0.123456789012346E20'), bob.wealth
+      else
+        assert_equal BigDecimal.new("0012345678901234567890.0123456789"), bob.wealth
+      end
+
+      assert_equal true, bob.male?
+
       assert_equal String, bob.first_name.class
       assert_equal String, bob.last_name.class
       assert_equal String, bob.bio.class
       assert_equal Fixnum, bob.age.class
       assert_equal Time, bob.birthday.class
 
-      if current_adapter?(:SQLServerAdapter) || current_adapter?(:OracleAdapter) || current_adapter?(:SybaseAdapter)
-        # SQL Server, Sybase, and Oracle don't differentiate between date/time
+      if current_adapter?(:SQLServerAdapter, :OracleAdapter, :SybaseAdapter)
+        # Sybase, and Oracle don't differentiate between date/time
         assert_equal Time, bob.favorite_day.class
       else
         assert_equal Date, bob.favorite_day.class
       end
 
       assert_equal TrueClass, bob.male?.class
+      assert_kind_of BigDecimal, bob.wealth
     end
 
     def test_add_remove_single_field_using_string_arguments
@@ -191,7 +300,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       Person.reset_column_information
       assert Person.column_methods_hash.include?(:last_name)
-    
+
       ActiveRecord::Migration.remove_column 'people', 'last_name'
 
       Person.reset_column_information
@@ -211,27 +320,27 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.reset_column_information
       assert !Person.column_methods_hash.include?(:last_name)
     end
-    
+
     def test_add_rename
       Person.delete_all
-           
+
       begin
-        Person.connection.add_column "people", "girlfriend", :string      
-        Person.create :girlfriend => 'bobette'      
-      
+        Person.connection.add_column "people", "girlfriend", :string
+        Person.create :girlfriend => 'bobette'
+
         Person.connection.rename_column "people", "girlfriend", "exgirlfriend"
-      
-        Person.reset_column_information      
+
+        Person.reset_column_information
         bob = Person.find(:first)
-      
+
         assert_equal "bobette", bob.exgirlfriend
       ensure
         Person.connection.remove_column("people", "girlfriend") rescue nil
         Person.connection.remove_column("people", "exgirlfriend") rescue nil
       end
-      
+
     end
-    
+
     def test_rename_column_using_symbol_arguments
       begin
         Person.connection.rename_column :people, :first_name, :nick_name
@@ -242,7 +351,7 @@ if ActiveRecord::Base.connection.supports_migrations?
         Person.connection.add_column("people","first_name", :string)
       end
     end
-    
+
     def test_rename_column
       begin
         Person.connection.rename_column "people", "first_name", "nick_name"
@@ -253,7 +362,7 @@ if ActiveRecord::Base.connection.supports_migrations?
         Person.connection.add_column("people","first_name", :string)
       end
     end
-    
+
     def test_rename_table
       begin
         ActiveRecord::Base.connection.create_table :octopuses do |t|
@@ -261,14 +370,11 @@ if ActiveRecord::Base.connection.supports_migrations?
         end
         ActiveRecord::Base.connection.rename_table :octopuses, :octopi
 
-        assert_nothing_raised do
-          if current_adapter?(:OracleAdapter)
-            # Oracle requires the explicit sequence value for the pk
-            ActiveRecord::Base.connection.execute "INSERT INTO octopi (id, url) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')"
-          else
-            ActiveRecord::Base.connection.execute "INSERT INTO octopi (url) VALUES ('http://www.foreverflying.com/octopus-black7.jpg')"
-          end
-        end
+        # Using explicit id in insert for compatibility across all databases
+        con = ActiveRecord::Base.connection     
+        con.enable_identity_insert("octopi", true) if current_adapter?(:SybaseAdapter)
+        assert_nothing_raised { con.execute "INSERT INTO octopi (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')" }
+        con.enable_identity_insert("octopi", false) if current_adapter?(:SybaseAdapter)
 
         assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', ActiveRecord::Base.connection.select_value("SELECT url FROM octopi WHERE id=1")
 
@@ -278,40 +384,159 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
     end
 
+    def test_rename_table_with_an_index
+      begin
+        ActiveRecord::Base.connection.create_table :octopuses do |t|
+          t.column :url, :string
+        end
+        ActiveRecord::Base.connection.add_index :octopuses, :url
+        
+        ActiveRecord::Base.connection.rename_table :octopuses, :octopi
+
+        # Using explicit id in insert for compatibility across all databases
+        con = ActiveRecord::Base.connection     
+        con.enable_identity_insert("octopi", true) if current_adapter?(:SybaseAdapter)
+        assert_nothing_raised { con.execute "INSERT INTO octopi (#{con.quote_column_name('id')}, #{con.quote_column_name('url')}) VALUES (1, 'http://www.foreverflying.com/octopus-black7.jpg')" }
+        con.enable_identity_insert("octopi", false) if current_adapter?(:SybaseAdapter)
+
+        assert_equal 'http://www.foreverflying.com/octopus-black7.jpg', ActiveRecord::Base.connection.select_value("SELECT url FROM octopi WHERE id=1")
+        assert ActiveRecord::Base.connection.indexes(:octopi).first.columns.include?("url")
+      ensure
+        ActiveRecord::Base.connection.drop_table :octopuses rescue nil
+        ActiveRecord::Base.connection.drop_table :octopi rescue nil
+      end
+    end
+
     def test_change_column
       Person.connection.add_column 'people', 'age', :integer
       old_columns = Person.connection.columns(Person.table_name, "#{name} Columns")
       assert old_columns.find { |c| c.name == 'age' and c.type == :integer }
 
       assert_nothing_raised { Person.connection.change_column "people", "age", :string }
-      
+
       new_columns = Person.connection.columns(Person.table_name, "#{name} Columns")
       assert_nil new_columns.find { |c| c.name == 'age' and c.type == :integer }
       assert new_columns.find { |c| c.name == 'age' and c.type == :string }
-    end    
+
+      old_columns = Topic.connection.columns(Topic.table_name, "#{name} Columns")
+      assert old_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == true }
+      assert_nothing_raised { Topic.connection.change_column :topics, :approved, :boolean, :default => false }
+      new_columns = Topic.connection.columns(Topic.table_name, "#{name} Columns")     
+      assert_nil new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == true }
+      assert new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == false }
+      assert_nothing_raised { Topic.connection.change_column :topics, :approved, :boolean, :default => true }
+    end
+    
+    def test_change_column_with_nil_default
+      Person.connection.add_column "people", "contributor", :boolean, :default => true
+      Person.reset_column_information
+      assert Person.new.contributor?
+      
+      assert_nothing_raised { Person.connection.change_column "people", "contributor", :boolean, :default => nil }
+      Person.reset_column_information
+      assert !Person.new.contributor?
+      assert_nil Person.new.contributor
+    end
 
     def test_change_column_with_new_default
-      Person.connection.add_column "people", "administrator", :boolean, :default => 1
-      Person.reset_column_information            
+      Person.connection.add_column "people", "administrator", :boolean, :default => true
+      Person.reset_column_information
       assert Person.new.administrator?
-      
-      assert_nothing_raised { Person.connection.change_column "people", "administrator", :boolean, :default => 0 }
-      Person.reset_column_information            
+
+      assert_nothing_raised { Person.connection.change_column "people", "administrator", :boolean, :default => false }
+      Person.reset_column_information
       assert !Person.new.administrator?
-    end    
+    end
+    
+    def test_change_column_default
+      Person.connection.change_column_default "people", "first_name", "Tester"
+      Person.reset_column_information
+      assert_equal "Tester", Person.new.first_name
+    end
+    
+    def test_change_column_default_to_null
+      Person.connection.change_column_default "people", "first_name", nil
+      Person.reset_column_information
+      assert_nil Person.new.first_name
+    end
 
     def test_add_table
       assert !Reminder.table_exists?
-      
+
       WeNeedReminders.up
-    
+
       assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
       assert_equal "hello world", Reminder.find(:first).content
-    
+
       WeNeedReminders.down
       assert_raises(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
     end
 
+    def test_add_table_with_decimals
+      Person.connection.drop_table :big_numbers rescue nil
+
+      assert !BigNumber.table_exists?
+      GiveMeBigNumbers.up
+
+      assert BigNumber.create(
+        :bank_balance => 1586.43,
+        :big_bank_balance => BigDecimal("1000234000567.95"),
+        :world_population => 6000000000,
+        :my_house_population => 3,
+        :value_of_e => BigDecimal("2.7182818284590452353602875")
+      )
+
+      b = BigNumber.find(:first)
+      assert_not_nil b
+
+      assert_not_nil b.bank_balance
+      assert_not_nil b.big_bank_balance
+      assert_not_nil b.world_population
+      assert_not_nil b.my_house_population
+      assert_not_nil b.value_of_e
+
+      # TODO: set world_population >= 2**62 to cover 64-bit platforms and test
+      # is_a?(Bignum)
+      assert_kind_of Integer, b.world_population
+      assert_equal 6000000000, b.world_population
+      assert_kind_of Fixnum, b.my_house_population
+      assert_equal 3, b.my_house_population
+      assert_kind_of BigDecimal, b.bank_balance
+      assert_equal BigDecimal("1586.43"), b.bank_balance
+      assert_kind_of BigDecimal, b.big_bank_balance
+      assert_equal BigDecimal("1000234000567.95"), b.big_bank_balance
+
+      # This one is fun. The 'value_of_e' field is defined as 'DECIMAL' with
+      # precision/scale explictly left out.  By the SQL standard, numbers
+      # assigned to this field should be truncated but that's seldom respected.
+      if current_adapter?(:PostgreSQLAdapter, :SQLite2Adapter)
+        # - PostgreSQL changes the SQL spec on columns declared simply as
+        # "decimal" to something more useful: instead of being given a scale
+        # of 0, they take on the compile-time limit for precision and scale,
+        # so the following should succeed unless you have used really wacky
+        # compilation options
+        # - SQLite2 has the default behavior of preserving all data sent in,
+        # so this happens there too
+        assert_kind_of BigDecimal, b.value_of_e
+        assert_equal BigDecimal("2.7182818284590452353602875"), b.value_of_e
+      elsif current_adapter?(:SQLiteAdapter)
+        # - SQLite3 stores a float, in violation of SQL
+        assert_kind_of BigDecimal, b.value_of_e
+        assert_equal BigDecimal("2.71828182845905"), b.value_of_e
+      elsif current_adapter?(:SQLServer)
+        # - SQL Server rounds instead of truncating
+        assert_kind_of Fixnum, b.value_of_e
+        assert_equal 3, b.value_of_e
+      else
+        # - SQL standard is an integer
+        assert_kind_of Fixnum, b.value_of_e
+        assert_equal 2, b.value_of_e
+      end
+
+      GiveMeBigNumbers.down
+      assert_raises(ActiveRecord::StatementInvalid) { BigNumber.find(:first) }
+    end
+
     def test_migrator
       assert !Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
@@ -335,7 +560,7 @@ if ActiveRecord::Base.connection.supports_migrations?
     def test_migrator_one_up
       assert !Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
-      
+
       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
 
       Person.reset_column_information
@@ -347,17 +572,17 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
       assert_equal "hello world", Reminder.find(:first).content
     end
-  
+
     def test_migrator_one_down
       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/')
-    
+
       ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
 
       Person.reset_column_information
       assert Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
     end
-  
+
     def test_migrator_one_up_one_down
       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
       ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 0)
@@ -365,7 +590,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert !Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
     end
-    
+
     def test_migrator_verbosity
       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
       assert PeopleHaveLastNames.message_count > 0
@@ -375,7 +600,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert PeopleHaveLastNames.message_count > 0
       PeopleHaveLastNames.message_count = 0
     end
-    
+
     def test_migrator_verbosity_off
       PeopleHaveLastNames.verbose = false
       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
@@ -383,7 +608,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 0)
       assert PeopleHaveLastNames.message_count.zero?
     end
-    
+
     def test_migrator_going_down_due_to_version_target
       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
       ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations/', 0)
@@ -412,14 +637,14 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Base.table_name_prefix = ""
       ActiveRecord::Base.table_name_suffix = ""
     end
-  
+
     def test_proper_table_name
       assert_equal "table", ActiveRecord::Migrator.proper_table_name('table')
       assert_equal "table", ActiveRecord::Migrator.proper_table_name(:table)
       assert_equal "reminders", ActiveRecord::Migrator.proper_table_name(Reminder)
       Reminder.reset_table_name
       assert_equal Reminder.table_name, ActiveRecord::Migrator.proper_table_name(Reminder)
-  
+
       # Use the model's own prefix/suffix if a model is given
       ActiveRecord::Base.table_name_prefix = "ARprefix_"
       ActiveRecord::Base.table_name_suffix = "_ARsuffix"
@@ -430,8 +655,8 @@ if ActiveRecord::Base.connection.supports_migrations?
       Reminder.table_name_prefix = ''
       Reminder.table_name_suffix = ''
       Reminder.reset_table_name
-      
-      # Use AR::Base's prefix/suffix if string or symbol is given      
+
+      # Use AR::Base's prefix/suffix if string or symbol is given
       ActiveRecord::Base.table_name_prefix = "prefix_"
       ActiveRecord::Base.table_name_suffix = "_suffix"
       Reminder.reset_table_name
@@ -440,7 +665,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Base.table_name_prefix = ""
       ActiveRecord::Base.table_name_suffix = ""
       Reminder.reset_table_name
-    end  
+    end
 
     def test_add_drop_table_with_prefix_and_suffix
       assert !Reminder.table_exists?
@@ -461,31 +686,83 @@ if ActiveRecord::Base.connection.supports_migrations?
       Reminder.reset_sequence_name
     end
 
-    def test_create_table_with_binary_column
-      Person.connection.drop_table :binary_testings rescue nil
-    
-      assert_nothing_raised {
-        Person.connection.create_table :binary_testings do |t|
-          t.column "data", :binary, :default => "", :null => false
+#   FrontBase does not support default values on BLOB/CLOB columns
+    unless current_adapter?(:FrontBaseAdapter)
+      def test_create_table_with_binary_column
+        Person.connection.drop_table :binary_testings rescue nil
+
+        assert_nothing_raised {
+          Person.connection.create_table :binary_testings do |t|
+            t.column "data", :binary, :default => "", :null => false
+          end
+        }
+
+        columns = Person.connection.columns(:binary_testings)
+        data_column = columns.detect { |c| c.name == "data" }
+
+        if current_adapter?(:OracleAdapter)
+          assert_equal "empty_blob()", data_column.default
+        else
+          assert_equal "", data_column.default
         end
-      }
-      
-      columns = Person.connection.columns(:binary_testings)
-      data_column = columns.detect { |c| c.name == "data" }
 
-      if current_adapter?(:OracleAdapter)
-        assert_equal "empty_blob()", data_column.default
-      else
-        assert_equal "", data_column.default
+        Person.connection.drop_table :binary_testings rescue nil
       end
-
-      Person.connection.drop_table :binary_testings rescue nil
     end
-
     def test_migrator_with_duplicates
       assert_raises(ActiveRecord::DuplicateMigrationVersionError) do
         ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations_with_duplicate/', nil)
       end
     end
+
+    def test_migrator_with_missing_version_numbers
+      ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations_with_missing_versions/', 500)
+      assert !Person.column_methods_hash.include?(:middle_name)
+    	assert_equal 4, ActiveRecord::Migrator.current_version
+			
+			ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations_with_missing_versions/', 2)
+			assert !Reminder.table_exists?
+      assert Person.column_methods_hash.include?(:last_name)			
+			assert_equal 2, ActiveRecord::Migrator.current_version
+    end
+    
+    def test_create_table_with_custom_sequence_name
+      return unless current_adapter? :OracleAdapter
+
+      # table name is 29 chars, the standard sequence name will
+      # be 33 chars and fail
+      assert_raises(ActiveRecord::StatementInvalid) do
+        begin
+          Person.connection.create_table :table_with_name_thats_just_ok do |t|
+            t.column :foo, :string, :null => false
+          end
+        ensure
+          Person.connection.drop_table :table_with_name_thats_just_ok rescue nil
+        end
+      end
+
+      # should be all good w/ a custom sequence name
+      assert_nothing_raised do
+        begin
+          Person.connection.create_table :table_with_name_thats_just_ok,
+                                         :sequence_name => 'suitably_short_seq' do |t|
+            t.column :foo, :string, :null => false
+          end
+
+          Person.connection.execute("select suitably_short_seq.nextval from dual")
+
+        ensure
+          Person.connection.drop_table :table_with_name_thats_just_ok,
+                                       :sequence_name => 'suitably_short_seq' rescue nil
+        end
+      end
+
+      # confirm the custom sequence got dropped
+      assert_raises(ActiveRecord::StatementInvalid) do
+        Person.connection.execute("select suitably_short_seq.nextval from dual")
+      end
+    end
+
   end
 end
+