aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/primitives
diff options
context:
space:
mode:
Diffstat (limited to 'lib/arel/primitives')
-rw-r--r--lib/arel/primitives/attribute.rb2
-rw-r--r--lib/arel/primitives/expression.rb4
-rw-r--r--lib/arel/primitives/value.rb4
3 files changed, 2 insertions, 8 deletions
diff --git a/lib/arel/primitives/attribute.rb b/lib/arel/primitives/attribute.rb
index eeea495b09..011b751a1d 100644
--- a/lib/arel/primitives/attribute.rb
+++ b/lib/arel/primitives/attribute.rb
@@ -45,7 +45,7 @@ module Arel
@original_attribute ||= history.detect { |a| !a.join? }
end
- def circle(relation)
+ def find_correlate_in(relation)
relation[self]
end
diff --git a/lib/arel/primitives/expression.rb b/lib/arel/primitives/expression.rb
index 76b76538c9..696e3521be 100644
--- a/lib/arel/primitives/expression.rb
+++ b/lib/arel/primitives/expression.rb
@@ -29,10 +29,8 @@ module Arel
Expression.new(attribute, function_sql, aliaz, self)
end
- # FIXME
def bind(new_relation)
- # new_relation == relation ? self : Expression.new(attribute.bind(new_relation), function_sql, @alias, self)
- self
+ new_relation == relation ? self : Expression.new(attribute.bind(new_relation), function_sql, @alias, self)
end
def to_attribute
diff --git a/lib/arel/primitives/value.rb b/lib/arel/primitives/value.rb
index 7751390be6..b4bddd0b0c 100644
--- a/lib/arel/primitives/value.rb
+++ b/lib/arel/primitives/value.rb
@@ -24,9 +24,5 @@ module Arel
def bind(relation)
Value.new(value, relation)
end
-
- def circle(relation)
- bind(relation)
- end
end
end \ No newline at end of file