arel_extensions 1.2.12 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61fb95aac9f849a376b1a3bd64463f73493d81b0e0bd6d5c4cca7bbc5f2a6118
-  data.tar.gz: 25a3276b6c4b5d75ab0096abeffe566908e8fa705e971b374f9ed02bab750fb8
+  metadata.gz: 63535bd97d5c08485672454464e4fd96413ba4f5e7660dd45f008b113f6c92ef
+  data.tar.gz: 1478ed16cc0a12b70198334394a456c43a33a480ab9d52786a1be75f11016d4a
 SHA512:
-  metadata.gz: 66d7b78543425c7428470c3c004b679b8c79264e37f4e00ab359b144f066d64a0b98904db4ce02ba54084e4a798469f27723e9a5c1705e13b1f4bdcda157e8b2
-  data.tar.gz: baf1f9313562c71596cc7c507fadcb0a87ec77afb40ec5ef0ba51e2880359702e06c04124ae696e9b9defb92445f5bebe134c91d295b9e346651fbdecf9581f7
+  metadata.gz: 0c862b43fb3b4f5758fa2454888bd5abbea6dc802cfb401ba5866fc9c3ce05de6aafb5db151b3a85ac63617fba2f773bb5230c5f0a2f4781a8c07ee521e70783
+  data.tar.gz: 1114bf913a0e79a0ebf1a9c28c995e3eb428147615bc51861c55de322e0dc3c5968949dce4cf432c525e470fbfa9d49a6d3a371ccdf69fe602a8f2db608c1834

data/.travis.yml

@@ -129,6 +129,8 @@ matrix:
     jdk: openjdk11
   - rvm: 2.7.1
     gemfile: gemfiles/rails4.gemfile
+  - rvm : jruby-9.0.5.0
+    gemfile: gemfiles/rails4.gemfile
   - rvm : jruby-9.2.11.1
     gemfile: gemfiles/rails4.gemfile
   - rvm: 2.0.0

data/lib/arel_extensions.rb

@@ -36,7 +36,7 @@ class Arel::Nodes::Function
   include Arel::Expressions
 end
 
-if Arel::VERSION >= "7.1.0"
+if Gem::Version.new(Arel::VERSION) >= Gem::Version.new("7.1.0")
   class Arel::Nodes::Case
     include Arel::Math
     include Arel::Expressions
@@ -183,3 +183,14 @@ class Arel::Table
     name.blank? ? self : Arel::Nodes::TableAlias.new(self,name)
   end
 end
+
+class Arel::Nodes::TableAlias
+  def method_missing(*args)
+    met = args.shift.to_sym
+    if self.relation.respond_to?(met)
+      self.relation.send(met,args)
+    else
+      super(met,*args)
+    end
+  end
+end

data/lib/arel_extensions/boolean_functions.rb

@@ -63,8 +63,28 @@ class Arel::Nodes::Or
     @children = children
   end
 
+  def initialize_copy(other)
+    super
+    @children = other.children.copy if other.children
+  end
+
+
+  def left
+    children.first
+  end
+
+  def right
+    children[1]
+  end
+
   def hash
     children.hash
   end
 
+  def eql?(other)
+    self.class == other.class &&
+      children == other.children
+  end
+  alias :== :eql?
+
 end

data/lib/arel_extensions/common_sql_functions.rb

@@ -12,7 +12,7 @@ module ArelExtensions
           db.enable_load_extension(0)
         rescue => e
           $load_extension_disabled = true
-          puts "can not load extensions #{e.inspect}"
+          puts "cannot load extensions #{e.inspect}"
         end
       end
     end
@@ -44,7 +44,7 @@ module ArelExtensions
         begin
           add_sqlite_functions
         rescue => e
-          puts "can not add sqlite functions #{e.inspect}"
+          puts "cannot add sqlite functions #{e.inspect}"
         end
       end
       if File.exist?("init/#{env_db}.sql")

data/lib/arel_extensions/nodes/case.rb

@@ -1,7 +1,11 @@
 module ArelExtensions
   module Nodes
-    if Arel::VERSION < "7.1.0"
+    if Gem::Version.new(Arel::VERSION) < Gem::Version.new("7.1.0")
       class Case < Arel::Nodes::Node
