arel_extensions 2.1.4 → 2.1.5

data/lib/arel_extensions/math.rb

@@ -16,16 +16,16 @@ module ArelExtensions
     # Date and integer adds or subtracts a specified time interval from a date.
     def +(other)
       case self
-        when Arel::Nodes::Quoted
-          return self.concat(other)
-        when Arel::Nodes::Grouping
-          if self.expr.left.is_a?(String) || self.expr.right.is_a?(String)
-            return self.concat(other)
-          else
-            return Arel.grouping(Arel::Nodes::Addition.new self, other)
-          end
-        when ArelExtensions::Nodes::Function, ArelExtensions::Nodes::Case
-          return case self.return_type
+      when Arel::Nodes::Quoted
+        self.concat(other)
+      when Arel::Nodes::Grouping
+        if self.expr.left.is_a?(String) || self.expr.right.is_a?(String)
+          self.concat(other)
+        else
+          Arel.grouping(Arel::Nodes::Addition.new self, other)
+        end
+      when ArelExtensions::Nodes::Function, ArelExtensions::Nodes::Case
+        case self.return_type
         when :string, :text
           self.concat(other)
         when :integer, :decimal, :float, :number, :int
@@ -38,12 +38,17 @@ module ArelExtensions
       when Arel::Nodes::Function
         Arel.grouping(Arel::Nodes::Addition.new self, other)
       else
-        col = Arel.column_of(self.relation.table_name, self.name.to_s) if self.respond_to?(:relation)
-        if (!col) # if the column doesn't exist in the database
+        col =
+          if self.is_a?(Arel::Attribute) && self.respond_to?(:type_caster) && self.able_to_type_cast?
+            self.type_caster
+          else
+            Arel.column_of(self.relation.table_name, self.name.to_s) if self.respond_to?(:relation)
+          end
+        if !col # if the column doesn't exist in the database
           Arel.grouping(Arel::Nodes::Addition.new(self, Arel.quoted(other)))
         else
           arg = col.type
-          if arg == :integer || (!arg)
+          if arg == :integer || !arg
             other = other.to_i if other.is_a?(String)
             Arel.grouping(Arel::Nodes::Addition.new self, Arel.quoted(other))
           elsif arg == :decimal || arg == :float
@@ -82,16 +87,26 @@ module ArelExtensions
       when Arel::Nodes::Function
         Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.quoted(other)))
       else
-        col = Arel.column_of(self.relation.table_name, self.name.to_s)
-        if (!col) # if the column doesn't exist in the database
+        col =
+          if self.is_a?(Arel::Attribute) && self.respond_to?(:type_caster) && self.able_to_type_cast?
+            self.type_caster
+          else
+            Arel.column_of(self.relation.table_name, self.name.to_s) if self.respond_to?(:relation)
+          end
+        if !col # if the column doesn't exist in the database
           Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.quoted(other)))
         else
           arg = col.type
           if (arg == :date || arg == :datetime)
             case other
             when Arel::Attributes::Attribute
-              col2 = Arel.column_of(other.relation.table_name, other.name.to_s)
-              if (!col2) # if the column doesn't exist in the database
+              col2 =
+                if other.is_a?(Arel::Attribute) && other.respond_to?(:type_caster) && other.able_to_type_cast?
+                  other.type_caster
+                else
+                  Arel.column_of(other.relation.table_name, other.name.to_s) if other.respond_to?(:relation)
+                end
+              if !col2 # if the column doesn't exist in the database
                 ArelExtensions::Nodes::DateSub.new [self, other]
               else
                 arg2 = col2.type

data/lib/arel_extensions/nodes/cast.rb

@@ -32,13 +32,13 @@ module ArelExtensions
           @as_attr = :string
         end
         tab = [convert_to_node(expr.first)]
-        return super(tab)
+        super(tab)
       end
 
       def +(other)
         case @return_type
         when :string
-          return ArelExtensions::Nodes::Concat.new [self, other]
+          ArelExtensions::Nodes::Concat.new [self, other]
         when :ruby_time
           ArelExtensions::Nodes::DateAdd.new [self, other]
         else

data/lib/arel_extensions/nodes/coalesce.rb

@@ -27,7 +27,7 @@ module ArelExtensions
         when DateTime, Time
           @left_node_type = :ruby_time
         end
-        return super(tab)
+        super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/collate.rb

@@ -10,7 +10,7 @@ module ArelExtensions
         @ci = ci
         @option = option
         tab = [convert_to_node(left)]
