arel_extensions 2.0.21 → 2.2.2

data/lib/arel_extensions/visitors/sqlite.rb

@@ -14,7 +14,7 @@ module ArelExtensions
       }.freeze
 
       NUMBER_COMMA_MAPPING = {
-        'fr_FR' => {',' => ' ', '.' =>','}
+        'fr_FR' => {',' => ' ', '.' => ','}
       }.freeze
 
       # String functions
@@ -31,27 +31,27 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_AiMatches o, collector
-          collector = visit o.left.ai_collate, collector
-          collector << ' LIKE '
-          collector = visit o.right.ai_collate, collector
-          if o.escape
-            collector << ' ESCAPE '
-            visit o.escape, collector
-          else
-            collector
-          end
+        collector = visit o.left.ai_collate, collector
+        collector << ' LIKE '
+        collector = visit o.right.ai_collate, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
       end
 
       def visit_ArelExtensions_Nodes_AiIMatches o, collector
-          collector = visit o.left.collate(true,true), collector
-          collector << ' LIKE '
-          collector = visit o.right.collate(true,true), collector
-          if o.escape
-            collector << ' ESCAPE '
-            visit o.escape, collector
-          else
-            collector
-          end
+        collector = visit o.left.collate(true, true), collector
+        collector << ' LIKE '
+        collector = visit o.right.collate(true, true), collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
       end
 
       def visit_ArelExtensions_Nodes_SMatches o, collector
@@ -94,11 +94,11 @@ module ArelExtensions
 
       # Date operations
       def visit_ArelExtensions_Nodes_DateAdd o, collector
-        collector << "date("
+        collector << 'date('
         collector = visit o.expressions.first, collector
         collector << COMMA
         collector = visit o.sqlite_value, collector
-        collector << ")"
+        collector << ')'
         collector
       end
 
@@ -110,28 +110,28 @@ module ArelExtensions
           collector << ") - strftime('%s', "
           collector = visit o.right, collector
         else
-          collector << "julianday("
+          collector << 'julianday('
           collector = visit o.left, collector
-          collector << ") - julianday("
+          collector << ') - julianday('
           collector = visit o.right, collector
         end
-        collector << ")"
+        collector << ')'
         collector
       end
 
       def visit_ArelExtensions_Nodes_Duration o, collector
         collector << "strftime('#{DATE_MAPPING[o.left]}'#{COMMA}"
         collector = visit o.right, collector
-        collector << ")"
+        collector << ')'
         collector
       end
 
       def visit_ArelExtensions_Nodes_Locate o, collector
-        collector << "instr("
+        collector << 'instr('
         collector = visit o.expr, collector
         collector << COMMA
         collector = visit o.right, collector
-        collector << ")"
+        collector << ')'
         collector
       end
 
@@ -141,17 +141,17 @@ module ArelExtensions
           collector = visit arg, collector
           collector << ' || ' unless i == o.expressions.length - 1
         }
-        collector << ")"
+        collector << ')'
         collector
       end
 
       def visit_ArelExtensions_Nodes_Substring o, collector
-        collector << "SUBSTR("
+        collector << 'SUBSTR('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
           collector = visit arg, collector
         }
-        collector << ")"
+        collector << ')'
         collector
       end
 
@@ -162,32 +162,32 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_IsNotNull o, collector
-          collector = visit o.expr, collector
+        collector = visit o.expr, collector
           collector << ' IS NOT NULL'
           collector
       end
 
       def visit_ArelExtensions_Nodes_Rand o, collector
-        collector << "RANDOM("
+        collector << 'RANDOM('
         if o.left != nil && o.right != nil
           collector = visit o.left, collector
           collector << COMMA
           collector = visit o.right, collector
         end
-        collector << ")"
+        collector << ')'
         collector
       end
 
       def visit_Arel_Nodes_Regexp o, collector
         collector = visit o.left, collector
-        collector << " REGEXP"
+        collector << ' REGEXP'
         collector = visit o.right, collector
         collector
       end
 
       def visit_Arel_Nodes_NotRegexp o, collector
         collector = visit o.left, collector
-        collector << " NOT REGEXP "
+        collector << ' NOT REGEXP '
         collector = visit o.right, collector
         collector
       end
@@ -195,7 +195,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Wday o, collector
         collector << "STRFTIME('%w',"
         collector = visit o.date, collector
-        collector << ")"
+        collector << ')'
         collector
       end
 
@@ -208,32 +208,32 @@ module ArelExtensions
       #   AS FLOAT
       # )
       def visit_ArelExtensions_Nodes_Floor o, collector
-        collector << "CAST(CASE WHEN "
+        collector << 'CAST(CASE WHEN '
         collector = visit o.left, collector
-        collector << " >= 0 THEN CAST("
+        collector << ' >= 0 THEN CAST('
         collector = visit o.left, collector
-        collector << " AS INT) WHEN CAST("
+        collector << ' AS INT) WHEN CAST('
         collector = visit o.left, collector
-        collector << " AS INT) = "
+        collector << ' AS INT) = '
         collector = visit o.left, collector
-        collector << " THEN CAST("
+        collector << ' THEN CAST('
         collector = visit o.left, collector
-        collector << " AS INT) ELSE CAST(("
+        collector << ' AS INT) ELSE CAST(('
         collector = visit o.left, collector
-        collector << " - 1.0) AS INT) END AS FLOAT)"
+        collector << ' - 1.0) AS INT) END AS FLOAT)'
         collector
       end
 
       def visit_ArelExtensions_Nodes_Ceil o, collector
-        collector << "CASE WHEN ROUND("
+        collector << 'CASE WHEN ROUND('
         collector = visit o.left, collector
