arel_extensions 2.3.3 → 2.5.0

data/lib/arel_extensions/visitors/to_sql.rb

@@ -5,7 +5,7 @@ module ArelExtensions
 
       # Escape properly the string expression expr.
       # Take care of escaping.
-      def make_json_string expr
+      def make_json_string(expr)
         Arel.quoted('"') \
         + expr
             .coalesce('')
@@ -24,7 +24,7 @@ module ArelExtensions
       end
 
       # Math Functions
-      def visit_ArelExtensions_Nodes_Abs o, collector
+      def visit_ArelExtensions_Nodes_Abs(o, collector)
         collector << 'ABS('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -34,7 +34,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Ceil o, collector
+      def visit_ArelExtensions_Nodes_Ceil(o, collector)
         collector << 'CEIL('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -44,7 +44,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Floor o, collector
+      def visit_ArelExtensions_Nodes_Floor(o, collector)
         collector << 'FLOOR('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -54,7 +54,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Rand o, collector
+      def visit_ArelExtensions_Nodes_Rand(o, collector)
         collector << 'RAND('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -64,7 +64,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Round o, collector
+      def visit_ArelExtensions_Nodes_Round(o, collector)
         collector << 'ROUND('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -74,14 +74,14 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Log10 o, collector
+      def visit_ArelExtensions_Nodes_Log10(o, collector)
         collector << 'LOG10('
         collector = visit o.left, collector
         collector << ')'
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Power o, collector
+      def visit_ArelExtensions_Nodes_Power(o, collector)
         collector << 'POW('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -91,7 +91,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Sum o, collector
+      def visit_ArelExtensions_Nodes_Sum(o, collector)
         collector << 'SUM('
         collector = visit o.expr, collector
         collector << ')'
@@ -99,7 +99,7 @@ module ArelExtensions
       end
 
       # String functions
-      def visit_ArelExtensions_Nodes_Concat o, collector
+      def visit_ArelExtensions_Nodes_Concat(o, collector)
         collector << 'CONCAT('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -109,7 +109,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_GroupConcat o, collector
+      def visit_ArelExtensions_Nodes_GroupConcat(o, collector)
         collector << 'GROUP_CONCAT('
         collector = visit o.left, collector
         sep = o.separator.is_a?(Arel::Nodes::Quoted) ? o.separator.expr : o.separator
@@ -121,7 +121,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_MD5 o, collector
+      def visit_ArelExtensions_Nodes_MD5(o, collector)
         collector << 'MD5('
         collector = visit o.left, collector
         collector << ')'
@@ -135,7 +135,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Locate o, collector
+      def visit_ArelExtensions_Nodes_Locate(o, collector)
         collector << 'LOCATE('
         collector = visit o.right, collector
         collector << COMMA
@@ -144,7 +144,9 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Substring o, collector
+      def visit_ArelExtensions_Nodes_Substring(o, collector)
+        return visit(o.range_substring_node, collector) if o.range?
+
         collector << 'SUBSTRING('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -154,7 +156,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Replace o, collector
+      def visit_ArelExtensions_Nodes_Replace(o, collector)
         collector << 'REPLACE('
         visit o.left, collector
         collector << COMMA
@@ -165,7 +167,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_RegexpReplace o, collector
+      def visit_ArelExtensions_Nodes_RegexpReplace(o, collector)
         collector << 'REGEXP_REPLACE('
         visit o.left, collector
         collector << COMMA
@@ -176,7 +178,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Repeat o, collector
+      def visit_ArelExtensions_Nodes_Repeat(o, collector)
         collector << 'REPEAT('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -186,7 +188,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_FindInSet o, collector
+      def visit_ArelExtensions_Nodes_FindInSet(o, collector)
         collector << 'FIND_IN_SET('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -196,7 +198,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Soundex o, collector
+      def visit_ArelExtensions_Nodes_Soundex(o, collector)
         collector << 'SOUNDEX('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -206,7 +208,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Downcase o, collector
+      def visit_ArelExtensions_Nodes_Downcase(o, collector)
         collector << 'LOWER('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -216,7 +218,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Upcase o, collector
