Replace raw SQL by Arel

Author: alexisbernard

lib/type_scopes/boolean.rb

@@ -6,13 +6,12 @@ def self.types
   end
 
   def self.create_scopes_for_column(model, name)
-    append_scope(model, :"#{name}", lambda { where(table_name => { name => true }) })
-
+    append_scope(model, :"#{name}", lambda { where(name => true) })
     prefix, suffix = /\A(has|is|was)_(.+)\z/.match(name).to_a[1..2]
     if prefix && suffix
-      append_scope(model, :"#{prefix}_not_#{suffix}", lambda { where(table_name => { name => false }) })
+      append_scope(model, :"#{prefix}_not_#{suffix}", lambda { where(name => false) })
     else
-      append_scope(model, :"not_#{name}", lambda { where(table_name => { name => false }) })
+      append_scope(model, :"not_#{name}", lambda { where(name => false) })
     end
   end
 end

lib/type_scopes/numeric.rb

@@ -5,15 +5,15 @@ def self.types
     ["integer", "double precision", "numeric", "bigint", "decimal"].freeze
   end
 
-  def self.create_scopes_for_column(model, column)
-    full_name = "#{model.quoted_table_name}.#{column}"
-    append_scope(model, :"#{column}_to", lambda { |value| where("#{full_name} <= ?", value) })
-    append_scope(model, :"#{column}_from", lambda { |value| where("#{full_name} >= ?", value) })
-    append_scope(model, :"#{column}_above", lambda { |value| where("#{full_name} > ?", value) })
-    append_scope(model, :"#{column}_below", lambda { |value| where("#{full_name} < ?", value) })
-    append_scope(model, :"#{column}_between", lambda { |from, to| where("#{full_name} BETWEEN ? AND ?", from, to) })
-    append_scope(model, :"#{column}_not_between", lambda { |from, to| where("#{full_name} NOT BETWEEN ? AND ?", from, to) })
-    append_scope(model, :"#{column}_within", lambda { |from, to| where("#{full_name} > ? AND #{full_name} < ?", from, to) })
-    append_scope(model, :"#{column}_not_within", lambda { |from, to| where("#{full_name} <= ? OR #{full_name} >= ?", from, to) })
+  def self.create_scopes_for_column(model, name)
+    column = model.arel_table[name]
+    append_scope(model, :"#{name}_to", lambda { |value| where(column.lteq(value)) })
+    append_scope(model, :"#{name}_from", lambda { |value| where(column.gteq(value)) })
+    append_scope(model, :"#{name}_above", lambda { |value| where(column.gt(value)) })
+    append_scope(model, :"#{name}_below", lambda { |value| where(column.lt(value)) })
+    append_scope(model, :"#{name}_between", lambda { |from, to| where(name => from..to) })
+    append_scope(model, :"#{name}_not_between", lambda { |from, to| where.not(name => from..to) })
+    append_scope(model, :"#{name}_within", lambda { |from, to| where(column.gt(from)).where(column.lt(to)) })
+    append_scope(model, :"#{name}_not_within", lambda { |from, to| where(column.lteq(from).or(column.gteq(to))) })
   end
 end

lib/type_scopes/string.rb

@@ -11,10 +11,10 @@ def self.escape(string)
     string
   end
 
-  def self.create_scopes_for_column(model, column)
-    full_name = "#{model.quoted_table_name}.#{column}"
-    append_scope(model, :"#{column}_contains", lambda { |str| where("#{full_name} LIKE ?", "%#{TypeScopes::String.escape(str)}%") })
-    append_scope(model, :"#{column}_starts_with", lambda { |str| where("#{full_name} LIKE ?", "#{TypeScopes::String.escape(str)}%") })
-    append_scope(model, :"#{column}_ends_with", lambda { |str| where("#{full_name} LIKE ?", "%#{TypeScopes::String.escape(str)}") })
+  def self.create_scopes_for_column(model, name)
+    column = model.arel_table[name]
+    append_scope(model, :"#{name}_contains", lambda { |str| where(column.matches("%" + TypeScopes::String.escape(str) + "%")) })
+    append_scope(model, :"#{name}_starts_with", lambda { |str| where(column.matches(TypeScopes::String.escape(str) + "%")) })
+    append_scope(model, :"#{name}_ends_with", lambda { |str| where(column.matches("%" + TypeScopes::String.escape(str))) })
   end
 end

lib/type_scopes/time.rb

@@ -5,17 +5,18 @@ def self.types
     ["timestamp", "datetime", "date"].freeze
   end
 
-  def self.create_scopes_for_column(model, column)
-    full_name = "#{model.quoted_table_name}.#{column}"
-    short_name = shorten_column_name(column)
-    append_scope(model, :"#{short_name}_to", lambda { |date| where("#{full_name} <= ?", date) })
-    append_scope(model, :"#{short_name}_from", lambda { |date| where("#{full_name} >= ?", date) })
-    append_scope(model, :"#{short_name}_after", lambda { |date| where("#{full_name} > ?", date) })
-    append_scope(model, :"#{short_name}_before", lambda { |date| where("#{full_name} < ?", date) })
-    append_scope(model, :"#{short_name}_between", lambda { |from, to| where("#{full_name} BETWEEN ? AND ?", from, to) })
-    append_scope(model, :"#{short_name}_not_between", lambda { |from, to| where("#{full_name} NOT BETWEEN ? AND ?", from, to) })
-    append_scope(model, :"#{short_name}_within", lambda { |from, to| where("#{full_name} > ? AND #{full_name} < ?", from, to) })
-    append_scope(model, :"#{short_name}_not_within", lambda { |from, to| where("#{full_name} <= ? OR #{full_name} >= ?", from, to) })
+  def self.create_scopes_for_column(model, name)
+    short_name = shorten_column_name(name)
+    column = model.arel_table[name]
+
+    append_scope(model, :"#{short_name}_to", lambda { |date| where(column.lteq(date)) })
+    append_scope(model, :"#{short_name}_from", lambda { |date| where(column.gteq(date)) })
+    append_scope(model, :"#{short_name}_after", lambda { |date| where(column.gt(date)) })
+    append_scope(model, :"#{short_name}_before", lambda { |date| where(column.lt(date)) })
+    append_scope(model, :"#{short_name}_between", lambda { |from, to| where(name => from..to) })
+    append_scope(model, :"#{short_name}_not_between", lambda { |from, to| where.not(name => from..to) })
+    append_scope(model, :"#{short_name}_within", lambda { |from, to| where(column.gt(from)).where(column.lt(to)) })
+    append_scope(model, :"#{short_name}_not_within", lambda { |from, to| where(column.lteq(from).or(column.gteq(to))) })
   end
 
   def self.shorten_column_name(name)