ibm_db 0.9.5 → 0.10.0

data/test/{migration_test.rb → cases/migration_test.rb}

@@ -1,17 +1,19 @@
-require 'abstract_unit'
+require "cases/helper"
 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'
+require 'models/person'
+require 'models/topic'
+
+require MIGRATIONS_ROOT + "/valid/1_people_have_last_names"
+require MIGRATIONS_ROOT + "/valid/2_we_need_reminders"
+require MIGRATIONS_ROOT + "/decimal/1_give_me_big_numbers"
+require MIGRATIONS_ROOT + "/interleaved/pass_3/2_i_raise_on_down"
 
 if ActiveRecord::Base.connection.supports_migrations?
   class BigNumber < ActiveRecord::Base; end
-
+  
   class Reminder < ActiveRecord::Base; end
-
+  
   class ActiveRecord::Migration
     class <<self
       attr_accessor :message_count
@@ -22,9 +24,9 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
   end
 
-  class IBMDBMigrationTest < Test::Unit::TestCase
+  class MigrationTest < ActiveRecord::TestCase
     self.use_transactional_fixtures = false
-    
+
     fixtures :people
 
     def setup
@@ -33,8 +35,8 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
 
     def teardown
-      ActiveRecord::Base.connection.initialize_schema_information
-      ActiveRecord::Base.connection.update "UPDATE #{ActiveRecord::Migrator.schema_info_table_name} SET version = 0"
+      ActiveRecord::Base.connection.initialize_schema_migrations_table
+      ActiveRecord::Base.connection.execute "DELETE FROM #{ActiveRecord::Migrator.schema_migrations_table_name}"
 
       %w(reminders people_reminders prefix_reminders_suffix).each do |table|
         Reminder.connection.drop_table(table) rescue nil
@@ -46,8 +48,8 @@ if ActiveRecord::Base.connection.supports_migrations?
         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.connection.remove_column("people", "middle_name") rescue nil
+    Person.connection.add_column("people", "first_name", :string, :limit => 40)
       Person.reset_column_information
     end
 
@@ -77,10 +79,15 @@ if ActiveRecord::Base.connection.supports_migrations?
       # Note: changed index name from "key" to "key_idx" since "key" is a Firebird reserved word
       # OpenBase does not have named indexes.  You must specify a single column name
       unless current_adapter?(:OpenBaseAdapter)
+        unless current_adapter?(:IBM_DBAdapter)
+          Person.update_all "#{Person.connection.quote_column_name 'key'}=#{Person.connection.quote_column_name 'id'}" #some databases (including sqlite2 won't add a unique index if existing data non unique)
+        else
+          Person.update_all "#{Person.connection.quote_column_name 'key'}=#{Person.connection.quote_column_name 'first_name'}" #some databases (including sqlite2 won't add a unique index if existing data non unique)
+        end 
         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) }
       end
-      
+
       # Sybase adapter does not support indexes on :boolean columns
       # OpenBase does not have named indexes.  You must specify a single column
       unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter)
@@ -116,10 +123,10 @@ if ActiveRecord::Base.connection.supports_migrations?
 
     def test_create_table_with_defaults
       # MySQL doesn't allow defaults on TEXT or BLOB columns.
-      mysql = current_adapter?(:MysqlAdapter) 
+      mysql = current_adapter?(:MysqlAdapter)
     ibm_ids_zOS = ActiveRecord::Base.connection.servertype.class.name.include?('::IBM_IDS')||
         ActiveRecord::Base.connection.servertype.class.name.include?('::IBM_DB2_ZOS')
-
+    
       Person.connection.create_table :testings do |t|
         t.column :one, :string, :default => "hello"
         t.column :two, :boolean, :default => true
@@ -145,9 +152,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.connection.drop_table :testings rescue nil
     end
 
-    # IBM data servers do not support limits on certain data types (unlike MySQL)
-    # Limit is supported for the {float, decimal, numeric, varchar, clob, blob} data types.
-    if current_adapter?(:IBM_DBAdapter)
+  if current_adapter?(:IBM_DBAdapter)
       def test_no_limits_datatypes_IBM_DB
         clasz = Class.new(ActiveRecord::Base)
         clasz.table_name = 'test_no_limits_datatypes_IBM_DB'