+      def visit_ArelExtensions_Nodes_Upcase(o, collector)
         collector << 'UPPER('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -226,7 +228,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Trim o, collector
+      def visit_ArelExtensions_Nodes_Trim(o, collector)
         collector << 'TRIM('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -236,7 +238,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Ltrim o, collector
+      def visit_ArelExtensions_Nodes_Ltrim(o, collector)
         collector << 'LTRIM('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -246,7 +248,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Rtrim o, collector
+      def visit_ArelExtensions_Nodes_Rtrim(o, collector)
         collector << 'RTRIM('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -256,7 +258,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Blank o, collector
+      def visit_ArelExtensions_Nodes_Blank(o, collector)
         # visit o.left.coalesce('').trim.length.eq(0), collector
         collector << 'LENGTH(TRIM(COALESCE('
         collector = visit o.expr, collector
@@ -266,7 +268,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_NotBlank o, collector
+      def visit_ArelExtensions_Nodes_NotBlank(o, collector)
         # visit o.left.coalesce('').trim.length.gt(0), collector
         collector << 'LENGTH(TRIM(COALESCE('
         collector = visit o.expr, collector
@@ -276,7 +278,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Format o, collector
+      def visit_ArelExtensions_Nodes_Format(o, collector)
         case o.col_type
         when :date, :datetime, :time
           collector << 'STRFTIME('
@@ -296,7 +298,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_FormattedDate o, collector
+      def visit_ArelExtensions_Nodes_FormattedDate(o, collector)
         case o.col_type
         when :date, :datetime, :time
           collector << 'STRFTIME('
@@ -318,7 +320,7 @@ module ArelExtensions
 
       # comparators
 
-      def visit_ArelExtensions_Nodes_Cast o, collector
+      def visit_ArelExtensions_Nodes_Cast(o, collector)
         as_attr =
           case o.as_attr
           when :binary                   then 'binary'
@@ -339,7 +341,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Coalesce o, collector
+      def visit_ArelExtensions_Nodes_Coalesce(o, collector)
         collector << 'COALESCE('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
@@ -349,9 +351,9 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_DateDiff o, collector
+      def visit_ArelExtensions_Nodes_DateDiff(o, collector)
         collector <<
-          if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
+          if %i[ruby_time datetime time].include?(o.left_node_type)
             'TIMEDIFF('
           else
             'DATEDIFF('
@@ -363,7 +365,7 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_DateSub o, collector
+      def visit_ArelExtensions_Nodes_DateSub(o, collector)
         collector << 'DATE_SUB('
         collector = visit o.left, collector
         collector << COMMA
@@ -374,7 +376,7 @@ module ArelExtensions
 
       # override
       remove_method(:visit_Arel_Nodes_As) rescue nil # if Arel::Visitors::ToSql.method_defined?(:visit_Arel_Nodes_As)
-      def visit_Arel_Nodes_As o, collector
+      def visit_Arel_Nodes_As(o, collector)
         if o.left.respond_to?(:alias)
           o.left.alias = nil
         end
@@ -386,27 +388,24 @@ module ArelExtensions
           collector = visit o.left, collector
         end
         collector << ' AS '
-        collector = visit o.right, collector
-        collector
+        visit o.right, collector
       end
 
       remove_method(:visit_Arel_Nodes_Regexp) rescue nil # if Arel::Visitors::ToSql.method_defined?(:visit_Arel_Nodes_Regexp)
-      def visit_Arel_Nodes_Regexp o, collector
+      def visit_Arel_Nodes_Regexp(o, collector)
         collector = visit o.left, collector
         collector << ' REGEXP '
-        collector = visit o.right, collector
-        collector
+        visit o.right, collector
       end
 
       remove_method(:visit_Arel_Nodes_NotRegexp) rescue nil # if Arel::Visitors::ToSql.method_defined?(:visit_Arel_Nodes_NotRegexp)
-      def visit_Arel_Nodes_NotRegexp o, collector
+      def visit_Arel_Nodes_NotRegexp(o, collector)
         collector = visit o.left, collector
         collector << ' NOT REGEXP '