-        return super(tab)
+        super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/date_diff.rb

@@ -19,7 +19,7 @@ module ArelExtensions
         when DateTime, Time
           @left_node_type = :ruby_time
         end
-        res << ([:date, :ruby_date].include?(@left_node_type) ? convert_to_date_node(col) : convert_to_datetime_node(col))
+        res << (%i[date ruby_date].include?(@left_node_type) ? convert_to_date_node(col) : convert_to_datetime_node(col))
         case expr[1]
         when Arel::Nodes::Node, Arel::Attributes::Attribute
           @right_node_type = type_of_attribute(expr[1])
@@ -28,7 +28,7 @@ module ArelExtensions
         when DateTime, Time
           @right_node_type = :ruby_time
         end
-        res << ([:date, :ruby_date].include?(@left_node_type) ? convert_to_date_node(expr[1]) : convert_to_datetime_node(expr[1]))
+        res << (%i[date ruby_date].include?(@left_node_type) ? convert_to_date_node(expr[1]) : convert_to_datetime_node(expr[1]))
         super res
       end
     end
@@ -43,19 +43,19 @@ module ArelExtensions
         tab = expr.map do |arg|
           convert(arg)
         end
-        return super(tab)
+        super(tab)
       end
 
       def sqlite_value
         v = self.expressions.last
         if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
           if @date_type == :date
-            return Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
+            Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
           elsif @date_type == :datetime
-            return Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
+            Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
           end
         else
-          return v
+          v
         end
       end
 

data/lib/arel_extensions/nodes/locate.rb

@@ -7,7 +7,7 @@ module ArelExtensions
         tab = expr.map do |arg|
           convert_to_node(arg)
         end
-        return super(tab)
+        super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/repeat.rb

@@ -7,11 +7,11 @@ module ArelExtensions
         tab = expr.map { |arg|
           convert_to_node(arg)
         }
-        return super(tab)
+        super(tab)
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
+        ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
     end
   end

data/lib/arel_extensions/nodes/substring.rb

@@ -8,7 +8,7 @@ module ArelExtensions
         if expr[2]
           tab << convert_to_node(expr[2])
         end
-        return super(tab)
+        super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/then.rb

@@ -5,7 +5,7 @@ module ArelExtensions
         tab = expr.map { |arg|
           convert_to_node(arg)
         }
-        return super(tab)
+        super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/trim.rb

@@ -7,11 +7,11 @@ module ArelExtensions
         tab = expr.map { |arg|
           convert_to_node(arg)
         }
-        return super(tab)
+        super(tab)
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
+        ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
     end
 

data/lib/arel_extensions/nodes/union.rb

@@ -2,15 +2,15 @@ module ArelExtensions
   module Nodes
     class Union < Arel::Nodes::Union
       def initialize left, right
-        return super(left, right)
+        super(left, right)
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Union.new(self, other)
+        ArelExtensions::Nodes::Union.new(self, other)
       end
 
       def union(other)
-        return ArelExtensions::Nodes::UnionAll.new(self, other)
+        ArelExtensions::Nodes::UnionAll.new(self, other)
       end
 
       def as other

data/lib/arel_extensions/nodes/union_all.rb

@@ -2,11 +2,11 @@ module ArelExtensions
   module Nodes
     class UnionAll < Arel::Nodes::UnionAll
       def initialize left, right
-        return super(left, right)
+        super(left, right)
       end
 
       def union_all(other)
-        return ArelExtensions::Nodes::UnionAll.new(self, other)
+        ArelExtensions::Nodes::UnionAll.new(self, other)
       end
 
       def as other

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '2.1.4'.freeze
+  VERSION = '2.1.5'.freeze
 end

data/lib/arel_extensions/visitors/ibm_db.rb

@@ -56,7 +56,7 @@ module ArelExtensions
         collector << 'COALESCE('
         collector = visit o.left, collector
         collector << ','
-        if (o.right.is_a?(Arel::Attributes::Attribute))
+        if o.right.is_a?(Arel::Attributes::Attribute)
           collector = visit o.right, collector
         else
           collector << "'#{o.right}'"

data/lib/arel_extensions/visitors/mssql.rb

@@ -157,7 +157,7 @@ module ArelExtensions
           collector = visit o.right, collector
         else
           left = o.left.end_with?('i') ? o.left[0..-2] : o.left