@@ -181,7 +186,7 @@ if ActiveRecord::Base.connection.supports_migrations?
         clasz.connection.drop_table(clasz.table_name) rescue nil
       end
     end
-    
+  
     def test_create_table_with_limits
       assert_nothing_raised do
         Person.connection.create_table :testings do |t|
@@ -219,6 +224,51 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.connection.drop_table :testings rescue nil
     end
 
+    def test_create_table_with_primary_key_prefix_as_table_name_with_underscore
+      ActiveRecord::Base.primary_key_prefix_type = :table_name_with_underscore
+
+      Person.connection.create_table :testings do |t|
+          t.column :foo, :string
+      end
+
+      assert_equal %w(foo testings_id), Person.connection.columns(:testings).map { |c| c.name }.sort
+    ensure
+      Person.connection.drop_table :testings rescue nil
+      ActiveRecord::Base.primary_key_prefix_type = nil
+    end
+
+    def test_create_table_with_primary_key_prefix_as_table_name
+      ActiveRecord::Base.primary_key_prefix_type = :table_name
+
+      Person.connection.create_table :testings do |t|
+          t.column :foo, :string
+      end
+
+      assert_equal %w(foo testingsid), Person.connection.columns(:testings).map { |c| c.name }.sort
+    ensure
+      Person.connection.drop_table :testings rescue nil
+      ActiveRecord::Base.primary_key_prefix_type = nil
+    end
+
+    uses_mocha('test_create_table_with_force_true_does_not_drop_nonexisting_table') do
+      def test_create_table_with_force_true_does_not_drop_nonexisting_table
+        if Person.connection.table_exists?(:testings2)
+          Person.connection.drop_table :testings2
+        end
+
+        # using a copy as we need the drop_table method to
+        # continue to work for the ensure block of the test
+        temp_conn = Person.connection.dup
+        temp_conn.expects(:drop_table).never
+        temp_conn.create_table :testings2, :force => true do |t|
+          t.column :foo, :string
+        end
+      ensure
+        Person.connection.drop_table :testings2 rescue nil
+      end
+    end
+
+
     # SQL Server, Sybase, and SQLite3 will not allow you to add a NOT NULL
     # column to a table without a default value.
     unless current_adapter?(:SQLServerAdapter, :SybaseAdapter, :SQLiteAdapter, :IBM_DBAdapter)
@@ -240,8 +290,8 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.connection.create_table :testings do |t|
         t.column :foo, :string
       end
-      
-      con = Person.connection     
+
+      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)
@@ -272,7 +322,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       # Do a manual insertion
       if current_adapter?(:OracleAdapter)
         Person.connection.execute "insert into people (id, wealth) values (people_seq.nextval, 12345678901234567890.0123456789)"
-      elsif current_adapter?(:OpenBaseAdapter)
+      elsif current_adapter?(:OpenBaseAdapter) || (current_adapter?(:MysqlAdapter) && Mysql.client_version < 50003) #before mysql 5.0.3 decimals stored as strings
         Person.connection.execute "insert into people (wealth) values ('12345678901234567890.0123456789')"
       else
         Person.connection.execute "insert into people (wealth) values (12345678901234567890.0123456789)"
@@ -307,6 +357,15 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.reset_column_information
     end
 
+    def test_add_column_with_precision_and_scale
+      Person.connection.add_column 'people', 'wealth', :decimal, :precision => 9, :scale => 7
+      Person.reset_column_information
+
+      wealth_column = Person.columns_hash['wealth']
+      assert_equal 9, wealth_column.precision
+      assert_equal 7, wealth_column.scale
+    end
+    
     def test_native_types
       Person.delete_all
       Person.connection.add_column "people", "last_name", :string
@@ -336,11 +395,11 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       # Test for 30 significent digits (beyond the 16 of float), 10 of them
       # after the decimal place.
-     
+
       unless current_adapter?(:SQLite3Adapter)
         assert_equal BigDecimal.new("0012345678901234567890.0123456789"), bob.wealth
       end
-      
+
       assert_equal true, bob.male?
 
       assert_equal String, bob.first_name.class
@@ -359,10 +418,16 @@ if ActiveRecord::Base.connection.supports_migrations?
       # Test DateTime column and defaults, including timezone.
       # FIXME: moment of truth may be Time on 64-bit platforms.
       if bob.moment_of_truth.is_a?(DateTime)
