Extract build_cast_value for limit_value and offset_value

shunyama · May 3, 2020 · 8eb940b · 8eb940b
1 parent d1d98f3
commit 8eb940b
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
@@ -1096,20 +1096,10 @@ def build_arel(aliases)
         arel.where(where_clause.ast) unless where_clause.empty?
         arel.having(having_clause.ast) unless having_clause.empty?
         if limit_value
-          limit_attribute = ActiveModel::Attribute.with_cast_value(
-            "LIMIT",
-            connection.sanitize_limit(limit_value),
-            Type.default_value,
-          )
-          arel.take(Arel::Nodes::BindParam.new(limit_attribute))
+          arel.take(build_cast_value("LIMIT", connection.sanitize_limit(limit_value)))
         end
         if offset_value
-          offset_attribute = ActiveModel::Attribute.with_cast_value(
-            "OFFSET",
-            offset_value.to_i,
-            Type.default_value,
-          )
-          arel.skip(Arel::Nodes::BindParam.new(offset_attribute))
+          arel.skip(build_cast_value("OFFSET", offset_value.to_i))
         end
         arel.group(*arel_columns(group_values.uniq.compact_blank)) unless group_values.empty?
 
@@ -1126,6 +1116,11 @@ def build_arel(aliases)
         arel
       end
 
+      def build_cast_value(name, value)
+        cast_value = ActiveModel::Attribute.with_cast_value(name, value, Type.default_value)
+        Arel::Nodes::BindParam.new(cast_value)
+      end
+
       def build_from
         opts = from_clause.value
         name = from_clause.name