-        collector = visit o.right, collector
-        collector
+        visit o.right, collector
       end
 
-      def visit_ArelExtensions_Nodes_IMatches o, collector
+      def visit_ArelExtensions_Nodes_IMatches(o, collector)
         collector = infix_value o, collector, ' ILIKE '
         if o.escape
           collector << ' ESCAPE '
@@ -416,7 +415,7 @@ module ArelExtensions
         end
       end
 
-      def visit_ArelExtensions_Nodes_IDoesNotMatch o, collector
+      def visit_ArelExtensions_Nodes_IDoesNotMatch(o, collector)
         collector = infix_value o, collector, ' NOT ILIKE '
         if o.escape
           collector << ' ESCAPE '
@@ -425,21 +424,21 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_IsNull o, collector
+      def visit_ArelExtensions_Nodes_IsNull(o, collector)
         collector << 'ISNULL('
         collector = visit o.expr, collector
         collector << ')'
         collector
       end
 
-      def visit_ArelExtensions_Nodes_IsNotNull o, collector
+      def visit_ArelExtensions_Nodes_IsNotNull(o, collector)
         collector << 'NOT ISNULL('
         collector = visit o.expr, collector
         collector << ')'
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Then o, collector
+      def visit_ArelExtensions_Nodes_Then(o, collector)
         collector << 'CASE WHEN ('
         collector = visit o.left, collector
         collector << ') THEN '
@@ -453,7 +452,7 @@ module ArelExtensions
       end
 
       # Date operations
-      def visit_ArelExtensions_Nodes_DateAdd o, collector
+      def visit_ArelExtensions_Nodes_DateAdd(o, collector)
         collector << 'DATE_ADD('
         collector = visit o.left, collector
         collector << COMMA
@@ -462,8 +461,8 @@ module ArelExtensions
         collector
       end
 
-      if Arel::VERSION.to_i < 7
-        def visit_ArelExtensions_InsertManager_BulkValues o, collector
+      if AREL_VERSION < V7
+        def visit_ArelExtensions_InsertManager_BulkValues(o, collector)
           collector << 'VALUES '
           row_nb = o.left.length
           o.left.each_with_index do |row, idx|
@@ -483,7 +482,7 @@ module ArelExtensions
           collector
         end
       else
-        def visit_ArelExtensions_InsertManager_BulkValues o, collector
+        def visit_ArelExtensions_InsertManager_BulkValues(o, collector)
           collector << 'VALUES '
           row_nb = o.left.length
           o.left.each_with_index do |row, idx|
@@ -506,21 +505,19 @@ module ArelExtensions
         end
       end
 
-      def visit_ArelExtensions_Nodes_Union o, collector
+      def visit_ArelExtensions_Nodes_Union(o, collector)
         collector = visit o.left, collector
         collector << ' UNION '
-        collector = visit o.right, collector
-        collector
+        visit o.right, collector
       end
 
-      def visit_ArelExtensions_Nodes_UnionAll o, collector
+      def visit_ArelExtensions_Nodes_UnionAll(o, collector)
         collector = visit o.left, collector
         collector << ' UNION ALL '
-        collector = visit o.right, collector
-        collector
+        visit o.right, collector
       end
 
-      def visit_ArelExtensions_Nodes_Case o, collector
+      def visit_ArelExtensions_Nodes_Case(o, collector)
         collector << 'CASE '
         if o.case
           visit o.case, collector
@@ -537,44 +534,44 @@ module ArelExtensions
         collector << 'END'
       end
 
-      def visit_ArelExtensions_Nodes_Case_When o, collector
+      def visit_ArelExtensions_Nodes_Case_When(o, collector)
         collector << 'WHEN '
         visit Arel.quoted(o.left), collector
         collector << ' THEN '
         visit Arel.quoted(o.right), collector
       end
 
-      def visit_ArelExtensions_Nodes_Case_Else o, collector
+      def visit_ArelExtensions_Nodes_Case_Else(o, collector)
         collector << 'ELSE '
         visit Arel.quoted(o.expr), collector
       end
 
