mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
9698c1bff7
Current code expect an `eq` node has one arel attribute at least, but an
`eq` node may have no arel attribute (e.g. `Arel.sql("...").eq(...)`).
In that case `unscope` will raise `NoMethodError`:
```
% bundle exec ruby -w -Itest test/cases/relations_test.rb -n test_unscope_with_arel_sql
Using sqlite3
Run options: -n test_unscope_with_arel_sql --seed 4477
# Running:
E
Error:
RelationTest#test_unscope_with_arel_sql:
NoMethodError: undefined method `name' for #<Arel::Nodes::Quoted:0x00007f9938e55960>
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/where_clause.rb:157:in `block (2 levels) in except_predicates'
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/arel.rb:57:in `fetch_attribute'
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/where_clause.rb:157:in `block in except_predicates'
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/where_clause.rb:156:in `reject'
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/where_clause.rb:156:in `except_predicates'
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/where_clause.rb:31:in `except'
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/query_methods.rb:487:in `block (2 levels) in unscope!'
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/query_methods.rb:481:in `each'
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/query_methods.rb:481:in `block in unscope!'
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/query_methods.rb:471:in `each'
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/query_methods.rb:471:in `unscope!'
/Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/query_methods.rb:464:in `unscope'
test/cases/relations_test.rb:2062:in `test_unscope_with_arel_sql'
```
We should check for both `value.left` and `value.right` those are arel
attribute or not.
68 lines
1.9 KiB
Ruby
68 lines
1.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "arel/errors"
|
|
|
|
require "arel/crud"
|
|
require "arel/factory_methods"
|
|
|
|
require "arel/expressions"
|
|
require "arel/predications"
|
|
require "arel/window_predications"
|
|
require "arel/math"
|
|
require "arel/alias_predication"
|
|
require "arel/order_predications"
|
|
require "arel/table"
|
|
require "arel/attributes/attribute"
|
|
|
|
require "arel/visitors"
|
|
require "arel/collectors/sql_string"
|
|
|
|
require "arel/tree_manager"
|
|
require "arel/insert_manager"
|
|
require "arel/select_manager"
|
|
require "arel/update_manager"
|
|
require "arel/delete_manager"
|
|
require "arel/nodes"
|
|
|
|
module Arel
|
|
VERSION = "10.0.0"
|
|
|
|
# Wrap a known-safe SQL string for passing to query methods, e.g.
|
|
#
|
|
# Post.order(Arel.sql("length(title)")).last
|
|
#
|
|
# Great caution should be taken to avoid SQL injection vulnerabilities.
|
|
# This method should not be used with unsafe values such as request
|
|
# parameters or model attributes.
|
|
def self.sql(raw_sql)
|
|
Arel::Nodes::SqlLiteral.new raw_sql
|
|
end
|
|
|
|
def self.star # :nodoc:
|
|
sql "*"
|
|
end
|
|
|
|
def self.arel_node?(value) # :nodoc:
|
|
value.is_a?(Arel::Node) || value.is_a?(Arel::Attribute) || value.is_a?(Arel::Nodes::SqlLiteral)
|
|
end
|
|
|
|
def self.fetch_attribute(value, &block) # :nodoc:
|
|
case value
|
|
when Arel::Nodes::Between, Arel::Nodes::In, Arel::Nodes::NotIn, Arel::Nodes::Equality,
|
|
Arel::Nodes::NotEqual, Arel::Nodes::LessThan, Arel::Nodes::LessThanOrEqual,
|
|
Arel::Nodes::GreaterThan, Arel::Nodes::GreaterThanOrEqual
|
|
if value.left.is_a?(Arel::Attributes::Attribute)
|
|
yield value.left
|
|
elsif value.right.is_a?(Arel::Attributes::Attribute)
|
|
yield value.right
|
|
end
|
|
when Arel::Nodes::Or
|
|
fetch_attribute(value.left, &block) && fetch_attribute(value.right, &block)
|
|
when Arel::Nodes::Grouping
|
|
fetch_attribute(value.expr, &block)
|
|
end
|
|
end
|
|
|
|
## Convenience Alias
|
|
Node = Arel::Nodes::Node # :nodoc:
|
|
end
|