arel_extensions 2.0.22 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57188b98a348ea5dd72994ef0edb94cb386104cbd50d863b3cc465bb81499f8f
-  data.tar.gz: 7235c655967c8058e24f85f96b1a3ea93803dc759906ea24aff360edf28ee6fb
+  metadata.gz: bbeb1b141db51f78567bf26939ecb75832dd1c3e524407bf11a56308d8da6d14
+  data.tar.gz: 543d1893d29e871ebfa9ccdc8e49179cbedf49cd5ccf6b082113925bedffbc81
 SHA512:
-  metadata.gz: c60be09bdf31efe2b4a953c0b097bbc461d01a4d7005c1dc190af20efb12e659d2331e16d8ca47527b9757b89a2528069fa1a8a94cfd52bc80000633995b229f
-  data.tar.gz: b028042975ab07e0d28e919278c36f2652fae79dbced3776e16519f4fdfaaf45de32a0a375cb7e77d5157775d2a3ef8555f9096299b2c71f366367e6452a93a6
+  metadata.gz: e4957e64d63412917884f8cc79b42b81643a7e512f4a0e0ef2331672f34cf625b1cec88dbefdf3e3c65d8fca63e2258dc0ff56d8e96964a392c12a89657756c9
+  data.tar.gz: 2d090ca797080248a3a44521cdae686e721e627c787fa971e340c2b9dc08b91e51992fd47265aad6ccf0bee2d73c8a2e72ad5681fe09844008f5e21577a2d8ce

data/arel_extensions.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency('activerecord', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
-  s.add_development_dependency('rdoc', '~> 4.0')
+  s.add_development_dependency('rdoc', '>= 6.3.1')
   s.add_development_dependency('rake', '~> 12.3.3')
 end

data/gemspecs/arel_extensions-v1.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency('arel', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
-  s.add_development_dependency('rdoc', '~> 4.0')
+  s.add_development_dependency('rdoc', '>= 6.3.1')
   s.add_development_dependency('rake', '~> 12.3.3')
 end

data/gemspecs/arel_extensions-v2.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency('activerecord', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
-  s.add_development_dependency('rdoc', '~> 4.0')
+  s.add_development_dependency('rdoc', '>= 6.3.1')
   s.add_development_dependency('rake', '~> 12.3.3')
 end

data/lib/arel_extensions/insert_manager.rb

@@ -3,23 +3,25 @@ require 'arel'
 module ArelExtensions
   module InsertManager
     def bulk_insert(cols, data)
-    res_columns = []
-    case cols.first
-    when String, Symbol
-      cols.each { |c|
-        res_columns << @ast.relation[c]
-      }
-    when Array
-      if String === cols.first.first
-        res_columns = cols.map {|c| [@ast.relation[c.first]] }
-      elsif Arel::Attributes::Attribute == cols.first.first
-        res_columns = cols
-      end
-    when NilClass
-      res_columns = @ast.relation.columns
-    end
-    self.values = BulkValues.new(res_columns, data)
-    @ast.columns = res_columns
+      raise ArgumentError, "cols must be present" if cols.blank?
+      columns =
+        case cols.first
+        when Array
+          case cols.first.first
+          when Arel::Attributes::Attribute
+            cols
+          when String, Symbol
+            cols.map {|c| [@ast.relation[c.first]] }
+          else
+            raise ArgumentError, "cols has an invalid type: #{cols.first.first.class}"
+          end
+        when String, Symbol
+          cols.map { |c| @ast.relation[c] }
+        else
+          raise ArgumentError, "cols has an invalid type: #{cols.first.class}"
+        end
+      self.values = BulkValues.new(columns, data)
+      @ast.columns = columns
     end
 
     class BulkValues < Arel::Nodes::Node

data/lib/arel_extensions/math.rb

@@ -22,21 +22,21 @@ module ArelExtensions
           if self.expr.left.is_a?(String) || self.expr.right.is_a?(String)
             return self.concat(other)
           else
-            return Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+            return Arel.grouping(Arel::Nodes::Addition.new self, other)
           end
         when ArelExtensions::Nodes::Function,ArelExtensions::Nodes::Case
           return case self.return_type
         when :string, :text
           self.concat(other)
         when :integer, :decimal, :float, :number, :int
-          Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+          Arel.grouping(Arel::Nodes::Addition.new self, other)
         when :date, :datetime
           ArelExtensions::Nodes::DateAdd.new [self, other]
         else
           self.concat(other)
         end
       when Arel::Nodes::Function
-        Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+        Arel.grouping(Arel::Nodes::Addition.new self, other)
       else
         begin
           col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
@@ -44,15 +44,15 @@ module ArelExtensions
           col = nil
         end
         if (!col) # if the column doesn't exist in the database
-          Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new(self, other))
+          Arel.grouping(Arel::Nodes::Addition.new(self, other))
         else
           arg = col.type
           if arg == :integer || (!arg)
             other = other.to_i if other.is_a?(String)
-            Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+            Arel.grouping(Arel::Nodes::Addition.new self, other)
           elsif arg == :decimal || arg == :float
             other = Arel.sql(other) if other.is_a?(String) # Arel should accept Float & BigDecimal!
-            Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+            Arel.grouping(Arel::Nodes::Addition.new self, other)
           elsif arg == :datetime || arg == :date
             ArelExtensions::Nodes::DateAdd.new [self, other]
           elsif arg == :string || arg == :text
@@ -68,23 +68,23 @@ module ArelExtensions
       case self
       when Arel::Nodes::Grouping
         if self.expr.left.is_a?(Date) || self.expr.left.is_a?(DateTime)
-          Arel::Nodes::Grouping.new(ArelExtensions::Nodes::DateSub.new [self, other])
+          Arel.grouping(ArelExtensions::Nodes::DateSub.new [self, other])
         else
-          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+          Arel.grouping(Arel::Nodes::Subtraction.new(self, other))
         end
       when ArelExtensions::Nodes::Function, ArelExtensions::Nodes::Case
         case self.return_type
         when :string, :text # ???
-          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other)) # ??
+          Arel.grouping(Arel::Nodes::Subtraction.new(self, other)) # ??
         when :integer, :decimal, :float, :number