+        include Arel::Expressions
+        include Arel::Math
+        include Arel::Predications
+        include Arel::OrderPredications
         attr_accessor :case, :conditions, :default
 
         def initialize expression = nil, default = nil
@@ -28,6 +32,8 @@ module ArelExtensions
 
     class ArelExtensions::Nodes::Case
       include Arel::Expressions
+      include Arel::Math
+      include Arel::Predications
       include Arel::OrderPredications
       include ArelExtensions::Math
       include ArelExtensions::Comparators

data/lib/arel_extensions/nodes/cast.rb

@@ -14,7 +14,10 @@ module ArelExtensions
           @return_type = :decimal
         when :number
           @return_type = :number
-        when 'char', 'varchar', 'text', 'nchar', 'nvarchar', 'ntext'
+        when 'char', 'varchar', 'nchar', 'nvarchar'
+          @return_type = :string
+        when 'text', :text, 'ntext', :ntext
+          @as_attr = expr[1].to_sym
           @return_type = :string
         when :datetime, 'datetime','smalldatetime'
           @return_type = :datetime

data/lib/arel_extensions/nodes/date_diff.rb

@@ -157,11 +157,11 @@ module ArelExtensions
         when Integer
           object.days
         when DateTime, Time, Date
-          raise(ArgumentError, "#{object.class} can not be converted to Integer")
+          raise(ArgumentError, "#{object.class} cannot be converted to Integer")
         when String
           Arel::Nodes.build_quoted(object)
         else
-          raise(ArgumentError, "#{object.class} can not be converted to Integer")
+          raise(ArgumentError, "#{object.class} cannot be converted to Integer")
         end
       end
     end
@@ -183,7 +183,7 @@ module ArelExtensions
           if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === object
             object.to_i
           else
-            raise(ArgumentError, "#{object.class} can not be converted to Number")
+            raise(ArgumentError, "#{object.class} cannot be converted to Number")
           end
         end
       end

data/lib/arel_extensions/nodes/format.rb

@@ -1,3 +1,5 @@
+require 'strscan'
+
 module ArelExtensions
   module Nodes
     class Format < Function
@@ -6,10 +8,33 @@ module ArelExtensions
       attr_accessor :col_type, :iso_format
       def initialize expr
         col = expr.first
-        @iso_format = expr[1]
+        @iso_format = convert_format(expr[1])
         @col_type = type_of_attribute(col)
         super [col, convert_to_string_node(@iso_format)]
       end
+
+      private
+
+      # Address portability issues with some of the formats.
+      def convert_format(fmt)
+        s = StringScanner.new fmt
+        res = StringIO.new
+        while !s.eos?
+          res <<
+            case
+            when s.scan(/%D/)    then '%m/%d/%y'
+            when s.scan(/%F/)    then '%Y-%m-%d'
+            when s.scan(/%R/)    then '%H:%M'
+            when s.scan(/%r/)    then '%I:%M:%S %p'
+            when s.scan(/%T/)    then '%H:%M:%S'
+            when s.scan(/%v/)    then '%e-%b-%Y'
+
+            when s.scan(/[^%]+/) then s.matched
+            when s.scan(/./)     then s.matched
+            end
+        end
+        res.string
+      end
     end
   end
 end

data/lib/arel_extensions/nodes/function.rb

@@ -10,6 +10,10 @@ module ArelExtensions
 
       RETURN_TYPE = :string # by default...
 
+      # Support multibyte string if they are available.
+      MBSTRING =
+        defined?(ActiveSupport::Multibyte::Chars) ? ActiveSupport::Multibyte::Chars : String
+
       # overrides as to make new Node like AliasPredication
 
       def return_type
@@ -63,7 +67,7 @@ module ArelExtensions
           Arel::Nodes.build_quoted(object, self)
         when Time
           Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
-        when String, Symbol
+        when MBSTRING, String, Symbol
           Arel::Nodes.build_quoted(object.to_s)
         when Date
           Arel::Nodes.build_quoted(object.to_s, self)
@@ -74,7 +78,7 @@ module ArelExtensions
         when Array
           Arel::Nodes::Grouping.new(object.map{|r| convert_to_node(e)})
         else
-          raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
+          raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
         end
       end
 
