Skip to content

Commit 7e5e832

Browse files
committed
Remove old AR versioning checks
1 parent 608caf3 commit 7e5e832

File tree

1 file changed

+5
-33
lines changed

1 file changed

+5
-33
lines changed

lib/arel/visitors/compat.rb

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,16 @@ module ArJdbcCompat
44

55
protected
66

7-
if ToSql.instance_method('visit').arity == 1
8-
def do_visit(x, a); visit(x); end # a = nil
9-
else # > AREL 4.0
10-
def do_visit(x, a); visit(x, a); end
11-
end
7+
def do_visit(x, a); visit(x, a); end
128

13-
if ToSql.instance_method('visit_Arel_Nodes_SelectCore').arity == 1
14-
def do_visit_select_core(x, a) # a = nil
15-
visit_Arel_Nodes_SelectCore(x)
16-
end
17-
else # > AREL 4.0
18-
def do_visit_select_core(x, a)
19-
visit_Arel_Nodes_SelectCore(x, a)
20-
end
9+
def do_visit_select_core(x, a)
10+
visit_Arel_Nodes_SelectCore(x, a)
2111
end
2212

2313
private
2414

25-
if ArJdbc::AR42
26-
if Arel::VERSION < '6.0.2'
27-
def limit_for(limit_or_node)
28-
if limit_or_node.respond_to?(:expr)
29-
expr = limit_or_node.expr
30-
# NOTE(uwe): Different behavior for Arel 6.0.0 and 6.0.2
31-
expr.respond_to?(:value) ? expr.value.to_i : expr.to_i
32-
else
33-
limit_or_node
34-
end
35-
end
36-
else
37-
def limit_for(limit_or_node)
38-
limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
39-
end
40-
end
41-
else
42-
def limit_for(limit_or_node)
43-
limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
44-
end
15+
def limit_for(limit_or_node)
16+
limit_or_node.respond_to?(:expr) ? limit_or_node.expr.to_i : limit_or_node
4517
end
4618
module_function :limit_for
4719

0 commit comments

Comments
 (0)