-        assert_equal DateTime.now.offset, bob.moment_of_truth.offset
-        assert_not_equal 0, bob.moment_of_truth.offset
-        assert_not_equal "Z", bob.moment_of_truth.zone
-        assert_equal DateTime::ITALY, bob.moment_of_truth.start
+
+        with_env_tz 'US/Eastern' do
+          assert_equal DateTime.local_offset, bob.moment_of_truth.offset
+          assert_not_equal 0, bob.moment_of_truth.offset
+          assert_not_equal "Z", bob.moment_of_truth.zone
+          # US/Eastern is -5 hours from GMT
+          assert_equal Rational(-5, 24), bob.moment_of_truth.offset
+          assert_match /\A-05:?00\Z/, bob.moment_of_truth.zone #ruby 1.8.6 uses HH:MM, prior versions use HHMM
+          assert_equal DateTime::ITALY, bob.moment_of_truth.start
+        end
       end
 
       assert_equal TrueClass, bob.male?.class
@@ -376,7 +441,7 @@ if ActiveRecord::Base.connection.supports_migrations?
         ActiveRecord::Migration.add_column :people, :intelligence_quotient, :tinyint
         Person.reset_column_information
         Person.create :intelligence_quotient => 300
-        jonnyg = Person.find(:first) 
+        jonnyg = Person.find(:first)
         assert_equal 127, jonnyg.intelligence_quotient
         jonnyg.destroy
       ensure
@@ -415,13 +480,14 @@ if ActiveRecord::Base.connection.supports_migrations?
   unless current_adapter?(:IBM_DBAdapter) # rename not supported
     def test_add_rename
       Person.delete_all
+  
       begin
         Person.connection.add_column "people", "girlfriend", :string
         Person.reset_column_information
         Person.create :girlfriend => 'bobette'
-
-        Person.connection.rename_column "people", "girlfriend", "exgirlfriend"
   
+        Person.connection.rename_column "people", "girlfriend", "exgirlfriend"
+    
         Person.reset_column_information
         bob = Person.find(:first)
 
@@ -430,10 +496,9 @@ if ActiveRecord::Base.connection.supports_migrations?
         Person.connection.remove_column("people", "girlfriend") rescue nil
         Person.connection.remove_column("people", "exgirlfriend") rescue nil
       end
+
     end
-  end
   
-  unless current_adapter?(:IBM_DBAdapter) # rename not supported  
     def test_rename_column_using_symbol_arguments
       begin
         names_before = Person.find(:all).map(&:first_name)
@@ -446,24 +511,20 @@ if ActiveRecord::Base.connection.supports_migrations?
         Person.connection.add_column("people","first_name", :string)
       end
     end
-  end
 
-  unless current_adapter?(:IBM_DBAdapter) # rename not supported
     def test_rename_column
-    begin
-      names_before = Person.find(:all).map(&:first_name)
-      Person.connection.rename_column "people", "first_name", "nick_name"
-      Person.reset_column_information
-      assert Person.column_names.include?("nick_name")
-      assert_equal names_before, Person.find(:all).map(&:nick_name)
-    ensure
-      Person.connection.remove_column("people","nick_name")
-      Person.connection.add_column("people","first_name", :string)
-    end
+      begin
+        names_before = Person.find(:all).map(&:first_name)
+        Person.connection.rename_column "people", "first_name", "nick_name"
+        Person.reset_column_information
+        assert Person.column_names.include?("nick_name")
+        assert_equal names_before, Person.find(:all).map(&:nick_name)
+      ensure
+        Person.connection.remove_column("people","nick_name")
+        Person.connection.add_column("people","first_name", :string)
+      end
     end
-  end 
 
-  unless current_adapter?(:IBM_DBAdapter) # rename not supported
     def test_rename_column_with_sql_reserved_word
       begin
         assert_nothing_raised { Person.connection.rename_column "people", "first_name", "group" }
@@ -474,16 +535,54 @@ if ActiveRecord::Base.connection.supports_migrations?
         Person.connection.add_column("people", "first_name", :string) rescue nil
       end
     end
+
+    def test_rename_column_with_an_index
+      ActiveRecord::Base.connection.create_table(:hats) do |table|
+        table.column :hat_name, :string, :limit => 100
+        table.column :hat_size, :integer
+      end
+      Person.connection.add_index :hats, :hat_name
+      assert_nothing_raised do
+        Person.connection.rename_column "hats", "hat_name", "name"
+      end
+    ensure
+      ActiveRecord::Base.connection.drop_table(:hats)
+    end
   end 
