diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-10-16 16:14:56 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-10-16 16:14:56 -0700 |
| commit | 8919a68b961e2789286a1f9e71fd1b8a9ee7d3e0 (patch) | |
| tree | b76bb38481900fbdc4973cdfa0affdebfe823642 /activerecord/test | |
| parent | f10d62c4bf0be035eafd3f38a9e50550e8060b21 (diff) | |
| parent | 3dbedd2823ff6c8a1f2f078ae9df9c6ceb275e1b (diff) | |
| download | rails-8919a68b961e2789286a1f9e71fd1b8a9ee7d3e0.tar.gz rails-8919a68b961e2789286a1f9e71fd1b8a9ee7d3e0.tar.bz2 rails-8919a68b961e2789286a1f9e71fd1b8a9ee7d3e0.zip | |
Merge pull request #3334 from mperham/master
Default timestamps to non-null
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/migration_test.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 93a1249e43..4b5dd18be8 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -389,8 +389,8 @@ if ActiveRecord::Base.connection.supports_migrations? created_at_column = created_columns.detect {|c| c.name == 'created_at' } updated_at_column = created_columns.detect {|c| c.name == 'updated_at' } - assert created_at_column.null - assert updated_at_column.null + assert !created_at_column.null + assert !updated_at_column.null ensure Person.connection.drop_table table_name rescue nil end @@ -471,11 +471,11 @@ 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)" + Person.connection.execute "insert into people (id, wealth, created_at, updated_at) values (people_seq.nextval, 12345678901234567890.0123456789, 0, 0)" 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')" + Person.connection.execute "insert into people (wealth, created_at, updated_at) values ('12345678901234567890.0123456789', 0, 0)" else - Person.connection.execute "insert into people (wealth) values (12345678901234567890.0123456789)" + Person.connection.execute "insert into people (wealth, created_at, updated_at) values (12345678901234567890.0123456789, 0, 0)" end # SELECT |