-          conv = ['h', 'mn', 's'].include?(o.left)
+          conv = %w[h mn s].include?(o.left)
           collector << 'DATEPART('
           collector << LOADED_VISITOR::DATE_MAPPING[left]
           collector << LOADED_VISITOR::COMMA
@@ -220,11 +220,19 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Trim o, collector
-        collector << 'TRIM( '
-        collector = visit o.right, collector
-        collector << ' FROM '
-        collector = visit o.left, collector
-        collector << ')'
+        # NOTE: in MSSQL's `blank`, o.right is the space char so we need to
+        # account for it.
+        if o.right && !/\A\s\Z/.match(o.right.expr)
+          collector << 'dbo.TrimChar('
+          collector = visit o.left, collector
+          collector << Arel::Visitors::MSSQL::COMMA
+          collector = visit o.right, collector
+          collector << ')'
+        else
+          collector << "LTRIM(RTRIM("
+          collector = visit o.left, collector
+          collector << "))"
+        end
         collector
       end
 
@@ -308,7 +316,7 @@ module ArelExtensions
               dir = LOADED_VISITOR::DATE_FORMAT_DIRECTIVES[s.matched]
               fmt = LOADED_VISITOR::DATE_FORMAT_FORMAT[dir]
               date_name = LOADED_VISITOR::DATE_NAME.include?(s.matched)
-              collector << 'TRIM('
+              collector << 'LTRIM(RTRIM('
               collector << 'FORMAT(' if fmt
               collector << 'STR('    if !fmt && !date_name
               collector << (date_name ? 'DATENAME(' : 'DATEPART(')
@@ -334,7 +342,7 @@ module ArelExtensions
               collector << ')'
               collector << ')'                                  if !fmt && !date_name
               collector << LOADED_VISITOR::COMMA << "'#{fmt}')" if fmt
-              collector << ')'
+              collector << '))'
             when s.scan(/^%%/)
               collector = visit Arel.quoted('%'), collector
             when s.scan(/[^%]+|./)
@@ -575,15 +583,20 @@ module ArelExtensions
               ])
           end
 
