diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-01-08 17:44:26 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-01-08 17:44:26 -0700 |
| commit | 34ac8a1e98e85b28fe3ee02a83c85cdaa4b77714 (patch) | |
| tree | 397109a4e5403a0763a54c1bcf72b947e4a96f98 /activerecord/test | |
| parent | 30391e9ddba745d6bdc0b23f526ecf432dfe6adf (diff) | |
| parent | 57155064d135d67e0624d561c2badfe018b27a3a (diff) | |
| download | rails-34ac8a1e98e85b28fe3ee02a83c85cdaa4b77714.tar.gz rails-34ac8a1e98e85b28fe3ee02a83c85cdaa4b77714.tar.bz2 rails-34ac8a1e98e85b28fe3ee02a83c85cdaa4b77714.zip | |
Merge pull request #22976 from schneems/schneems/schema-migration-primary-key
Get update_attributes working with SchemaMigration
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/ar_schema_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb index 9d5327bf35..1f32c48b95 100644 --- a/activerecord/test/cases/ar_schema_test.rb +++ b/activerecord/test/cases/ar_schema_test.rb @@ -21,10 +21,10 @@ if ActiveRecord::Base.connection.supports_migrations? ActiveRecord::Migration.verbose = @original_verbose end - def test_has_no_primary_key + def test_has_has_primary_key old_primary_key_prefix_type = ActiveRecord::Base.primary_key_prefix_type ActiveRecord::Base.primary_key_prefix_type = :table_name_with_underscore - assert_nil ActiveRecord::SchemaMigration.primary_key + assert_equal "version", ActiveRecord::SchemaMigration.primary_key ActiveRecord::SchemaMigration.create_table assert_difference "ActiveRecord::SchemaMigration.count", 1 do |