-    
+
+    def test_remove_column_with_index
+      ActiveRecord::Base.connection.create_table(:hats) do |table|
+        table.column :hat_name, :string, :limit => 100
+        table.column :hat_size, :integer
+      end
+      ActiveRecord::Base.connection.add_index "hats", "hat_size"
+
+      assert_nothing_raised { Person.connection.remove_column("hats", "hat_size") }
+    ensure
+      ActiveRecord::Base.connection.drop_table(:hats)
+    end
+
+    def test_remove_column_with_multi_column_index
+      ActiveRecord::Base.connection.create_table(:hats) do |table|
+        table.column :hat_name, :string, :limit => 100
+        table.column :hat_size, :integer
+        table.column :hat_style, :string, :limit => 100
+      end
+      ActiveRecord::Base.connection.add_index "hats", ["hat_style", "hat_size"], :unique => true
+
+      assert_nothing_raised { Person.connection.remove_column("hats", "hat_size") }
+    ensure
+      ActiveRecord::Base.connection.drop_table(:hats)
+    end
+
   unless current_adapter?(:IBM_DBAdapter) #incompatible types changes
     def test_change_type_of_not_null_column
       assert_nothing_raised do
-        Topic.connection.change_column "topics", "written_on", :datetime, :null => false
-        Topic.reset_column_information
-      
-        Topic.connection.change_column "topics", "written_on", :datetime, :null => false
-        Topic.reset_column_information
+      Topic.connection.change_column "topics", "written_on", :datetime, :null => false
+      Topic.reset_column_information
+
+      Topic.connection.change_column "topics", "written_on", :datetime, :null => false
+      Topic.reset_column_information
       end
     end
   end 
@@ -496,7 +595,7 @@ if ActiveRecord::Base.connection.supports_migrations?
         ActiveRecord::Base.connection.rename_table :octopuses, :octopi
 
         # Using explicit id in insert for compatibility across all databases
-        con = ActiveRecord::Base.connection     
+        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)
@@ -508,20 +607,20 @@ if ActiveRecord::Base.connection.supports_migrations?
         ActiveRecord::Base.connection.drop_table :octopi rescue nil
       end
     end
-    
+
     def test_change_column_nullability
-      Person.delete_all 
+      Person.delete_all
       Person.connection.add_column "people", "funny", :boolean
       Person.reset_column_information
       assert Person.columns_hash["funny"].null, "Column 'funny' must initially allow nulls"
-      unless current_adapter?(:IBM_DBAdapter) # incompatible types changes
-        Person.connection.change_column "people", "funny", :boolean, :null => false, :default => true
-        Person.reset_column_information
-        assert !Person.columns_hash["funny"].null, "Column 'funny' must *not* allow nulls at this point"
-        Person.connection.change_column "people", "funny", :boolean, :null => true
-        Person.reset_column_information
-        assert Person.columns_hash["funny"].null, "Column 'funny' must allow nulls again at this point"
-      end
+    unless current_adapter?(:IBM_DBAdapter) # incompatible types changes  
+    Person.connection.change_column "people", "funny", :boolean, :null => false, :default => true
+    Person.reset_column_information
+    assert !Person.columns_hash["funny"].null, "Column 'funny' must *not* allow nulls at this point"
+    Person.connection.change_column "people", "funny", :boolean, :null => true
+    Person.reset_column_information
+    assert Person.columns_hash["funny"].null, "Column 'funny' must allow nulls again at this point"
+    end 
     end
 
     def test_rename_table_with_an_index
@@ -530,11 +629,11 @@ if ActiveRecord::Base.connection.supports_migrations?
           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 = 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)
@@ -552,9 +651,9 @@ if ActiveRecord::Base.connection.supports_migrations?
       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 }
@@ -568,18 +667,17 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_nothing_raised { Topic.connection.change_column :topics, :approved, :boolean, :default => true }
     end
   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?
-    
       unless current_adapter?(:IBM_DBAdapter) # incompatible types changes
         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
+      end 
     ensure
       Person.connection.remove_column("people", "contributor") rescue nil
     end