-        repeated_char = (o.width == 0) ? Arel.quoted('') : ArelExtensions::Nodes::Case.new.
-          when(Arel.quoted(o.width).abs - (number.length + sign_length) > 0).
-          then(Arel.quoted(
-              o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
-            ).repeat(Arel.quoted(o.width).abs - (number.length + sign_length))
-          ).
-          else('')
-        before = (!o.flags.include?('0')) && (!o.flags.include?('-')) ? repeated_char : ''
-        middle = (o.flags.include?('0')) && (!o.flags.include?('-'))  ? repeated_char : ''
+        repeated_char =
+          if o.width == 0
+            Arel.quoted('')
+          else
+            Arel
+              .when(Arel.quoted(o.width).abs - (number.length + sign_length) > 0)
+              .then(Arel.quoted(
+                      o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
+                    ).repeat(Arel.quoted(o.width).abs - (number.length + sign_length))
+                   )
+              .else('')
+          end
+        before = !o.flags.include?('0') && !o.flags.include?('-') ? repeated_char : ''
+        middle = o.flags.include?('0') && !o.flags.include?('-')  ? repeated_char : ''
         after  = o.flags.include?('-') ? repeated_char : ''
         full_number =
           ArelExtensions::Nodes::Concat.new([

data/lib/arel_extensions/visitors/mysql.rb

@@ -126,7 +126,7 @@ module ArelExtensions
         collector << 'CONCAT('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
-          if (arg.is_a?(Numeric)) || (arg.is_a?(Arel::Attributes::Attribute))
+          if arg.is_a?(Numeric) || arg.is_a?(Arel::Attributes::Attribute)
             collector << 'CAST('
             collector = visit arg, collector
             collector << ' AS char)'
@@ -398,15 +398,20 @@ module ArelExtensions
             Arel::Nodes::NamedFunction.new('FORMAT', [col.abs] + params)
           end
 
-        repeated_char = (o.width == 0) ? Arel.quoted('') : ArelExtensions::Nodes::Case.new.
-          when(Arel.quoted(o.width).abs - (number.length + sign_length) > 0).
-          then(Arel.quoted(
-              o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
-            ).repeat(Arel.quoted(o.width).abs - (number.length + sign_length))
-          ).
-          else('')
-        before = (!o.flags.include?('0')) && (!o.flags.include?('-')) ? repeated_char : ''
-        middle = (o.flags.include?('0')) && (!o.flags.include?('-'))  ? repeated_char : ''
+        repeated_char =
+          if o.width == 0
+            Arel.quoted('')
+          else
+            Arel
+              .when(Arel.quoted(o.width).abs - (number.length + sign_length) > 0)
+              .then(Arel.quoted(
+                      o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
+                    ).repeat(Arel.quoted(o.width).abs - (number.length + sign_length))
+                   )
+              .else('')
+          end
+        before = !o.flags.include?('0') && !o.flags.include?('-') ? repeated_char : ''
+        middle = o.flags.include?('0') && !o.flags.include?('-')  ? repeated_char : ''
         after  = o.flags.include?('-') ? repeated_char : ''
         full_number = ArelExtensions::Nodes::Concat.new([
             before,

data/lib/arel_extensions/visitors/oracle.rb

@@ -11,7 +11,7 @@ module ArelExtensions
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM',                   # hours
         '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz'                                # seconds, subseconds
       }
-      NUMBER_COMMA_MAPPING = { 'en_US' => '.,', 'fr_FR' => ',', 'sv_SE' => ', ' }
+      NUMBER_COMMA_MAPPING = {'en_US' => '.,', 'fr_FR' => ',', 'sv_SE' => ', '}
 
       def visit_ArelExtensions_Nodes_Log10 o, collector
         collector << 'LOG('
@@ -455,7 +455,7 @@ module ArelExtensions
           src_tz, dst_tz = o.time_zone.first
           collector << ' as timestamp) at time zone '
           collector = visit Arel.quoted(src_tz), collector
-          collecto < ' at time zone '
+          collector < ' at time zone '
           collector = visit Arel.quoted(dst_tz), collector
         when String
           collector << ' as timestamp) at time zone '
@@ -587,7 +587,7 @@ module ArelExtensions
       alias_method(:old_visit_Arel_Nodes_TableAlias, :visit_Arel_Nodes_TableAlias) rescue nil
       def visit_Arel_Nodes_TableAlias o, collector
         if o.name.length > 30
-          o = Arel::Table.new(o.table_name).alias(Base64.urlsafe_encode64(Digest::MD5.new.digest(o.name)).tr('=', '').tr('-', '_'))
+          o = Arel::Table.new(o.table_name).alias(Arel.shorten(o.name))
         end
         old_visit_Arel_Nodes_TableAlias(o, collector)
       end
@@ -601,7 +601,7 @@ module ArelExtensions
         else
           collector = visit o.left, collector
         end
-        quote = o.right.to_s =~ /(\A["].*["]\z)|\A[a-zA-Z_]*\z/ ? '' : '"'
+        quote = /(\A".*"\z)|\A[a-zA-Z_]*\z/.match?(o.right.to_s) ? '' : '"'
         collector << " AS #{quote}"
         collector = visit o.right, collector
         collector << "#{quote}"
@@ -627,10 +627,10 @@ module ArelExtensions
         comma_in_format = o.precision == 0 ? '' : 'D'
         nines_after = (1..o.precision - 1).map{'9'}.join('') + '0'
         if comma.length == 1
-          options = Arel.quoted("NLS_NUMERIC_CHARACTERS = '" + comma + " '")
+          options = Arel.quoted("NLS_NUMERIC_CHARACTERS = '#{comma} '")
           nines_before = ('999' * 4 + '990')
         else
-          options = Arel.quoted("NLS_NUMERIC_CHARACTERS = '" + comma + "'")
+          options = Arel.quoted("NLS_NUMERIC_CHARACTERS = '#{comma}'")
           nines_before = ('999G' * 4 + '990')
         end
         sign = Arel.when(col < 0).
@@ -643,7 +643,7 @@ module ArelExtensions
         if o.scientific_notation
           number = Arel::Nodes::NamedFunction.new('TO_CHAR', [
                 Arel.quoted(col.abs),
-                Arel.quoted('FM' + nines_before + comma_in_format + nines_after + 'EEEE'),
+                Arel.quoted("FM#{nines_before}#{comma_in_format}#{nines_after}EEEE"),
                 options
               ])
           if o.type == 'e'
@@ -652,20 +652,25 @@ module ArelExtensions
         else
           number = Arel::Nodes::NamedFunction.new('TO_CHAR', [
                 Arel.quoted(col.abs),
-                Arel.quoted('FM' + nines_before + comma_in_format + nines_after),
+                Arel.quoted("FM#{nines_before}#{comma_in_format}#{nines_after}"),
                 options
               ])
         end
 
-        repeated_char = (o.width == 0) ? Arel.quoted('') : ArelExtensions::Nodes::Case.new.
-          when(Arel.quoted(o.width).abs - (number.length + sign_length) > 0).
-          then(Arel.quoted(
-              o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
-            ).repeat(Arel.quoted(o.width).abs - (number.length + sign_length))
-          ).
-          else('')
-        before = (!o.flags.include?('0')) && (!o.flags.include?('-')) ? repeated_char : ''
-        middle = (o.flags.include?('0')) && (!o.flags.include?('-'))  ? repeated_char : ''
+        repeated_char =
+          if o.width == 0
+            Arel.quoted('')
+          else
+            Arel
+              .when(Arel.quoted(o.width).abs - (number.length + sign_length) > 0)
+              .then(Arel.quoted(
+                      o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
+                    ).repeat(Arel.quoted(o.width).abs - (number.length + sign_length))
+                   )
+              .else('')
+          end
+        before = !o.flags.include?('0') && !o.flags.include?('-') ? repeated_char : ''
+        middle = o.flags.include?('0') && !o.flags.include?('-')  ? repeated_char : ''
         after  = o.flags.include?('-') ? repeated_char : ''
         full_number = ArelExtensions::Nodes::Concat.new([
             before,

data/lib/arel_extensions/visitors/postgresql.rb

@@ -425,32 +425,37 @@ module ArelExtensions
                 Arel::Nodes::NamedFunction.new('TRIM', [
                   Arel::Nodes::NamedFunction.new('TO_CHAR', [
                     Arel.when(col.not_eq 0).then(col.abs / Arel.quoted(10).pow(col.abs.log10.floor)).else(1),
-                    Arel.quoted('FM' + nines_before + '"' + comma + '"V' + nines_after)
+                    Arel.quoted("FM#{nines_before}\"#{comma}\"V#{nines_after}")
                   ])]),
                 o.type,
                 Arel::Nodes::NamedFunction.new('TRIM', [
                   Arel::Nodes::NamedFunction.new('TO_CHAR', [
                     Arel.when(col.not_eq 0).then(col.abs.log10.floor).else(0),
-                    Arel.quoted('FM' + nines_before)
+                    Arel.quoted("FM#{nines_before}")
                   ])])
               ])
           else
             Arel::Nodes::NamedFunction.new('TRIM', [
               Arel::Nodes::NamedFunction.new('TO_CHAR', [
                 Arel.quoted(col.abs),
-                Arel.quoted('FM' + nines_before + '"' + comma + '"V' + nines_after)
+                Arel.quoted("FM#{nines_before}\"#{comma}\"V#{nines_after}")
               ])])
           end
 
-        repeated_char = (o.width == 0) ? Arel.quoted('') : ArelExtensions::Nodes::Case.new.
-          when(Arel.quoted(o.width).abs - (number.length + sign_length) > 0).
-          then(Arel.quoted(
-              o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
-            ).repeat(Arel.quoted(o.width).abs - (number.length + sign_length))
-          ).
-          else('')
-        before = (!o.flags.include?('0')) && (!o.flags.include?('-')) ? repeated_char : ''
-        middle = (o.flags.include?('0')) && (!o.flags.include?('-'))  ? repeated_char : ''
+        repeated_char =
+          if o.width == 0
+            Arel.quoted('')
+          else
+            Arel
+              .when(Arel.quoted(o.width).abs - (number.length + sign_length) > 0)
+              .then(Arel.quoted(
+                      o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
+                    ).repeat(Arel.quoted(o.width).abs - (number.length + sign_length))
+                   )
+              .else('')
+          end
+        before = !o.flags.include?('0') && !o.flags.include?('-') ? repeated_char : ''
+        middle = o.flags.include?('0') && !o.flags.include?('-')  ? repeated_char : ''
         after  = o.flags.include?('-') ? repeated_char : ''
         full_number = ArelExtensions::Nodes::Concat.new([
             before,

data/lib/arel_extensions/visitors/sqlite.rb

@@ -325,16 +325,16 @@ module ArelExtensions
 
       def get_time_converted element
         if element.is_a?(Time)
-          return Arel::Nodes::NamedFunction.new('STRFTIME', [element, '%H:%M:%S'])
+          Arel::Nodes::NamedFunction.new('STRFTIME', [element, '%H:%M:%S'])
         elsif element.is_a?(Arel::Attributes::Attribute)
           col = Arel.column_of(element.relation.table_name, element.name.to_s)
           if col && (col.type == :time)
-            return Arel::Nodes::NamedFunction.new('STRFTIME', [element, '%H:%M:%S'])
+            Arel::Nodes::NamedFunction.new('STRFTIME', [element, '%H:%M:%S'])
           else
-            return element
+            element
           end
         else
-          return element
+          element
         end
       end
 

data/lib/arel_extensions/visitors/to_sql.rb

@@ -649,7 +649,10 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_JsonGroup o, collector
         if o.as_array
-          res = Arel.quoted('[') + (o.orders ? o.dict.group_concat(', ', order: Array(o.orders)) : o.dict.group_concat(', ')).coalesce('') + ']'
+          res =
+            Arel.quoted('[') \
+            + (o.orders ? o.dict.group_concat(', ', order: Array(o.orders)) : o.dict.group_concat(', ')).coalesce('') \
+            + ']'
           collector = visit res, collector
         else
           res = Arel.quoted('{')

data/lib/arel_extensions.rb

@@ -1,4 +1,5 @@
 require 'arel'
+require 'base64'
 
 require 'arel_extensions/railtie' if defined?(Rails::Railtie)
 
@@ -268,3 +269,12 @@ class Arel::Nodes::TableAlias
     end
   end
 end
+
+
+class Arel::Attributes::Attribute
+  def to_sql(engine = Arel::Table.engine)
+    collector = Arel::Collectors::SQLString.new
+    collector = engine.connection.visitor.accept self, collector
+    collector.value
+  end
+end

data/test/arelx_test_helper.rb

@@ -7,7 +7,7 @@ require 'active_record'
 require 'support/fake_record'
 
 def colored(color, msg)
-  ENV['TERM'] =~ /^xterm|-256color$/ ? "\x1b[#{color}m#{msg}\x1b[89m\x1b[0m" : "#{msg}"
+  /^xterm|-256color$/.match?(ENV['TERM']) ? "\x1b[#{color}m#{msg}\x1b[89m\x1b[0m" : "#{msg}"
 end
 
 YELLOW = '33'

data/test/real_db_test.rb

@@ -14,7 +14,7 @@ def setup_db
     ActiveRecord::Base.default_timezone = :utc
   end
   @cnx = ActiveRecord::Base.connection
-  if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
+  if /sqlite/i.match?(ActiveRecord::Base.connection.adapter_name)
     $sqlite = true
     db = @cnx.raw_connection
     if !$load_extension_disabled
@@ -82,7 +82,7 @@ class ListTest < Minitest::Test
   end
 
   def test_coalesce
-    if @cnx.adapter_name =~ /pgsql/i
+    if /pgsql/i.match?(@cnx.adapter_name)
       assert_equal 100, User.where(User.arel_table[:name].eq('Test')).select((User.arel_table[:age].coalesce(100)).as('res')).first.res
         assert_equal 'Camille', User.where(User.arel_table[:name].eq('Camille')).select((User.arel_table[:name].coalesce('Null', 'default')).as('res')).first.res
     else
@@ -128,7 +128,7 @@ class ListTest < Minitest::Test
   end
 
   def test_isnull
-    if ActiveRecord::Base.connection.adapter_name =~ /pgsql/i
+    if /pgsql/i.match?(ActiveRecord::Base.connection.adapter_name)
       assert_equal 100, User.where(User.arel_table[:name].eq('Test')).select((User.arel_table[:age].isnull(100)).as('res')).first.res
     else
       assert_equal 'default', User.where(User.arel_table[:name].eq('Test')).select((User.arel_table[:age].isnull('default')).as('res')).first.res
@@ -196,8 +196,8 @@ class ListTest < Minitest::Test
   end
 
   def test_replace
-    assert_equal 'LucaX', User.where(User.arel_table[:name].eq('Lucas')).select(((User.arel_table[:name]).replace('s', 'X')).as('res')).first.res
-    assert_equal 'replace', User.where(User.arel_table[:name].eq('Lucas')).select(((User.arel_table[:name]).replace(User.arel_table[:name], 'replace')).as('res')).first.res
+    assert_equal 'LucaX', User.where(User.arel_table[:name].eq('Lucas')).select((User.arel_table[:name].replace('s', 'X')).as('res')).first.res
+    assert_equal 'replace', User.where(User.arel_table[:name].eq('Lucas')).select((User.arel_table[:name].replace(User.arel_table[:name], 'replace')).as('res')).first.res
   end
 
   def test_round