Revert the change for 4.1.

activerecord-hackery · Feb 5, 2015 · f0dbce7 · f0dbce7
1 parent 3c96604
commit f0dbce7
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/lib/squeel/adapters/active_record/4.1/relation_extensions.rb b/lib/squeel/adapters/active_record/4.1/relation_extensions.rb
@@ -94,19 +94,14 @@ def build_arel
           arel.distinct(distinct_value)
           arel.from(build_from) if from_value
           arel.lock(lock_value) if lock_value
-
-          # Check if we are dealing with a version prior to Arel commit 590c784a30b13153667f8db7915998d7731e24e5
-          # where BindParam is changed from SqlLiteral to a Node
-          # https://github.com/rails/arel/commit/590c784a30b13153667f8db7915998d7731e24e5
-          if Arel::Nodes::BindParam.class.is_a? Arel::Nodes::SqlLiteral
-            # Reorder bind indexes when joins or subqueries include more bindings.
-            # Special for PostgreSQL
-            if arel.bind_values.any? || bind_values.size > 1
-              bvs = arel.bind_values + bind_values
-              arel.ast.grep(Arel::Nodes::BindParam).each_with_index do |bp, i|
-                column = bvs[i].first
-                bp.replace connection.substitute_at(column, i)
-              end
+
+          # Reorder bind indexes when joins or subqueries include more bindings.
+          # Special for PostgreSQL
+          if arel.bind_values.any? || bind_values.size > 1
+            bvs = arel.bind_values + bind_values
+            arel.ast.grep(Arel::Nodes::BindParam).each_with_index do |bp, i|
+              column = bvs[i].first
+              bp.replace connection.substitute_at(column, i)
             end
           end