@@ -588,16 +686,15 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.connection.add_column "people", "administrator", :boolean, :default => true
       Person.reset_column_information
       assert Person.new.administrator?
-    
-    unless current_adapter?(:IBM_DBAdapter) # incompatible types changes
-      assert_nothing_raised { Person.connection.change_column "people", "administrator", :boolean, :default => false }
-      Person.reset_column_information
-      assert !Person.new.administrator?
-    end
+      unless current_adapter?(:IBM_DBAdapter) # incompatible types changes
+        assert_nothing_raised { Person.connection.change_column "people", "administrator", :boolean, :default => false }
+        Person.reset_column_information
+        assert !Person.new.administrator?
+      end 
     ensure
       Person.connection.remove_column("people", "administrator") rescue nil
     end
-    
+
     def test_change_column_default
       Person.connection.change_column_default "people", "first_name", "Tester"
       Person.reset_column_information
@@ -608,9 +705,10 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.connection.create_table :testings do |t|
         t.column :select, :string
       end
-    unless current_adapter?(:IBM_DBAdapter) # altering a string column to size lesser than the previous not allowed 
-    assert_nothing_raised { Person.connection.change_column :testings, :select, :string, :limit => 10 }
-    end 
+      unless current_adapter?(:IBM_DBAdapter) # altering a string column to size  
+        assert_nothing_raised { Person.connection.change_column :testings, :select, :string, :limit => 10 }
+      end 
+
       assert_nothing_raised { Person.connection.execute "insert into testings (#{Person.connection.quote_column_name('select')}) values ('7 chars')" }
     ensure
       Person.connection.drop_table :testings rescue nil
@@ -626,8 +724,8 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert !Reminder.table_exists?
 
       WeNeedReminders.up
-      
-      assert Reminder.create("content" => "hello world", "remind_at" => Time.now)  
+
+      assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
       assert_equal "hello world", Reminder.find(:first).content
 
       WeNeedReminders.down
@@ -659,17 +757,17 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       # TODO: set world_population >= 2**62 to cover 64-bit platforms and test
       # is_a?(Bignum)
-    unless current_adapter?(:IBM_DBAdapter) # incompatible types retrieved
-    assert_kind_of Integer, b.world_population
-    else
-    assert_kind_of BigDecimal, b.world_population
-    end
+      unless current_adapter?(:IBM_DBAdapter) # incompatible types retrieved
+        assert_kind_of Integer, b.world_population
+      else
+        assert_kind_of BigDecimal, b.world_population
+      end   
       assert_equal 6000000000, b.world_population
-    unless current_adapter?(:IBM_DBAdapter) # incompatible types retrieved
-    assert_kind_of Fixnum, b.my_house_population
-    else
-    assert_kind_of BigDecimal, b.my_house_population
-    end
+      unless current_adapter?(:IBM_DBAdapter) # incompatible types retrieved
+        assert_kind_of Fixnum, b.my_house_population
+      else
+        assert_kind_of BigDecimal, b.my_house_population
+      end  
       assert_equal 3, b.my_house_population
       assert_kind_of BigDecimal, b.bank_balance
       assert_equal BigDecimal("1586.43"), b.bank_balance
@@ -699,11 +797,11 @@ if ActiveRecord::Base.connection.supports_migrations?
         assert_equal 3, b.value_of_e
       else
         # - SQL standard is an integer
-    unless current_adapter?(:IBM_DBAdapter) # incompatible types retrieved
-      assert_kind_of Fixnum, b.value_of_e
-    else
-      assert_kind_of BigDecimal, b.value_of_e
-    end 
+      unless current_adapter?(:IBM_DBAdapter) # incompatible types retrieved
+        assert_kind_of Fixnum, b.value_of_e
+      else
+        assert_kind_of BigDecimal, b.value_of_e
+      end 
         assert_equal 2, b.value_of_e
       end
 
@@ -715,7 +813,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert !Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
 
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/')
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid")
 
       assert_equal 3, ActiveRecord::Migrator.current_version
       Person.reset_column_information
@@ -723,7 +821,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
       assert_equal "hello world", Reminder.find(:first).content
 
-      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/')
+      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid")
 
       assert_equal 0, ActiveRecord::Migrator.current_version
       Person.reset_column_information
@@ -735,78 +833,145 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert !Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
 
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
 
       Person.reset_column_information
       assert Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
 
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 2)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 2)
 
       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)
