Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove useless Migrator.schema_migrations_table_name #28293

Merged
merged 1 commit into from
Mar 5, 2017
Merged

Remove useless Migrator.schema_migrations_table_name #28293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@ def dump_schema_information #:nodoc:
end

def insert_versions_sql(versions) # :nodoc:
sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
sm_table = quote_table_name(ActiveRecord::SchemaMigration.table_name)

if versions.is_a?(Array)
sql = "INSERT INTO #{sm_table} (version) VALUES\n"
Expand Down Expand Up @@ -1025,7 +1025,7 @@ def internal_string_options_for_primary_key # :nodoc:
def assume_migrated_upto_version(version, migrations_paths)
migrations_paths = Array(migrations_paths)
version = version.to_i
sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
sm_table = quote_table_name(ActiveRecord::SchemaMigration.table_name)

migrated = select_values("SELECT version FROM #{sm_table}").map(&:to_i)
versions = ActiveRecord::Migrator.migration_files(migrations_paths).map do |file|
Expand Down
6 changes: 1 addition & 5 deletions activerecord/lib/active_record/migration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,12 +1022,8 @@ def open(migrations_paths)
new(:up, migrations(migrations_paths), nil)
end

def schema_migrations_table_name
SchemaMigration.table_name
end

def get_all_versions(connection = Base.connection)
if connection.table_exists?(schema_migrations_table_name)
if SchemaMigration.table_exists?
SchemaMigration.all.map { |x| x.version.to_i }.sort
else
[]
Expand Down
10 changes: 5 additions & 5 deletions activerecord/test/cases/migration_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,20 +337,20 @@ def migrate(x)
end

def test_schema_migrations_table_name
original_schema_migrations_table_name = ActiveRecord::Migrator.schema_migrations_table_name
original_schema_migrations_table_name = ActiveRecord::Base.schema_migrations_table_name

assert_equal "schema_migrations", ActiveRecord::Migrator.schema_migrations_table_name
assert_equal "schema_migrations", ActiveRecord::SchemaMigration.table_name
ActiveRecord::Base.table_name_prefix = "prefix_"
ActiveRecord::Base.table_name_suffix = "_suffix"
Reminder.reset_table_name
assert_equal "prefix_schema_migrations_suffix", ActiveRecord::Migrator.schema_migrations_table_name
assert_equal "prefix_schema_migrations_suffix", ActiveRecord::SchemaMigration.table_name
ActiveRecord::Base.schema_migrations_table_name = "changed"
Reminder.reset_table_name
assert_equal "prefix_changed_suffix", ActiveRecord::Migrator.schema_migrations_table_name
assert_equal "prefix_changed_suffix", ActiveRecord::SchemaMigration.table_name
ActiveRecord::Base.table_name_prefix = ""
ActiveRecord::Base.table_name_suffix = ""
Reminder.reset_table_name
assert_equal "changed", ActiveRecord::Migrator.schema_migrations_table_name
assert_equal "changed", ActiveRecord::SchemaMigration.table_name
ensure
ActiveRecord::Base.schema_migrations_table_name = original_schema_migrations_table_name
Reminder.reset_table_name
Expand Down