diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2019-03-03 09:50:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 09:50:40 -0500 |
| commit | ef25fbfc713d3dea833952599c921a389df0afa7 (patch) | |
| tree | 2f55df27fdce3c85ad477b49f2ee3ae0652ade62 /activerecord/test/cases | |
| parent | e33c1f3c26ff3d2921d953d5c747cb5b90c6c1c6 (diff) | |
| parent | d7b6139840e56172445c75e67c45f9f64150b5bb (diff) | |
| download | rails-ef25fbfc713d3dea833952599c921a389df0afa7.tar.gz rails-ef25fbfc713d3dea833952599c921a389df0afa7.tar.bz2 rails-ef25fbfc713d3dea833952599c921a389df0afa7.zip | |
Merge pull request #35462 from yahonda/another_30_byte_limit
Remove unnecessary `current_adapter?(:OracleAdapter)` for index length
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 7 | ||||
| -rw-r--r-- | activerecord/test/cases/migration/index_test.rb | 13 |
2 files changed, 6 insertions, 14 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index 126d512068..cd9c8a5285 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -1271,12 +1271,7 @@ class EagerAssociationTest < ActiveRecord::TestCase def test_include_has_many_using_primary_key expected = Firm.find(1).clients_using_primary_key.sort_by(&:name) - # Oracle adapter truncates alias to 30 characters - if current_adapter?(:OracleAdapter) - firm = Firm.all.merge!(includes: :clients_using_primary_key, order: "clients_using_primary_keys_companies"[0, 30] + ".name").find(1) - else - firm = Firm.all.merge!(includes: :clients_using_primary_key, order: "clients_using_primary_keys_companies.name").find(1) - end + firm = Firm.all.merge!(includes: :clients_using_primary_key, order: "clients_using_primary_keys_companies.name").find(1) assert_no_queries do assert_equal expected, firm.clients_using_primary_key end diff --git a/activerecord/test/cases/migration/index_test.rb b/activerecord/test/cases/migration/index_test.rb index f8fecc83cd..5e688efc2b 100644 --- a/activerecord/test/cases/migration/index_test.rb +++ b/activerecord/test/cases/migration/index_test.rb @@ -158,14 +158,11 @@ module ActiveRecord connection.add_index("testings", ["last_name", "first_name"]) connection.remove_index("testings", column: ["last_name", "first_name"]) - # Oracle adapter cannot have specified index name larger than 30 characters - # Oracle adapter is shortening index name when just column list is given - unless current_adapter?(:OracleAdapter) - connection.add_index("testings", ["last_name", "first_name"]) - connection.remove_index("testings", name: :index_testings_on_last_name_and_first_name) - connection.add_index("testings", ["last_name", "first_name"]) - connection.remove_index("testings", "last_name_and_first_name") - end + connection.add_index("testings", ["last_name", "first_name"]) + connection.remove_index("testings", name: :index_testings_on_last_name_and_first_name) + connection.add_index("testings", ["last_name", "first_name"]) + connection.remove_index("testings", "last_name_and_first_name") + connection.add_index("testings", ["last_name", "first_name"]) connection.remove_index("testings", ["last_name", "first_name"]) |