-
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid")
+    
+      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 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)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
+      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0)
 
       assert !Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
     end
 
+    def test_finds_migrations
+      migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/valid").migrations
+      [['1', 'people_have_last_names'],
+       ['2', 'we_need_reminders'],
+       ['3', 'innocent_jointable']].each_with_index do |pair, i|
+        migrations[i].version == pair.first
+        migrations[1].name    == pair.last
+      end
+    end
+
+    def test_finds_pending_migrations
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_2", 1)
+      migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/interleaved/pass_2").pending_migrations
+      assert_equal 1, migrations.size
+      migrations[0].version == '3'
+      migrations[0].name    == 'innocent_jointable'
+    end
+
+    def test_migrator_interleaved_migrations
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_1")
+
+      assert_nothing_raised do
+        ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_2")
+      end
+
+      Person.reset_column_information
+      assert Person.column_methods_hash.include?(:last_name)
+
+      assert_nothing_raised do
+        ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/interleaved/pass_3")
+      end
+    end
+
+    def test_migrator_db_has_no_schema_migrations_table
+      ActiveRecord::Base.connection.execute("DROP TABLE schema_migrations;")
+      assert_nothing_raised do
+        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 1)
+      end
+    end
+
     def test_migrator_verbosity
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
       assert PeopleHaveLastNames.message_count > 0
       PeopleHaveLastNames.message_count = 0
 
-      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 0)
+      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0)
       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)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
       assert PeopleHaveLastNames.message_count.zero?
-      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 0)
+      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 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)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
+      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 0)
 
       assert !Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
 
-      ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations/')
+      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
 
       Person.reset_column_information
       assert Person.column_methods_hash.include?(:last_name)
       assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
       assert_equal "hello world", Reminder.find(:first).content
     end
+    
+    def test_migrator_rollback
+      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
+      assert_equal(3, ActiveRecord::Migrator.current_version)
+      
+      ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
+      assert_equal(2, ActiveRecord::Migrator.current_version)
+      
+      ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
+      assert_equal(1, ActiveRecord::Migrator.current_version)
+      
+      ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+      
+      ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+    end
+    
+    def test_migrator_run
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+      ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT + "/valid", 3)
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+      ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT + "/valid", 3)
+      assert_equal(0, ActiveRecord::Migrator.current_version)
+    end
 
-    def test_schema_info_table_name
+    def test_schema_migrations_table_name
       ActiveRecord::Base.table_name_prefix = "prefix_"
       ActiveRecord::Base.table_name_suffix = "_suffix"
       Reminder.reset_table_name
-      assert_equal "prefix_schema_info_suffix", ActiveRecord::Migrator.schema_info_table_name
+      assert_equal "prefix_schema_migrations_suffix", ActiveRecord::Migrator.schema_migrations_table_name
       ActiveRecord::Base.table_name_prefix = ""
       ActiveRecord::Base.table_name_suffix = ""
       Reminder.reset_table_name
-      assert_equal "schema_info", ActiveRecord::Migrator.schema_info_table_name
+      assert_equal "schema_migrations", ActiveRecord::Migrator.schema_migrations_table_name
     ensure
       ActiveRecord::Base.table_name_prefix = ""
       ActiveRecord::Base.table_name_suffix = ""
@@ -850,6 +1015,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       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) }
     ensure
@@ -871,31 +1037,27 @@ if ActiveRecord::Base.connection.supports_migrations?
       columns = Person.connection.columns(:binary_testings)
       data_column = columns.detect { |c| c.name == "data" }
 
-      if current_adapter?(:MysqlAdapter)      
-        assert_equal '', data_column.default
-      else
-        assert_nil data_column.default
-      end
+      assert_nil data_column.default
 
       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)
+        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/duplicate", nil)
+      end
+    end
+
+    def test_migrator_with_duplicate_names
+      assert_raises(ActiveRecord::DuplicateMigrationNameError, "Multiple migrations have the name Chunky") do
+        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/duplicate_names", 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)
-      Person.reset_column_information
-      assert !Reminder.table_exists?
-      assert Person.column_methods_hash.include?(:last_name)      
-      assert_equal 2, ActiveRecord::Migrator.current_version
+      assert_raise(ActiveRecord::UnknownMigrationVersionError) do
+        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/missing", 500)
+      end
     end
 
     def test_create_table_with_custom_sequence_name