@@ -97,8 +101,8 @@ module ArelExtensions
           Arel::Nodes.build_quoted(object, self)
         when Time
           Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
-        when String
-          Arel::Nodes.build_quoted(object)
+        when MBSTRING, String
+          Arel::Nodes.build_quoted(object.to_s)
         when Date
           Arel::Nodes.build_quoted(object, self)
         when NilClass
@@ -106,7 +110,7 @@ module ArelExtensions
         when ActiveSupport::Duration
           Arel::Nodes.build_quoted(object.to_i.to_s)
         else
-          raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
+          raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
         end
       end
 
@@ -116,12 +120,12 @@ module ArelExtensions
           object
         when DateTime, Time
           Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
-        when String
-          Arel::Nodes.build_quoted(Date.parse(object), self)
+        when MBSTRING, String
+          Arel::Nodes.build_quoted(Date.parse(object.to_s), self)
         when Date
           Arel::Nodes.build_quoted(object, self)
         else
-          raise(ArgumentError, "#{object.class} can not be converted to Date")
+          raise(ArgumentError, "#{object.class} cannot be converted to Date")
         end
       end
 
@@ -131,12 +135,12 @@ module ArelExtensions
           object
         when DateTime, Time
           Arel::Nodes.build_quoted(object, self)
-        when String
-          Arel::Nodes.build_quoted(Time.parse(object), self)
+        when MBSTRING, String
+          Arel::Nodes.build_quoted(Time.parse(object.to_s), self)
         when Date
           Arel::Nodes.build_quoted(Time.utc(object.year, object.month, object.day, 0, 0, 0), self)
         else
-          raise(ArgumentError, "#{object.class} can not be converted to Datetime")
+          raise(ArgumentError, "#{object.class} cannot be converted to Datetime")
         end
       end
 
@@ -154,7 +158,7 @@ module ArelExtensions
         when NilClass
           0
         else
-          raise(ArgumentError, "#{object.class} can not be converted to NUMBER arg")
+          raise(ArgumentError, "#{object.class} cannot be converted to NUMBER arg")
         end
       end
 

data/lib/arel_extensions/nodes/json.rb

@@ -26,6 +26,44 @@ module ArelExtensions
         [@dict].hash
       end
 