-          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+          Arel.grouping(Arel::Nodes::Subtraction.new(self, other))
         when :date, :datetime
           ArelExtensions::Nodes::DateSub.new [self, other]
         else
-          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+          Arel.grouping(Arel::Nodes::Subtraction.new(self, other))
         end
       when Arel::Nodes::Function
-        Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+        Arel.grouping(Arel::Nodes::Subtraction.new(self, other))
       else
         begin
           col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
@@ -92,7 +92,7 @@ module ArelExtensions
           col = nil
         end
         if (!col) # if the column doesn't exist in the database
-          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+          Arel.grouping(Arel::Nodes::Subtraction.new(self, other))
         else
           arg = col.type
           if (arg == :date || arg == :datetime)
@@ -123,11 +123,11 @@ module ArelExtensions
           else
             case other
             when Integer, Float, BigDecimal
-              Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other.to_s)))
+              Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.sql(other.to_s)))
             when String
-              Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other)))
+              Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.sql(other)))
             else
-              Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+              Arel.grouping(Arel::Nodes::Subtraction.new(self, other))
             end
           end
         end

data/lib/arel_extensions/nodes/case.rb

@@ -104,6 +104,10 @@ module ArelExtensions
       def as other
         Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
       end
+
+      def xas other
+        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
+      end
     end
   end
 end

data/lib/arel_extensions/nodes/cast.rb

@@ -42,7 +42,7 @@ module ArelExtensions
         when :ruby_time
           ArelExtensions::Nodes::DateAdd.new [self, other]
         else
-          Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+          Arel.grouping(Arel::Nodes::Addition.new self, other)
         end
       end
 

data/lib/arel_extensions/nodes/function.rb

@@ -52,7 +52,9 @@ module ArelExtensions
         case att
         when Arel::Attributes::Attribute
           begin
-            Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
+            if Arel::Table.engine.connection.tables.include? att.relation.table_name 
+              Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
+            end
           rescue
             att
           end
@@ -80,7 +82,7 @@ module ArelExtensions
         when ActiveSupport::Duration
           Arel.sql(object.to_i)
         when Array
-          Arel::Nodes::Grouping.new(object.map{|e| convert_to_node(e)})
+          Arel.grouping(object.map{|e| convert_to_node(e)})
         else
           raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
         end

data/lib/arel_extensions/nodes/json.rb