@@ -934,17 +1096,26 @@ if ActiveRecord::Base.connection.supports_migrations?
         Person.connection.execute("select suitably_short_seq.nextval from dual")
       end
     end
-  end
 
+    protected
+      def with_env_tz(new_tz = 'US/Eastern')
+        old_tz, ENV['TZ'] = ENV['TZ'], new_tz
+        yield
+      ensure
+        old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
+      end
+
+  end
+  
   uses_mocha 'Sexy migration tests' do
-    class IBMDBSexyMigrationsTest < Test::Unit::TestCase
+    class SexyMigrationsTest < ActiveRecord::TestCase
       def test_references_column_type_adds_id
         with_new_table do |t|
           t.expects(:column).with('customer_id', :integer, {})
           t.references :customer
         end
       end
- 
+
       def test_references_column_type_with_polymorphic_adds_type
         with_new_table do |t|
           t.expects(:column).with('taggable_type', :string, {})
@@ -952,14 +1123,22 @@ if ActiveRecord::Base.connection.supports_migrations?
           t.references :taggable, :polymorphic => true
         end
       end
-      
+
+      def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
+        with_new_table do |t|
+          t.expects(:column).with('taggable_type', :string, {:null => false})
+          t.expects(:column).with('taggable_id', :integer, {:null => false})
+          t.references :taggable, :polymorphic => true, :null => false
+        end
+      end
+
       def test_belongs_to_works_like_references
         with_new_table do |t|
           t.expects(:column).with('customer_id', :integer, {})
           t.belongs_to :customer
         end
       end
-      
+
       def test_timestamps_creates_updated_at_and_created_at
         with_new_table do |t|
           t.expects(:column).with(:created_at, :datetime)
@@ -967,7 +1146,7 @@ if ActiveRecord::Base.connection.supports_migrations?
           t.timestamps
         end
       end
-      
+
       def test_integer_creates_integer_column
         with_new_table do |t|
           t.expects(:column).with(:foo, 'integer', {})
@@ -975,7 +1154,7 @@ if ActiveRecord::Base.connection.supports_migrations?
           t.integer :foo, :bar
         end
       end
-      
+
       def test_string_creates_string_column
         with_new_table do |t|
           t.expects(:column).with(:foo, 'string', {})
@@ -983,17 +1162,222 @@ if ActiveRecord::Base.connection.supports_migrations?
           t.string :foo, :bar
         end
       end
-      
+
       protected
       def with_new_table
-        Person.connection.create_table :delete_me do |t|
+        Person.connection.create_table :delete_me, :force => true do |t|
           yield t
         end
       ensure
         Person.connection.drop_table :delete_me rescue nil
       end
-      
+
     end # SexyMigrationsTest
   end # uses_mocha
-end
 