-      def visit_ArelExtensions_Nodes_FormattedNumber o, collector
+      def visit_ArelExtensions_Nodes_FormattedNumber(o, collector)
         visit o.left, collector
       end
 
       remove_method(:visit_Arel_Nodes_LessThan) rescue nil
-      def visit_Arel_Nodes_LessThan o, collector
+      def visit_Arel_Nodes_LessThan(o, collector)
         collector = visit o.left, collector
         collector << ' < '
         visit o.right, collector
       end
 
-      def visit_ArelExtensions_Nodes_Std o, collector
+      def visit_ArelExtensions_Nodes_Std(o, collector)
         collector << 'STD('
         visit o.left, collector
         collector << ')'
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Variance o, collector
+      def visit_ArelExtensions_Nodes_Variance(o, collector)
         collector << 'VARIANCE('
         visit o.left, collector
         collector << ')'
         collector
       end
 
-      def visit_ArelExtensions_Nodes_LevenshteinDistance o, collector
+      def visit_ArelExtensions_Nodes_LevenshteinDistance(o, collector)
         collector << 'LEVENSHTEIN_DISTANCE('
         collector = visit o.left, collector
         collector << COMMA
@@ -585,8 +582,8 @@ module ArelExtensions
 
       # Boolean logic.
 
-      alias_method(:old_visit_Arel_Nodes_And, :visit_Arel_Nodes_And) rescue nil
-      def visit_Arel_Nodes_And o, collector
+      alias old_visit_Arel_Nodes_And visit_Arel_Nodes_And rescue nil
+      def visit_Arel_Nodes_And(o, collector)
         case o.children.length
         when 0
           collector << '1 = 1' # but this should not happen
@@ -605,8 +602,8 @@ module ArelExtensions
         collector
       end
 
-      alias_method(:old_visit_Arel_Nodes_Or, :visit_Arel_Nodes_Or) rescue nil
-      def visit_Arel_Nodes_Or o, collector
+      alias old_visit_Arel_Nodes_Or visit_Arel_Nodes_Or rescue nil
+      def visit_Arel_Nodes_Or(o, collector)
         case o.children.length
         when 0
           collector << '1 = 0' # but this should not happen
@@ -627,6 +624,19 @@ module ArelExtensions
 
       def json_value(o, v)
         case o.type_of_node(v)
+        when :numeric
+          # A bare numeric literal (e.g. `{ col => 1 }`) is never NULL, so it is
+          # emitted as-is rather than run through `is_null`/`coalesce`.
+          Arel.quoted(v)
+        when :boolean
+          # A literal boolean is never NULL: emit the JSON token directly.
+          # A boolean column is null-checked and rendered as true/false. `eq(true)` rather than the
+          # bare column, because T-SQL (mssql) requires a proper boolean predicate in WHEN.
+          if o.boolean_literal?(v)
+            Arel.quoted((v.is_a?(Arel::Nodes::Quoted) ? v.expr : v).to_s)
+          else
+            Arel.when(v.is_null).then(make_json_null).else(Arel.when(v.eq(true)).then('true').else('false'))
+          end
         when :string
           Arel.when(v.is_null).then(make_json_null).else(make_json_string(v))
         when :date
@@ -645,7 +655,7 @@ module ArelExtensions
         end
       end
 
-      def visit_ArelExtensions_Nodes_Json o, collector
+      def visit_ArelExtensions_Nodes_Json(o, collector)
         case o.dict
         when Array
           res = Arel.quoted('[')
@@ -669,12 +679,12 @@ module ArelExtensions
           res += '}'
           collector = visit res, collector
         else
-          collector = visit o.dict, collector
+          collector = visit(o.boolean_literal?(o.dict) ? Arel.quoted(o.dict.expr.to_s) : o.dict, collector)
         end
         collector
       end
 
-      def visit_ArelExtensions_Nodes_JsonGroup o, collector
+      def visit_ArelExtensions_Nodes_JsonGroup(o, collector)
         if o.as_array
           res =
             Arel.quoted('[') \
