diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-06-09 09:30:53 -0400 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-06-09 09:30:53 -0400 |
| commit | 6990fd3e2a9d59fde83e9bd34697641c44cb1674 (patch) | |
| tree | 15a599782db610ca4d45f958cdcf8815adf36919 /activerecord | |
| parent | 5aadcced4da8b8dc6b7231751e8bc3c9e522df1e (diff) | |
| parent | d207023f835d735db2f2d9ce7702f55329d0c48f (diff) | |
| download | rails-6990fd3e2a9d59fde83e9bd34697641c44cb1674.tar.gz rails-6990fd3e2a9d59fde83e9bd34697641c44cb1674.tar.bz2 rails-6990fd3e2a9d59fde83e9bd34697641c44cb1674.zip | |
Merge pull request #25329 from yahonda/allow_oracle_bind_value_syntax_in_loj_test
Allow Oracle bind parameter syntax `:a1` in test_join_conditions_added_to_join_clause
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/associations/left_outer_join_association_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/left_outer_join_association_test.rb b/activerecord/test/cases/associations/left_outer_join_association_test.rb index 4af791b758..eee135cfb8 100644 --- a/activerecord/test/cases/associations/left_outer_join_association_test.rb +++ b/activerecord/test/cases/associations/left_outer_join_association_test.rb @@ -50,7 +50,7 @@ class LeftOuterJoinAssociationTest < ActiveRecord::TestCase def test_join_conditions_added_to_join_clause queries = capture_sql { Author.left_outer_joins(:essays).to_a } - assert queries.any? { |sql| /writer_type.*?=.*?(Author|\?|\$1)/i =~ sql } + assert queries.any? { |sql| /writer_type.*?=.*?(Author|\?|\$1|\:a1)/i =~ sql } assert queries.none? { |sql| /WHERE/i =~ sql } end |