diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-07-01 23:21:52 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 23:21:52 -0300 |
| commit | 009333fb35a59516307d3b655f32a53669e35a97 (patch) | |
| tree | 50fc99e50564c6b4a7200ac2b06f95e794852ce6 /activerecord | |
| parent | 501741c3d13f34187c4f6e255949ca9b8a949f36 (diff) | |
| parent | 545583d773800fbfd434d94fee00ec842fd4e9f8 (diff) | |
| download | rails-009333fb35a59516307d3b655f32a53669e35a97.tar.gz rails-009333fb35a59516307d3b655f32a53669e35a97.tar.bz2 rails-009333fb35a59516307d3b655f32a53669e35a97.zip | |
Merge pull request #25631 from yahonda/revert_rename_to_ar_internal_metadata
Revert "Rename `active_record_internal_metadatas` to `ar_internal_metadata"
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/internal_metadata.rb | 13 | ||||
| -rw-r--r-- | activerecord/test/cases/migration_test.rb | 15 |
2 files changed, 0 insertions, 28 deletions
diff --git a/activerecord/lib/active_record/internal_metadata.rb b/activerecord/lib/active_record/internal_metadata.rb index 17a5dc1d1b..8b649eab0f 100644 --- a/activerecord/lib/active_record/internal_metadata.rb +++ b/activerecord/lib/active_record/internal_metadata.rb @@ -14,10 +14,6 @@ module ActiveRecord "#{table_name_prefix}#{ActiveRecord::Base.internal_metadata_table_name}#{table_name_suffix}" end - def original_table_name - "#{table_name_prefix}active_record_internal_metadatas#{table_name_suffix}" - end - def []=(key, value) find_or_initialize_by(key: key).update_attributes!(value: value) end @@ -30,17 +26,8 @@ module ActiveRecord ActiveSupport::Deprecation.silence { connection.table_exists?(table_name) } end - def original_table_exists? - # This method will be removed in Rails 5.1 - # Since it is only necessary when `active_record_internal_metadatas` could exist - ActiveSupport::Deprecation.silence { connection.table_exists?(original_table_name) } - end - # Creates an internal metadata table with columns +key+ and +value+ def create_table - if original_table_exists? - connection.rename_table(original_table_name, table_name) - end unless table_exists? key_options = connection.internal_string_options_for_primary_key diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 36b6662820..d499aadbae 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -445,21 +445,6 @@ class MigrationTest < ActiveRecord::TestCase ActiveRecord::Migrator.migrations_paths = old_path end - def test_rename_internal_metadata_table - original_internal_metadata_table_name = ActiveRecord::Base.internal_metadata_table_name - - ActiveRecord::Base.internal_metadata_table_name = "active_record_internal_metadatas" - Reminder.reset_table_name - - ActiveRecord::Base.internal_metadata_table_name = original_internal_metadata_table_name - Reminder.reset_table_name - - assert_equal "ar_internal_metadata", ActiveRecord::InternalMetadata.table_name - ensure - ActiveRecord::Base.internal_metadata_table_name = original_internal_metadata_table_name - Reminder.reset_table_name - end - def test_proper_table_name_on_migration reminder_class = new_isolated_reminder_class migration = ActiveRecord::Migration.new |