diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/test/migration_test.rb | 6 | ||||
| -rw-r--r-- | activesupport/CHANGELOG | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index faa521f5ee..c097b38427 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Test DateTime native type in migrations. #7649 [fedot] + * SQLServer: correctly schema-dump tables with no indexes or descending indexes. #7333, #7703 [Jakob S, Tom Ward] * SQLServer: recognize real column type as Ruby float. #7057 [sethladd, Tom Ward] diff --git a/activerecord/test/migration_test.rb b/activerecord/test/migration_test.rb index 09cb6a6b51..56712284b2 100644 --- a/activerecord/test/migration_test.rb +++ b/activerecord/test/migration_test.rb @@ -40,7 +40,7 @@ if ActiveRecord::Base.connection.supports_migrations? Reminder.reset_column_information %w(last_name key bio age height wealth birthday favorite_day - male administrator).each do |column| + moment_of_truth male administrator).each do |column| Person.connection.remove_column('people', column) rescue nil end Person.connection.remove_column("people", "first_name") rescue nil @@ -261,8 +261,9 @@ if ActiveRecord::Base.connection.supports_migrations? 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", "moment_of_truth", :datetime 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, :wealth => BigDecimal.new("12345678901234567890.0123456789"), :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, :moment_of_truth => "1817-10-25 21:40:18", :male => true } bob = Person.find(:first) assert_equal 'bob', bob.first_name @@ -294,6 +295,7 @@ if ActiveRecord::Base.connection.supports_migrations? assert_equal Date, bob.favorite_day.class end + assert_equal DateTime, bob.moment_of_truth.class assert_equal TrueClass, bob.male?.class assert_kind_of BigDecimal, bob.wealth end diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 020806ffe6..7ccf8c985c 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -2,7 +2,7 @@ * DateTime calculations analogous to the Date and Time extensions. #7693 [Geoff Buesing] -* Give DateTime correct .to_s implementations, lets it play nice with ActiveRecord quoting. [gbuesing] +* Give DateTime correct .to_s implementations, lets it play nice with ActiveRecord quoting. #7649 [Geoff Buesing] * Add File.atomic_write, allows you to write large files in an atomic manner, preventing users from seeing half written files. [Koz] |