diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-01 11:23:49 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-01 11:23:49 -0700 |
| commit | 4f2bce959b24fa519307c21481c240b9d35d9540 (patch) | |
| tree | ce3aef9994b09c86e3fe53cac2821dd20e6e28bc /railties | |
| parent | 9aa425f75fac376ea1c268ad5196ddb2dd7ed387 (diff) | |
| parent | 407e0ab5e5cddf6a8b6b278b12f50772d13b4d86 (diff) | |
| download | rails-4f2bce959b24fa519307c21481c240b9d35d9540.tar.gz rails-4f2bce959b24fa519307c21481c240b9d35d9540.tar.bz2 rails-4f2bce959b24fa519307c21481c240b9d35d9540.zip | |
Merge pull request #23025 from yahonda/shorten_internal_metadata_table_name_less_than_30_byte
Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadata
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/bin_setup_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/application/rake/dbs_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb index 8c3ab65c51..a07c51a60f 100644 --- a/railties/test/application/bin_setup_test.rb +++ b/railties/test/application/bin_setup_test.rb @@ -28,7 +28,7 @@ module ApplicationTests assert_not File.exist?("tmp/restart.txt") `bin/setup 2>&1` assert_equal 0, File.size("log/test.log") - assert_equal '["articles", "schema_migrations", "active_record_internal_metadatas"]', list_tables.call + assert_equal '["articles", "schema_migrations", "ar_internal_metadata"]', list_tables.call assert File.exist?("tmp/restart.txt") end end diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb index c000a70382..a229609e84 100644 --- a/railties/test/application/rake/dbs_test.rb +++ b/railties/test/application/rake/dbs_test.rb @@ -222,14 +222,14 @@ module ApplicationTests assert_equal '["posts"]', list_tables[] `bin/rails db:schema:load` - assert_equal '["posts", "comments", "schema_migrations", "active_record_internal_metadatas"]', list_tables[] + assert_equal '["posts", "comments", "schema_migrations", "ar_internal_metadata"]', list_tables[] app_file 'db/structure.sql', <<-SQL CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255)); SQL `bin/rails db:structure:load` - assert_equal '["posts", "comments", "schema_migrations", "active_record_internal_metadatas", "users"]', list_tables[] + assert_equal '["posts", "comments", "schema_migrations", "ar_internal_metadata", "users"]', list_tables[] end end |