diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-03-31 08:13:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 08:13:45 -0400 |
| commit | fb084e2980969e587c94602a921bc604ef916442 (patch) | |
| tree | adbb374a3289c901c3ccc0f135c6bddd9c4d568d | |
| parent | 85d4b2afdc3c197c858dda3e36748bd9f352a279 (diff) | |
| parent | bd7a30297b0ec54fb2514970ee0fa15c044959bf (diff) | |
| download | rails-fb084e2980969e587c94602a921bc604ef916442.tar.gz rails-fb084e2980969e587c94602a921bc604ef916442.tar.bz2 rails-fb084e2980969e587c94602a921bc604ef916442.zip | |
Merge pull request #28621 from koic/fix_failed_test_when_running_with_oracle
Fix a failed AR test when running with OracleAdapter
| -rw-r--r-- | activerecord/test/cases/scoping/default_scoping_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/cases/scoping/default_scoping_test.rb b/activerecord/test/cases/scoping/default_scoping_test.rb index a6c22ac672..89fb434b27 100644 --- a/activerecord/test/cases/scoping/default_scoping_test.rb +++ b/activerecord/test/cases/scoping/default_scoping_test.rb @@ -462,6 +462,8 @@ class DefaultScopingTest < ActiveRecord::TestCase def test_with_abstract_class_scope_should_be_executed_in_correct_context vegetarian_pattern, gender_pattern = if current_adapter?(:Mysql2Adapter) [/`lions`.`is_vegetarian`/, /`lions`.`gender`/] + elsif current_adapter?(:OracleAdapter) + [/"LIONS"."IS_VEGETARIAN"/, /"LIONS"."GENDER"/] else [/"lions"."is_vegetarian"/, /"lions"."gender"/] end |