@@ -686,13 +696,13 @@ module ArelExtensions
           orders = o.orders || o.dict.keys
           o.dict.each.with_index do |(k, v), i|
             if i != 0
-              res = res + ', '
+              res += ', '
             end
             kv = make_json_string(ArelExtensions::Nodes::Cast.new([k, :string])) + ': '
             kv += json_value(o, v)
-            res = res + kv.group_concat(', ', order: Array(orders)).coalesce('')
+            res += kv.group_concat(', ', order: Array(orders)).coalesce('')
           end
-          res = res + '}'
+          res += '}'
           collector = visit res, collector
         end
         collector

data/lib/arel_extensions/visitors.rb

@@ -14,7 +14,7 @@ if RUBY_PLATFORM == 'java' \
     warn 'arel/visitors/sqlserver not found: MSSQL might not work correctly.'
   end
 elsif RUBY_PLATFORM != 'java' \
-  && Arel::VERSION.to_i < 10 \
+  && ArelExtensions::AREL_VERSION < ArelExtensions::V10 \
   && Gem::Specification.find { |g| g.name == 'activerecord-sqlserver-adapter' }
   begin
     require 'arel_sqlserver'
@@ -43,8 +43,8 @@ end
 
 if defined?(Arel::Visitors::DepthFirst)
   class Arel::Visitors::DepthFirst
-    def visit_Arel_SelectManager o
-        visit o.ast
+    def visit_Arel_SelectManager(o)
+      visit o.ast
     end
   end
 end
@@ -53,8 +53,8 @@ if defined?(Arel::Visitors::MSSQL)
   class Arel::Visitors::MSSQL
     include ArelExtensions::Visitors::MSSQL
 
-    alias_method(:old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement)
-    def visit_Arel_Nodes_SelectStatement o, collector
+    alias old_visit_Arel_Nodes_SelectStatement visit_Arel_Nodes_SelectStatement
+    def visit_Arel_Nodes_SelectStatement(o, collector)
       if !collector.value.blank? && o.limit.blank? && o.offset.blank?
         o = o.dup
         o.orders = []
@@ -90,8 +90,8 @@ if defined?(Arel::Visitors::SQLServer)
     # It might be something different, but this is the first thing we should
     # investigate.
 
-    alias_method(:old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement) rescue nil
-    def visit_Arel_Nodes_SelectStatement o, collector
+    alias old_visit_Arel_Nodes_SelectStatement visit_Arel_Nodes_SelectStatement rescue nil
+    def visit_Arel_Nodes_SelectStatement(o, collector)
       if !collector.value.blank? && o.limit.blank? && o.offset.blank?
         o = o.dup
         o.orders = []

data/lib/arel_extensions/warning.rb

@@ -1,11 +1,11 @@
 module ArelExtensions
   class RubyDeprecator
     if RUBY_VERSION.split('.')[0].to_i < 3
-      def warn msg
+      def warn(msg)
         Kernel.warn(msg)
       end
     else
-      def warn msg
+      def warn(msg)
         Kernel.warn(msg, category: :deprecated)
       end
     end
@@ -26,14 +26,14 @@ module ArelExtensions
         major, minor = Gem::Version.create(ArelExtensions::VERSION).segments
         ActiveSupport::Deprecation.new("#{major}.#{minor}", 'arel_extensions')
       else
-        RubyDeprecator::new
+        RubyDeprecator.new
       end
   end
 
   module Warning
-    def deprecated msg, what: nil
+    def deprecated(msg, what: nil)
       kaller = caller(2..2).first
-      return if /lib\/(:?arel(?:_extensions)?|active_record)\// =~ kaller && ENV['AREL_EXTENSIONS_IN_TEST'] != '1'
+      return if %r{lib/(:?arel(?:_extensions)?|active_record)/} =~ kaller && ENV['AREL_EXTENSIONS_IN_TEST'] != '1'
 
       what = caller_locations(1, 1).first.label if what.nil?
       ArelExtensions.deprecator.warn "#{kaller}: `#{what}` is now deprecated. #{msg}"