+      def convert_to_json_node(n)
+        case n
+        when JsonNode
+          n.dict
+        when Array
+          n.map{|e|
+             (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_json_node(e)
+          }
+        when Hash
+          n.reduce({}){|acc,v|
+            acc[convert_to_json_node(v[0])] = (v[1].is_a?(Array) || v[1].is_a?(Hash)) ? Json.new(v[1]) : convert_to_json_node(v[1])
+            acc
+          }
+        when String, Numeric, TrueClass, FalseClass
+          convert_to_node(n)
+        when Date
+          convert_to_node(n.strftime("%Y-%m-%d"))
+        when DateTime, Time
+          convert_to_node(n.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+        when NilClass
+          Arel.sql('null')
+        else
+          convert_to_node(n)
+        end
+      end
+
+      def type_of_node(v)
+        if v.is_a?(Arel::Attributes::Attribute)
+          self.type_of_attribute(v)
+        elsif v.respond_to?(:return_type)
+          v.return_type
+        elsif v.nil?
+          :nil
+        else
+          :string
+        end
+      end
+
     end
 
     class Json < JsonNode
@@ -33,32 +71,9 @@ module ArelExtensions
       def initialize *expr
         @dict =
           if expr.length == 1
-            case exp = expr.first
-            when JsonNode
-              exp.dict
-            when Array
-              exp.map{|e|
-                (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e)
-              }
-            when Hash
-              exp.reduce({}){|acc,v|
-                acc[convert_to_node(v[0])] = (v[1].is_a?(Array) || v[1].is_a?(Hash)) ? Json.new(v[1]) : convert_to_node(v[1])
-                acc
-              }
-            when String, Numeric, TrueClass, FalseClass
-              convert_to_node(exp)
-            when NilClass
-              Arel.sql('null')
-            else
-              if (exp.is_a?(Arel::Attributes::Attribute) && type_of_attribute(exp) == :string) \
-                 || (exp.return_type == :string)
-                convert_to_node(exp)
-              else
-                [convert_to_node(exp)]
-              end
-            end
+            convert_to_json_node(expr.first)
           else
-            expr.map{|e| (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e) }
+            expr.map{|e| convert_to_json_node(e) }
           end
         super
       end

data/lib/arel_extensions/predications.rb

@@ -26,7 +26,7 @@ module ArelExtensions
       case other
       when Range
         self.between(other)
-      when Arel::Nodes::Grouping
+      when Arel::Nodes::Grouping, ArelExtensions::Nodes::Union, ArelExtensions::Nodes::UnionAll
         Arel::Nodes::In.new(self, quoted_node(other))
       when Enumerable
         nils, values   = other.partition{ |v| v.nil? }
@@ -54,7 +54,7 @@ module ArelExtensions
       case other
       when Range
         Arel::Nodes::Not.new(self.between(other))
-      when Arel::Nodes::Grouping
+      when Arel::Nodes::Grouping, ArelExtensions::Nodes::Union, ArelExtensions::Nodes::UnionAll
         Arel::Nodes::NotIn.new(self, quoted_node(other))
       when Enumerable
         nils, values   = other.partition{ |v| v.nil? }
@@ -94,7 +94,7 @@ module ArelExtensions
       when ActiveSupport::Duration
         object.to_i
       else
-        raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
+        raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
       end
     end
   end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.12".freeze
+  VERSION = "1.2.17".freeze
 end

data/lib/arel_extensions/visitors/mysql.rb

@@ -447,9 +447,9 @@ module ArelExtensions
         collector
       end
 
-      # JSON if implemented only after 10.2.3 in MariaDb and 5.7 in MySql
+      # JSON if implemented only after 10.2.3 (aggregations after 10.5.0) in MariaDb and 5.7 (aggregations after 5.7.22) in MySql
       def json_supported?
-        version_supported?('10.2.3', '5.7.0')
+        version_supported?('10.5.0', '5.7.22')
       end
 
       def window_supported?

data/lib/arel_extensions/visitors/oracle.rb

@@ -257,6 +257,16 @@ module ArelExtensions
           collector = visit o.left, collector
           collector << ")"
           return collector
+        when :text
+          collector << "TO_CLOB("
+          collector = visit o.left, collector
+          collector << ")"
+          return collector
+        when :ntext
+          collector << "TO_NCLOB("
+          collector = visit o.left, collector
+          collector << ")"
+          return collector
         when :time
           if (o.left.respond_to?(:return_type) && o.left.return_type == :string) || o.left.is_a?(Arel::Nodes::Quoted)
             collector << "TO_DATE("

data/lib/arel_extensions/visitors/postgresql.rb

@@ -350,6 +350,8 @@ module ArelExtensions
         as_attr = case o.as_attr
         when :string
           Arel::Nodes::SqlLiteral.new('varchar')
+        when :text, :ntext
+          Arel::Nodes::SqlLiteral.new('text')
         when :time
           Arel::Nodes::SqlLiteral.new('time')
         when :int

data/lib/arel_extensions/visitors/sqlite.rb

@@ -364,16 +364,6 @@ module ArelExtensions
         collector
       end
 
-
-      alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
-      def visit_Arel_Nodes_SelectStatement o, collector
-        if !collector.value.blank? && o.limit.blank?
-          o = o.dup
-          o.orders = []
-        end
-        old_visit_Arel_Nodes_SelectStatement(o,collector)
-      end
-
       alias_method :old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As
       def visit_Arel_Nodes_As o, collector
         if o.left.is_a?(Arel::Nodes::Binary)

data/lib/arel_extensions/visitors/to_sql.rb

@@ -295,6 +295,8 @@ module ArelExtensions
           as_attr = Arel::Nodes::SqlLiteral.new('time')
         when :binary
           as_attr = Arel::Nodes::SqlLiteral.new('binary')
+        when :text, :ntext
+          as_attr = Arel::Nodes::SqlLiteral.new('text')
         else
           as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
         end
@@ -585,6 +587,26 @@ module ArelExtensions
         collector
       end
 
+      def json_value(o,v)
+        case o.type_of_node(v)
+        when :string
+          Arel.when(v.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + v.replace('\\','\\\\').replace('"','\"') + '"')
+        when :date
+          s = v.format('%Y-%m-%d')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :datetime
+          s = v.format('%Y-%m-%dT%H:%M:%S')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :time
+          s = v.format('%H:%M:%S')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :nil
+          Arel::Nodes.build_quoted("null")
+        else
+          ArelExtensions::Nodes::Cast.new([v, :string]).coalesce("null")
+        end
+      end
+
       def visit_ArelExtensions_Nodes_Json o,collector
         case o.dict
         when Array
@@ -593,11 +615,7 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.return_type == :string)
-              res = res + '"' + v + '"'
-            else
-              res += v
-            end
+            res += json_value(o,v)
           end
           res += ']'
           collector = visit res, collector
@@ -607,12 +625,8 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            res += Arel::Nodes.build_quoted('"')+k + '": '
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.respond_to?(:return_type) && v.return_type == :string)
-              res = res + '"' + v + '"'
-            else
-              res += v
-            end
+            res += Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            res += json_value(o,v)
           end
           res += '}'
           collector = visit res, collector
