diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-01-20 01:02:03 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2017-01-20 01:02:03 +1030 |
| commit | 893d5fb0a24bc69b07574924d78ca7f9826f9403 (patch) | |
| tree | 0c7d9dea4715e65f5b1a6ea51b33758ce79fbfb4 /activerecord/test | |
| parent | 7b4514c6ab2703b9a9b6574f3559cae722a33d4f (diff) | |
| download | rails-893d5fb0a24bc69b07574924d78ca7f9826f9403.tar.gz rails-893d5fb0a24bc69b07574924d78ca7f9826f9403.tar.bz2 rails-893d5fb0a24bc69b07574924d78ca7f9826f9403.zip | |
Revert "Merge pull request #27718 from kamipo/remove_internal_public_methods"
This reverts commit 39c77eb1843f79925c7195e8869afc7cb7323682, reversing
changes made to 9f6f51be78f8807e18fc6562c57af2fdbf8ccb56.
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 605baa9905..fa54aac6b3 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 - ActiveRecord::SchemaMigration.create_table + connection.initialize_schema_migrations_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 - ActiveRecord::InternalMetadata.create_table + connection.initialize_internal_metadata_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 c728cc9669..4edb807bbb 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::SchemaMigration.create_table - ActiveRecord::SchemaMigration.delete_all + ActiveRecord::Base.connection.initialize_schema_migrations_table + ActiveRecord::Base.connection.execute "DELETE FROM #{ActiveRecord::Migrator.schema_migrations_table_name}" - %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 |