diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-01-17 22:47:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-17 22:47:35 -0500 |
commit | 39c77eb1843f79925c7195e8869afc7cb7323682 (patch) | |
tree | d146770288934ff2779baf49d94268a422347776 /activerecord/test | |
parent | 9f6f51be78f8807e18fc6562c57af2fdbf8ccb56 (diff) | |
parent | 5c624d0c1cc46354ebea3b78f023b82002ba848e (diff) | |
download | rails-39c77eb1843f79925c7195e8869afc7cb7323682.tar.gz rails-39c77eb1843f79925c7195e8869afc7cb7323682.tar.bz2 rails-39c77eb1843f79925c7195e8869afc7cb7323682.zip |
Merge pull request #27718 from kamipo/remove_internal_public_methods
Remove `initialize_schema_migrations_table` and `initialize_internal_metadata_table` internal public methods
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb | 4 | ||||
-rw-r--r-- | activerecord/test/cases/migration_test.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb index fa54aac6b3..605baa9905 100644 --- a/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb +++ b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb @@ -16,7 +16,7 @@ class SchemaMigrationsTest < ActiveRecord::Mysql2TestCase table_name = ActiveRecord::SchemaMigration.table_name connection.drop_table table_name, if_exists: true - connection.initialize_schema_migrations_table + ActiveRecord::SchemaMigration.create_table assert connection.column_exists?(table_name, :version, :string, collation: "utf8_general_ci") end @@ -27,7 +27,7 @@ class SchemaMigrationsTest < ActiveRecord::Mysql2TestCase table_name = ActiveRecord::InternalMetadata.table_name connection.drop_table table_name, if_exists: true - connection.initialize_internal_metadata_table + ActiveRecord::InternalMetadata.create_table assert connection.column_exists?(table_name, :key, :string, collation: "utf8_general_ci") end diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 4edb807bbb..c728cc9669 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -43,10 +43,10 @@ class MigrationTest < ActiveRecord::TestCase ActiveRecord::Base.table_name_prefix = "" ActiveRecord::Base.table_name_suffix = "" - ActiveRecord::Base.connection.initialize_schema_migrations_table - ActiveRecord::Base.connection.execute "DELETE FROM #{ActiveRecord::Migrator.schema_migrations_table_name}" + ActiveRecord::SchemaMigration.create_table + ActiveRecord::SchemaMigration.delete_all - %w(things awesome_things prefix_things_suffix p_awesome_things_s ).each do |table| + %w(things awesome_things prefix_things_suffix p_awesome_things_s).each do |table| Thing.connection.drop_table(table) rescue nil end Thing.reset_column_information |