@@ -46,7 +46,9 @@ module ArelExtensions
         when DateTime, Time
           convert_to_node(n.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
         when NilClass
-          Arel.sql('null')
+          Arel.null
+        when Arel::SelectManager
+          Arel.grouping(n)
         else
           convert_to_node(n)
         end

data/lib/arel_extensions/nodes/replace.rb

@@ -10,10 +10,6 @@ module ArelExtensions
         @substitute = convert_to_node(substitute)
         super([@left,@pattern,@substitute])
       end
-
-      def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
-      end
     end
 
     class RegexpReplace < Function
@@ -26,10 +22,6 @@ module ArelExtensions
         @substitute = convert_to_node(substitute)
         super([@left,@pattern,@substitute])
       end
-
-      def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
-      end
     end
   end
 end

data/lib/arel_extensions/nodes/union.rb

@@ -14,7 +14,7 @@ module ArelExtensions
       end
 
       def as other
-        Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
+        Arel::Nodes::TableAlias.new Arel.grouping(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
   end

data/lib/arel_extensions/nodes/union_all.rb

@@ -10,7 +10,7 @@ module ArelExtensions
       end
 
       def as other
-        Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
+        Arel::Nodes::TableAlias.new Arel.grouping(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
   end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.22".freeze
+  VERSION = "2.0.24".freeze
 end

data/lib/arel_extensions/visitors/postgresql.rb

@@ -373,6 +373,8 @@ module ArelExtensions
           Arel::Nodes::SqlLiteral.new('date')
         when :binary
           Arel::Nodes::SqlLiteral.new('binary')
+        when :jsonb
+          Arel::Nodes::SqlLiteral.new('jsonb')
         else
           Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
         end
@@ -401,13 +403,13 @@ module ArelExtensions
             ArelExtensions::Nodes::Concat.new([
                 Arel::Nodes::NamedFunction.new('TRIM',[
                   Arel::Nodes::NamedFunction.new('TO_CHAR',[
-                    col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor),
+                    Arel.when(col.not_eq 0).then(col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor)).else(1),
                     Arel::Nodes.build_quoted('FM'+nines_before+'"'+comma+'"V'+nines_after)
                   ])]),
                 o.type,
                 Arel::Nodes::NamedFunction.new('TRIM',[
                   Arel::Nodes::NamedFunction.new('TO_CHAR',[
-                    col.abs.log10.floor,
+                    Arel.when(col.not_eq 0).then(col.abs.log10.floor).else(0),
                     Arel::Nodes.build_quoted('FM'+nines_before)
                   ])])
               ])
@@ -511,8 +513,6 @@ module ArelExtensions
           collector << '::jsonb'
         when NilClass
           collector  << %Q['null'::jsonb]
-        when Arel::Attributes::Attribute
-          collector = visit o.dict.cast(:jsonb), collector
         else
           collector = visit o.dict, collector
           collector << '::jsonb'
@@ -532,7 +532,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_JsonGet o,collector
         collector = visit o.dict, collector
-        collector << ' -> '
+        collector << ' ->> '
         collector = visit o.key, collector
         collector
       end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -601,20 +601,20 @@ module ArelExtensions
       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(make_json_string(v))
+          Arel.when(v.is_null).then(Arel.null).else(make_json_string(v))
         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 + '"')
