diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-08 10:44:16 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-08 10:44:16 -0700 |
| commit | d4de2c34c599a7256ba69cc3fb91ed367df4c974 (patch) | |
| tree | 6573aeb518042d0bf7d1b54d54765d6a05aa02b8 /activerecord/test/cases | |
| parent | 5d2c3a14a3bfbde2b48d9021a3e58c3f6fe024e7 (diff) | |
| parent | 798cf2b9ef67faace7fb9f8d5ecfcf892a77eb62 (diff) | |
| download | rails-d4de2c34c599a7256ba69cc3fb91ed367df4c974.tar.gz rails-d4de2c34c599a7256ba69cc3fb91ed367df4c974.tar.bz2 rails-d4de2c34c599a7256ba69cc3fb91ed367df4c974.zip | |
Merge pull request #10521 from yahonda/sanitize_oracle
Remove current_adapter? from test_sanitize_sql_hash_handles_associations
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/sanitize_test.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/activerecord/test/cases/sanitize_test.rb b/activerecord/test/cases/sanitize_test.rb index f061c28e88..082570c55b 100644 --- a/activerecord/test/cases/sanitize_test.rb +++ b/activerecord/test/cases/sanitize_test.rb @@ -6,11 +6,10 @@ class SanitizeTest < ActiveRecord::TestCase end def test_sanitize_sql_hash_handles_associations - if current_adapter?(:MysqlAdapter, :Mysql2Adapter) - expected_value = "`adorable_animals`.`name` = 'Bambi'" - else - expected_value = "\"adorable_animals\".\"name\" = 'Bambi'" - end + quoted_bambi = ActiveRecord::Base.connection.quote("Bambi") + quoted_column_name = ActiveRecord::Base.connection.quote_column_name("name") + quoted_table_name = ActiveRecord::Base.connection.quote_table_name("adorable_animals") + expected_value = "#{quoted_table_name}.#{quoted_column_name} = #{quoted_bambi}" assert_equal expected_value, Binary.send(:sanitize_sql_hash, {adorable_animals: {name: 'Bambi'}}) end |