-        collector << ", 1) > ROUND("
+        collector << ', 1) > ROUND('
         collector = visit o.left, collector
-        collector << ") THEN ROUND("
+        collector << ') THEN ROUND('
         collector = visit o.left, collector
-        collector << ") + 1 ELSE ROUND("
+        collector << ') + 1 ELSE ROUND('
         collector = visit o.left, collector
-        collector << ") END"
+        collector << ') END'
         collector
       end
 
@@ -243,16 +243,16 @@ module ArelExtensions
             collector << 'SELECT '
             len = row.length - 1
             row.zip(o.cols).each_with_index { |(value, attr), i|
-                case value
-                when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
-                  collector = visit value.as(attr.name), collector
-                else
-                  collector << quote(value, attr && column_for(attr)).to_s
-                  if idx == 0
-                    collector << " AS "
-                    collector << quote(attr.name)
-                  end
+              case value
+              when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
+                collector = visit value.as(attr.name), collector
+              else
+                collector << quote(value, attr && column_for(attr)).to_s
+                if idx == 0
+                  collector << ' AS '
+                  collector << quote(attr.name)
                 end
+              end
                 collector << COMMA unless i == len
             }
             collector << ' UNION ALL ' unless idx == o.left.length - 1
@@ -265,22 +265,22 @@ module ArelExtensions
             collector << 'SELECT '
             len = row.length - 1
             row.zip(o.cols).each_with_index { |(value, attr), i|
-                case value
-                when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
-                  collector = visit value.as(attr.name), collector
-                when Integer
-                  collector <<  value.to_s
-                  if idx == 0
-                    collector << " AS "
-                    collector << quote(attr.name)
-                  end
-                else
-                  collector << (attr && attr.able_to_type_cast? ? quote(attr.type_cast_for_database(value)) : quote(value).to_s)
-                  if idx == 0
-                    collector << " AS "
-                    collector << quote(attr.name)
-                  end
+              case value
+              when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
+                collector = visit value.as(attr.name), collector
+              when Integer
+                collector << value.to_s
+                if idx == 0
+                  collector << ' AS '
+                  collector << quote(attr.name)
+                end
+              else
+                collector << (attr && attr.able_to_type_cast? ? quote(attr.type_cast_for_database(value)) : quote(value).to_s)
+                if idx == 0
+                  collector << ' AS '
+                  collector << quote(attr.name)
                 end
+              end
                 collector << COMMA unless i == len
             }
             collector << ' UNION ALL ' unless idx == o.left.length - 1
@@ -296,7 +296,7 @@ module ArelExtensions
           else
             visit o.left, collector
           end
-        collector << " UNION "
+        collector << ' UNION '
         collector =
           if o.right.is_a?(Arel::SelectManager)
             visit o.right.ast, collector
@@ -313,7 +313,7 @@ module ArelExtensions
           else
             visit o.left, collector
           end
-        collector << " UNION ALL "
+        collector << ' UNION ALL '
         collector =
           if o.right.is_a?(Arel::SelectManager)
             visit o.right.ast, collector
@@ -325,23 +325,23 @@ 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::Table.engine.connection.schema_cache.columns_hash(element.relation.table_name)[element.name.to_s]
+          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
 
       remove_method(:visit_Arel_Nodes_GreaterThanOrEqual) rescue nil
       def visit_Arel_Nodes_GreaterThanOrEqual o, collector
         collector = visit get_time_converted(o.left), collector
-        collector << " >= "
+        collector << ' >= '
         collector = visit get_time_converted(o.right), collector
         collector
       end
@@ -349,7 +349,7 @@ module ArelExtensions
       remove_method(:visit_Arel_Nodes_GreaterThan) rescue nil
       def visit_Arel_Nodes_GreaterThan o, collector
         collector = visit get_time_converted(o.left), collector
-        collector << " > "
+        collector << ' > '
         collector = visit get_time_converted(o.right), collector
         collector
       end
@@ -357,7 +357,7 @@ module ArelExtensions
       remove_method(:visit_Arel_Nodes_LessThanOrEqual) rescue nil
       def visit_Arel_Nodes_LessThanOrEqual o, collector
         collector = visit get_time_converted(o.left), collector
-        collector << " <= "
+        collector << ' <= '
         collector = visit get_time_converted(o.right), collector
         collector
       end
@@ -365,7 +365,7 @@ module ArelExtensions
       remove_method(:visit_Arel_Nodes_LessThan) rescue nil
       def visit_Arel_Nodes_LessThan o, collector
         collector = visit get_time_converted(o.left), collector
-        collector << " < "
+        collector << ' < '
         collector = visit get_time_converted(o.right), collector
         collector
       end
@@ -379,17 +379,18 @@ module ArelExtensions
         else
           collector = visit o.left, collector
         end
-        collector << " AS \""
+        sep = o.right.size > 1 && o.right[0] == '"' && o.right[-1] == '"' ? '' : '"'
+        collector << " AS #{sep}"
         collector = visit o.right, collector
-        collector << "\""
+        collector << "#{sep}"
         collector
       end
 
       def visit_ArelExtensions_Nodes_FormattedNumber o, collector
-        format = Arel::Nodes::NamedFunction.new('printf',[Arel::Nodes.build_quoted(o.original_string),o.left])
+        format = Arel::Nodes::NamedFunction.new('printf', [Arel.quoted(o.original_string), o.left])
         locale_map = NUMBER_COMMA_MAPPING[o.locale]
         if locale_map
-          format = format.replace(',',locale_map[',']).replace('.',locale_map['.'])
+          format = format.replace(',', locale_map[',']).replace('.', locale_map['.'])
         end
         visit format, collector
         collector