+          Arel.when(s.is_null).then(Arel.null).else(make_json_string(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 + '"')
+          Arel.when(s.is_null).then(Arel.null).else(make_json_string(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 + '"')
+          Arel.when(s.is_null).then(Arel.null).else(make_json_string(s))
         when :nil
-          Arel::Nodes.build_quoted("null")
+          Arel.null
         else
-          ArelExtensions::Nodes::Cast.new([v, :string]).coalesce("null")
+          ArelExtensions::Nodes::Cast.new([v, :string]).coalesce(Arel.null)
         end
       end
 

data/lib/arel_extensions/visitors.rb

@@ -9,9 +9,17 @@ if defined?(Arel::Visitors::Oracle)
   require 'arel_extensions/visitors/oracle12'
 end
 
-if defined?(Arel::Visitors::MSSQL)
+if defined?(Arel::Visitors::SQLServer) || defined?(Arel::Visitors::MSSQL)
   require 'arel_extensions/visitors/mssql'
+end
 
+if defined?(Arel::Visitors::SQLServer)
+  class Arel::Visitors::SQLServer
+    include ArelExtensions::Visitors::MSSQL
+  end
+end
+
+if defined?(Arel::Visitors::MSSQL)
   class Arel::Visitors::MSSQL
     include ArelExtensions::Visitors::MSSQL
 

data/lib/arel_extensions.rb

@@ -34,9 +34,9 @@ class Arel::Nodes::Grouping
 end
 
 class Arel::Nodes::Ordering
-	def eql? other
-		self.hash.eql? other.hash
-	end
+  def eql? other
+    self.hash.eql? other.hash
+  end
 end
 
 class Arel::Nodes::Function
@@ -88,11 +88,13 @@ module Arel
   end
 
   def self.json *expr
-    if expr.length == 1
-      ArelExtensions::Nodes::Json.new(expr.first)
-    else
-      ArelExtensions::Nodes::Json.new(expr)
-    end
+    ArelExtensions::Nodes::Json.new(
+      if expr.length == 1
+        expr.first
+      else
+        expr
+      end
+    )
   end
 
   def self.when condition
@@ -100,20 +102,31 @@ module Arel
   end
 
   def self.duration s, expr
-    ArelExtensions::Nodes::Duration.new(s.to_s+'i',expr)
+    ArelExtensions::Nodes::Duration.new("#{s}i", expr)
   end
 
+  def self.grouping *v
+    Arel::Nodes::Grouping.new(*v)
+  end
+
+  # The TRUE pseudo literal.
   def self.true
-    Arel::Nodes::Equality.new(1,1)
+    Arel::Nodes::Equality.new(1, 1)
   end
 
+  # The FALSE pseudo literal.
   def self.false
-    Arel::Nodes::Equality.new(1,0)
+    Arel::Nodes::Equality.new(1, 0)
+  end
+
+  # The NULL literal.
+  def self.null
+    Arel::Nodes.build_quoted(nil)
   end
 
   def self.tuple *v
-    tmp = Arel::Nodes::Grouping.new(nil)
-    Arel::Nodes::Grouping.new(v.map{|e| tmp.convert_to_node(e)})
+    tmp = Arel.grouping(nil)
+    Arel.grouping v.map{|e| tmp.convert_to_node(e)}
   end
 end
 
@@ -140,6 +153,11 @@ class Arel::Nodes::Function
     end
     res
   end
+
+  def xas other
+    Arel::Nodes::As.new(self, Arel.sql(other))
+  end
+
 end
 
 class Arel::Nodes::Grouping
@@ -189,6 +207,10 @@ end
 class Arel::SelectManager
   include ArelExtensions::SetFunctions
   include ArelExtensions::Nodes
+
+  def as table_name
+    Arel::Nodes::TableAlias.new(self, table_name)
+  end
 end
 
 class Arel::Nodes::As

data/test/visitors/test_to_sql.rb

@@ -289,7 +289,7 @@ module ArelExtensions
         _(compile((@table[:age] + 42).as('alias'))).must_be_like %{("users"."age" + 42) AS alias}
         _(compile(@table[:name].coalesce('').as('alias'))).must_be_like %{COALESCE("users"."name", '') AS alias}
         _(compile(Arel::Nodes.build_quoted('test').as('alias'))).must_be_like %{'test' AS alias}
-        _(compile(@table.project(@table[:name]).as('alias'))).must_be_like %{(SELECT "users"."name" FROM "users") alias}
+        _(compile(@table.project(@table[:name]).as('alias'))).must_be_like %{(SELECT "users"."name" FROM "users") "alias"}
         _(compile(@table[:name].when("smith").then("cool").else("uncool").as('alias')))
           .must_be_like %{CASE "users"."name" WHEN 'smith' THEN 'cool' ELSE 'uncool' END AS alias}
       end
@@ -373,7 +373,7 @@ module ArelExtensions
         end
 
         it "should respecting Grouping" do
-          g = ->(*v) { Arel::Nodes::Grouping.new(v) }
+          g = ->(*v) { Arel.grouping(v) }
           _(compile(g[@table[:id], @table[:age]].in [g[1, 42]]))
             .must_be_like %{("users"."id", "users"."age") IN ((1, 42))}
           _(compile(g[@table[:id], @table[:age]].in [g[1, 42], g[2, 51]]))

data/test/with_ar/all_agnostic_test.rb

@@ -358,7 +358,6 @@ module ArelExtensions
 
       def test_format
         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

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.25".freeze
+  VERSION = "1.2.27".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.22".freeze
+  VERSION = "2.0.24".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.24
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,16 +44,16 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 6.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 6.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Extending Arel