diff options
| author | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-12-14 19:03:28 -0800 |
|---|---|---|
| committer | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-12-14 19:03:28 -0800 |
| commit | 1c5358e4729ce48b0e597d0b39d22f3b1c42f6fc (patch) | |
| tree | ea060a71e57ec1e6366a33f7e40be14ea2f0d64b /activerecord/lib/active_record/relation/where_clause_factory.rb | |
| parent | ab2a95db8088b7607017671b82e396bcd9e80332 (diff) | |
| parent | cc0d272c8c37c197a7e68633e5f082eccb2e3737 (diff) | |
| download | rails-1c5358e4729ce48b0e597d0b39d22f3b1c42f6fc.tar.gz rails-1c5358e4729ce48b0e597d0b39d22f3b1c42f6fc.tar.bz2 rails-1c5358e4729ce48b0e597d0b39d22f3b1c42f6fc.zip | |
Merge branch 'master' into activestorage-guide
Diffstat (limited to 'activerecord/lib/active_record/relation/where_clause_factory.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/where_clause_factory.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/where_clause_factory.rb b/activerecord/lib/active_record/relation/where_clause_factory.rb index 1374785354..4ae94f4bfe 100644 --- a/activerecord/lib/active_record/relation/where_clause_factory.rb +++ b/activerecord/lib/active_record/relation/where_clause_factory.rb @@ -11,7 +11,7 @@ module ActiveRecord def build(opts, other) case opts when String, Array - parts = [klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))] + parts = [klass.sanitize_sql(other.empty? ? opts : ([opts] + other))] when Hash attributes = predicate_builder.resolve_column_aliases(opts) attributes = klass.send(:expand_hash_conditions_for_aggregates, attributes) |