TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #51567 from kamipo/fix_remove_prefix_and_suffix

Browse Source 
Fix `remove_prefix_and_suffix` in `ActiveRecord::SchemaDumper`
This commit is contained in:
Ryuta Kamizono 2024-04-15 05:13:22 +09:00 committed by GitHub
commit 778039b896
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/schema_dumper.rb
View File

@ -70,7 +70,7 @@ def dump(stream)
private
attr_accessor :table_name
def initialize(connection, version, options = {})
def initialize(connection, options = {})
@connection = connection
@version = connection.pool.migration_context.current_version rescue nil
@options = options

30
activerecord/test/cases/schema_dumper_test.rb
View File

@ -473,21 +473,21 @@ def test_do_not_dump_foreign_keys_when_bypassed_by_config
end
end
class CreateDogMigration < ActiveRecord::Migration::Current
class CreateCatMigration < ActiveRecord::Migration::Current
def up
create_table("dog_owners") do |t|
create_table("cat_owners") do |t|
end
create_table("dogs") do |t|
create_table("cats") do |t|
t.column :name, :string
t.references :owner
t.index [:name]
t.foreign_key :dog_owners, column: "owner_id"
t.foreign_key :cat_owners, column: "owner_id"
end
end
def down
drop_table("dogs")
drop_table("dog_owners")
drop_table("cats")
drop_table("cat_owners")
end
end
@ -497,16 +497,21 @@ def test_schema_dump_with_table_name_prefix_and_suffix
ActiveRecord::Base.table_name_prefix = "foo_"
ActiveRecord::Base.table_name_suffix = "_bar"
migration = CreateDogMigration.new
migration = CreateCatMigration.new
migration.migrate(:up)
output = dump_table_schema("dog_owners", "dogs")
output = dump_table_schema("foo_cat_owners_bar", "foo_cats_bar")
assert_match %r{create_table "cat_owners"}, output
assert_match %r{create_table "cats"}, output
assert_match %r{t\.index \["name"\], name: "index_foo_cats_bar_on_name"}, output
assert_no_match %r{create_table "foo_.+_bar"}, output
assert_no_match %r{add_index "foo_.+_bar"}, output
assert_no_match %r{create_table "schema_migrations"}, output
assert_no_match %r{create_table "ar_internal_metadata"}, output
if ActiveRecord::Base.lease_connection.supports_foreign_keys?
assert_match %r{add_foreign_key "cats", "cat_owners", column: "owner_id"}, output
assert_no_match %r{add_foreign_key "foo_.+_bar"}, output
assert_no_match %r{add_foreign_key "[^"]+", "foo_.+_bar"}, output
end
@ -524,16 +529,21 @@ def test_schema_dump_with_table_name_prefix_and_suffix_regexp_escape
ActiveRecord::Base.table_name_prefix = "foo$"
ActiveRecord::Base.table_name_suffix = "$bar"
migration = CreateDogMigration.new
migration = CreateCatMigration.new
migration.migrate(:up)
output = dump_table_schema("dog_owners", "dog")
output = dump_table_schema("foo$cat_owners$bar", "foo$cat$bar")
assert_match %r{create_table "cat_owners"}, output
assert_match %r{create_table "cats"}, output
assert_match %r{t\.index \["name"\], name: "index_foo\$cats\$bar_on_name"}, output
assert_no_match %r{create_table "foo\$.+\$bar"}, output
assert_no_match %r{add_index "foo\$.+\$bar"}, output
assert_no_match %r{create_table "schema_migrations"}, output
assert_no_match %r{create_table "ar_internal_metadata"}, output
if ActiveRecord::Base.lease_connection.supports_foreign_keys?
assert_match %r{add_foreign_key "cats", "cat_owners", column: "owner_id"}, output
assert_no_match %r{add_foreign_key "foo\$.+\$bar"}, output
assert_no_match %r{add_foreign_key "[^"]+", "foo\$.+\$bar"}, output
end