+  uses_mocha 'ChangeTable migration tests' do
+    class ChangeTableMigrationsTest < ActiveRecord::TestCase
+      def setup
+        @connection = Person.connection
+        @connection.create_table :delete_me, :force => true do |t|
+        end
+      end
+
+      def teardown
+        Person.connection.drop_table :delete_me rescue nil
+      end
+
+      def test_references_column_type_adds_id
+        with_change_table do |t|
+          @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
+          t.references :customer
+        end
+      end
+
+      def test_remove_references_column_type_removes_id
+        with_change_table do |t|
+          @connection.expects(:remove_column).with(:delete_me, 'customer_id')
+          t.remove_references :customer
+        end
+      end
+
+      def test_add_belongs_to_works_like_add_references
+        with_change_table do |t|
+          @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
+          t.belongs_to :customer
+        end
+      end
+
+      def test_remove_belongs_to_works_like_remove_references
+        with_change_table do |t|
+          @connection.expects(:remove_column).with(:delete_me, 'customer_id')
+          t.remove_belongs_to :customer
+        end
+      end
+
+      def test_references_column_type_with_polymorphic_adds_type
+        with_change_table do |t|
+          @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {})
+          @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {})
+          t.references :taggable, :polymorphic => true
+        end
+      end
+
+      def test_remove_references_column_type_with_polymorphic_removes_type
+        with_change_table do |t|
+          @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
+          @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
+          t.remove_references :taggable, :polymorphic => true
+        end
+      end
+
+      def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
+        with_change_table do |t|
+          @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {:null => false})
+          @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {:null => false})
+          t.references :taggable, :polymorphic => true, :null => false
+        end
+      end
+
+      def test_remove_references_column_type_with_polymorphic_and_options_null_is_false_removes_table_flag
+        with_change_table do |t|
+          @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
+          @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
+          t.remove_references :taggable, :polymorphic => true, :null => false
+        end
+      end
+
+      def test_timestamps_creates_updated_at_and_created_at
+        with_change_table do |t|
+          @connection.expects(:add_timestamps).with(:delete_me)
+          t.timestamps
+        end
+      end
+
+      def test_remove_timestamps_creates_updated_at_and_created_at
+        with_change_table do |t|
+          @connection.expects(:remove_timestamps).with(:delete_me)
+          t.remove_timestamps
+        end
+      end
+
+      def string_column
+        if current_adapter?(:PostgreSQLAdapter)
+          "character varying(255)"
+        else
+          'varchar(255)'
+        end
+      end
+
+      def integer_column
+        if current_adapter?(:SQLite3Adapter) || current_adapter?(:SQLiteAdapter) || current_adapter?(:PostgreSQLAdapter)
+          "integer"
+        else
+          'int(11)'
+        end
+      end
+
+      def test_integer_creates_integer_column
+        with_change_table do |t|
+          @connection.expects(:add_column).with(:delete_me, :foo, integer_column, {})
+          @connection.expects(:add_column).with(:delete_me, :bar, integer_column, {})
+          t.integer :foo, :bar
+        end
+      end
+
+      def test_string_creates_string_column
+        with_change_table do |t|
+          @connection.expects(:add_column).with(:delete_me, :foo, string_column, {})
+          @connection.expects(:add_column).with(:delete_me, :bar, string_column, {})
+          t.string :foo, :bar
+        end
+      end
+
+      def test_column_creates_column
+        with_change_table do |t|
+          @connection.expects(:add_column).with(:delete_me, :bar, :integer, {})
+          t.column :bar, :integer
+        end
+      end
+
+      def test_column_creates_column_with_options
+        with_change_table do |t|
+          @connection.expects(:add_column).with(:delete_me, :bar, :integer, {:null => false})
+          t.column :bar, :integer, :null => false
+        end
+      end
+
+      def test_index_creates_index
+        with_change_table do |t|
+          @connection.expects(:add_index).with(:delete_me, :bar, {})
+          t.index :bar
+        end
+      end
+
+      def test_index_creates_index_with_options
+        with_change_table do |t|
+          @connection.expects(:add_index).with(:delete_me, :bar, {:unique => true})
+          t.index :bar, :unique => true
+        end
+      end
+
+      def test_change_changes_column
+        with_change_table do |t|
+          @connection.expects(:change_column).with(:delete_me, :bar, :string, {})
+          t.change :bar, :string
+        end
+      end
+
+      def test_change_changes_column_with_options
+        with_change_table do |t|
+          @connection.expects(:change_column).with(:delete_me, :bar, :string, {:null => true})
+          t.change :bar, :string, :null => true
+        end
+      end
+
+      def test_change_default_changes_column
+        with_change_table do |t|
+          @connection.expects(:change_column_default).with(:delete_me, :bar, :string)
+          t.change_default :bar, :string
+        end
+      end
+
+      def test_remove_drops_single_column
+        with_change_table do |t|
+          @connection.expects(:remove_column).with(:delete_me, [:bar])
+          t.remove :bar
+        end
+      end
+
+      def test_remove_drops_multiple_columns
+        with_change_table do |t|
+          @connection.expects(:remove_column).with(:delete_me, [:bar, :baz])
+          t.remove :bar, :baz
+        end
+      end
+
+      def test_remove_index_removes_index_with_options
+        with_change_table do |t|
+          @connection.expects(:remove_index).with(:delete_me, {:unique => true})
+          t.remove_index :unique => true
+        end
+      end
+
+      def test_rename_renames_column
+        with_change_table do |t|
+          @connection.expects(:rename_column).with(:delete_me, :bar, :baz)
+          t.rename :bar, :baz
+        end
+      end
+
+      protected
+      def with_change_table
+        Person.connection.change_table :delete_me do |t|
+          yield t
+        end
+      end
+
+    end # ChangeTable test
+  end # uses_mocha
+
+end