@@ -624,7 +638,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_JsonGroup o, collector
         if o.as_array
-          res = Arel::Nodes.build_quoted('[') + (o.orders ? o.dict.group_concat(', ',o.orders) : o.dict.group_concat(', ')) + ']'
+          res = Arel::Nodes.build_quoted('[') + (o.orders ? o.dict.group_concat(', ', order: Array(o.orders)) : o.dict.group_concat(', ')).coalesce('') + ']'
           collector = visit res, collector
         else
           res = Arel::Nodes.build_quoted('{')
@@ -633,13 +647,9 @@ module ArelExtensions
             if i != 0
               res = res + ', '
             end
-            kv = Arel::Nodes.build_quoted('"')+k + '": '
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.respond_to?(:return_type) && v.return_type == :string)
-              kv = kv + '"' + v + '"'
-            else
-              kv += v
-            end
-            res = res + kv.group_concat(', ',orders)
+            kv = Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            kv += json_value(o,v)
+            res = res + kv.group_concat(', ', order: Array(orders)).coalesce('')
           end
           res = res + '}'
           collector = visit res, collector

data/test/real_db_test.rb

@@ -21,7 +21,7 @@ def setup_db
         db.enable_load_extension(0)
       rescue => e
         $load_extension_disabled = true
-        $stderr << "can not load extensions #{e.inspect}\n"
+        $stderr << "cannot load extensions #{e.inspect}\n"
       end
     end
     #function find_in_set

data/test/visitors/test_to_sql.rb

@@ -463,6 +463,13 @@ module ArelExtensions
           .must_be_like %{(LOCATE('test', "users"."name") + 1) ASC}
       end
 
+      it "should be possible to call Table function on TableAlias" do
+        t = @table
+        a = t.alias("aliased_users")
+        _(compile(a.join(t).join_sources))
+            .must_be_like %{INNER JOIN \"users\"}
+      end
+
       describe "logical functions" do
 
         it "should know about truth" do

data/test/with_ar/all_agnostic_test.rb

@@ -356,6 +356,7 @@ module ArelExtensions
         assert_equal '2016-05-23', t(@lucas, @created_at.format('%Y-%m-%d'))
         skip "SQL Server does not accept any format" if @env_db == 'mssql'
         assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S'))
+        assert_equal '12:42%', t(@lucas, @updated_at.format('%R%%'))
       end
 
       def test_coalesce
@@ -581,6 +582,7 @@ module ArelExtensions
       # Case clause
       def test_case
         assert_equal 4, User.find_by_sql(@ut.project(@score.when(20.16).then(1).else(0).as('score_bin')).to_sql).sum(&:score_bin)
+        assert_equal 4, User.where(@score.when(20.16).then(1).else(0).eq(1)).count
         assert_equal 2, t(@arthur, @score.when(65.62,1).else(0)+1)
         assert_equal 0, t(@arthur, @score.when(65.62,1).else(0)-1)
         assert_equal "11", t(@arthur, @score.when(65.62).then("1").else("0")+"1")

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.12".freeze
+  VERSION = "1.2.17".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.8".freeze
+  VERSION = "2.0.13".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.17
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel