arel_extensions 2.0.22 → 2.1.1

data/gemfiles/rails6.gemfile

@@ -8,23 +8,22 @@ group :development, :test do
   gem 'activemodel', '~> 6.0.0'
   gem 'activerecord', '~> 6.0.0'
 
-  gem "sqlite3", '~> 1.4', platforms: [:mri, :mswin, :mingw]
-  gem "mysql2", '0.5.2', platforms: [:mri, :mswin, :mingw]
-  gem "pg",'< 1.0.0', platforms: [:mri, :mingw]
+  gem "sqlite3", '~> 1.4', platforms: [:mri]
+  gem "mysql2", '0.5.2', platforms: [:mri]
+  gem "pg",'< 1.0.0', platforms: [:mri]
 
-  #gem "tiny_tds", platforms: [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
-  #gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
+  gem "tiny_tds", platforms: [:mri, :mingw, :x64_mingw, :mswin]
+  gem "activerecord-sqlserver-adapter", '~> 6.0', platforms: [:mri, :mingw, :x64_mingw, :mswin]
 
   gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'activerecord-jdbc-adapter', platforms: :jruby
+  gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter', tag: 'v60.4', platforms: :jruby
   gem "jdbc-sqlite3", platforms: :jruby
   gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
   gem "activerecord-jdbcmysql-adapter", platforms: :jruby
   gem "activerecord-jdbcpostgresql-adapter", platforms: :jruby
-  gem "activerecord-jdbcmssql-adapter", platforms: :jruby
 end
 
-gemspec path: "../"
+gemspec path: "../"

data/gemfiles/rails6_1.gemfile

@@ -8,23 +8,22 @@ group :development, :test do
   gem 'activemodel', '~> 6.1.0'
   gem 'activerecord', '~> 6.1.0'
 
-  gem "sqlite3", '~> 1.4', platforms: [:mri, :mswin, :mingw]
-  gem "mysql2", '0.5.2', platforms: [:mri, :mswin, :mingw]
-  gem "pg",'~> 1.1', platforms: [:mri, :mingw]
+  gem "sqlite3", '~> 1.4', platforms: [:mri]
+  gem "mysql2", '0.5.2', platforms: [:mri]
+  gem "pg",'~> 1.1', platforms: [:mri]
 
-  #gem "tiny_tds", platforms: [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
-  #gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
+  gem "tiny_tds", platforms: [:mri, :mingw, :x64_mingw, :mswin]
+  gem "activerecord-sqlserver-adapter", '~> 6.1.0', platforms: [:mri, :mingw, :x64_mingw, :mswin]
 
   gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'activerecord-jdbc-adapter', platforms: :jruby
+  gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter', tag: 'v61.1', platforms: :jruby
   gem "jdbc-sqlite3", platforms: :jruby
   gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
   gem "activerecord-jdbcmysql-adapter", platforms: :jruby
   gem "activerecord-jdbcpostgresql-adapter", platforms: :jruby
-  gem "activerecord-jdbcmssql-adapter", platforms: :jruby
 end
 
 gemspec path: "../"

data/gemfiles/rails7.gemfile

@@ -0,0 +1,22 @@
+source "https://rubygems.org"
+
+gem 'rails', '~> 7.0.1'
+
+
+group :development, :test do
+  gem 'activesupport', '~> 7.0.1'
+  gem 'activemodel', '~> 7.0.1'
+  gem 'activerecord', '~> 7.0.1'
+
+  gem "sqlite3", '~> 1.4', platforms: [:mri]
+  gem "mysql2", '0.5.2', platforms: [:mri]
+  gem "pg",'~> 1.1', platforms: [:mri]
+
+  gem "tiny_tds", platforms: [:mri, :mingw, :x64_mingw, :mswin]
+  gem "activerecord-sqlserver-adapter", '~> 7.0.0.0', platforms: [:mri, :mingw, :x64_mingw, :mswin]
+
+  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
+end
+
+gemspec path: "../"

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/aliases.rb

@@ -0,0 +1,14 @@
+module ArelExtensions
+  module Aliases
+
+    # Install an alias, if present.
+    def xas other
+      if other.present?
+        Arel::Nodes::As.new(self, Arel.sql(other))
+      else
+        self
+      end
+    end
+
+  end
+end

data/lib/arel_extensions/attributes.rb

@@ -1,3 +1,4 @@
+require 'arel_extensions/aliases'
 require 'arel_extensions/math'
 require 'arel_extensions/comparators'
 require 'arel_extensions/date_duration'
@@ -8,6 +9,7 @@ require 'arel_extensions/predications'
 
 module ArelExtensions
   module Attributes
+    include ArelExtensions::Aliases
     include ArelExtensions::Math
     include ArelExtensions::Comparators
     include ArelExtensions::DateDuration

data/lib/arel_extensions/date_duration.rb

@@ -40,8 +40,8 @@ module ArelExtensions
       ArelExtensions::Nodes::Duration.new "s", self
     end
 
-    def format(tpl)
-      ArelExtensions::Nodes::Format.new [self, tpl]
+    def format(tpl, time_zone = nil)
+      ArelExtensions::Nodes::Format.new [self, tpl, time_zone]
     end
   end
 end

data/lib/arel_extensions/helpers.rb

@@ -0,0 +1,48 @@
+module ArelExtensions
+
+  #
+  # column_of
+  #
+  # Before the creation of these methods, getting the column name was done
+  # uniquely through the code found in `column_of_via_arel_table`.
+  #
+  # This turned out to be unreliable, most notably when using adapters that do
+  # not come with activerecord standard batteries. SQL Server is the most
+  # notorious example.
+  #
+  # Currently, we're using a needlessly complicated way to address this issue.
+  # Different versions of activerecord are behaving differently; the public APIs
+  # do not seem to come with any guarantees, so we need to be sure that we're
+  # coveing all these cases.
+
+  def self.column_of_via_arel_table(table_name, column_name)
+    begin
+      Arel::Table.engine.connection.schema_cache.columns_hash(table_name)[column_name]
+    rescue NoMethodError
+      nil
+    rescue Exception => e
+      puts "Failed to fetch column info for #{table_name}.#{column_name} ."
+      puts "This should never be reached."
+      puts "#{e.class}: #{e}"
+      nil
+    end
+  end
+
+  def self.column_of(table_name, column_name)
+    use_arel_table = !ActiveRecord::Base.connected? || \
+      (ActiveRecord::Base.connection.pool.respond_to?(:schema_cache) && ActiveRecord::Base.connection.pool.schema_cache.nil?)
+
+    if use_arel_table
+      column_of_via_arel_table(table_name, column_name)
+    else
+      if ActiveRecord::Base.connection.pool.respond_to?(:pool_config)
+        ActiveRecord::Base.connection.pool.pool_config.schema_cache.columns_hash(table_name)[column_name]
+      elsif ActiveRecord::Base.connection.pool.respond_to?(:schema_cache)
+        ActiveRecord::Base.connection.pool.schema_cache.columns_hash(table_name)[column_name]
+      else
+        puts ">>> We really shouldn't be here #{table_name}.#{column_name}"
+        column_of_via_arel_table(table_name, column_name)
+      end
+    end
+  end
+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

@@ -1,3 +1,5 @@
+require 'arel_extensions/helpers'
+
 require 'arel_extensions/nodes'
 require 'arel_extensions/nodes/function'
 require 'arel_extensions/nodes/concat'
@@ -22,37 +24,33 @@ 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]
-        rescue Exception
-          col = nil
-        end
+        col = self.respond_to?(:relation)? ArelExtensions::column_of(self.relation.table_name, self.name.to_s) : nil
         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, Arel::Nodes.build_quoted(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, Arel::Nodes.build_quoted(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, Arel::Nodes.build_quoted(other))
           elsif arg == :datetime || arg == :date
             ArelExtensions::Nodes::DateAdd.new [self, other]
           elsif arg == :string || arg == :text
@@ -68,41 +66,33 @@ 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, Arel::Nodes.build_quoted(other)])
         else
-          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+          Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel::Nodes.build_quoted(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, Arel::Nodes.build_quoted(other))) # ??
         when :integer, :decimal, :float, :number
-          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+          Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel::Nodes.build_quoted(other)))
         when :date, :datetime
-          ArelExtensions::Nodes::DateSub.new [self, other]
+          ArelExtensions::Nodes::DateSub.new [self, Arel::Nodes.build_quoted(other)]
         else
-          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+          Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel::Nodes.build_quoted(other)))
         end
       when Arel::Nodes::Function
-        Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+        Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel::Nodes.build_quoted(other)))
       else
-        begin
-          col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
-        rescue Exception
-          col = nil
-        end
+        col = ArelExtensions::column_of(self.relation.table_name, self.name.to_s)
         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, Arel::Nodes.build_quoted(other)))
         else
           arg = col.type
           if (arg == :date || arg == :datetime)
             case other
             when Arel::Attributes::Attribute
-              begin
-                col2 = Arel::Table.engine.connection.schema_cache.columns_hash(other.relation.table_name)[other.name.to_s]
-              rescue Exception
-                col2 = nil
-              end
+              col2 = ArelExtensions::column_of(other.relation.table_name, other.name.to_s)
               if (!col2) # if the column doesn't exist in the database
                 ArelExtensions::Nodes::DateSub.new [self, other]
               else
@@ -123,11 +113,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, Arel::Nodes.build_quoted(other)))
             end
           end
         end

data/lib/arel_extensions/nodes/case.rb

@@ -1,3 +1,5 @@
+require 'arel_extensions/helpers'
+
 module ArelExtensions
   module Nodes
     if Gem::Version.new(Arel::VERSION) < Gem::Version.new("7.1.0")
@@ -34,6 +36,7 @@ module ArelExtensions
       include Arel::Math
       include Arel::Predications
       include Arel::OrderPredications
+      include ArelExtensions::Aliases
       include ArelExtensions::Math
       include ArelExtensions::Comparators
       include ArelExtensions::Predications
@@ -56,11 +59,7 @@ module ArelExtensions
           when Date, DateTime,Time
             :datetime
           when Arel::Attributes::Attribute
-            begin
-              Arel::Table.engine.connection.schema_cache.columns_hash(obj.relation.table_name)[obj.name.to_s].type
-            rescue Exception
-              :string
-            end
+            ArelExtensions::column_of(obj.relation.table_name, obj.name.to_s)&.type || :string
           else
             :string
           end
@@ -102,7 +101,7 @@ module ArelExtensions
       alias :== :eql?
 
       def as other
-        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
+        Arel::Nodes::As.new self, Arel.sql(other)
       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/date_diff.rb

@@ -117,7 +117,16 @@ module ArelExtensions
           if @date_type == :date
             v.to_i / (24*3600)
           elsif @date_type == :datetime
-            v.to_i
+            if v.parts.size == 1
+              #       first entry in the dict v.parts; one of [:years, :months, :weeks, :days, :hours, :minutes, :seconds]
+              #       |     the value
+              #       |     |
+              #       |     |
+              #       v     v
+              v.parts.first.second
+            else
+              v.to_i
+            end
           end
         else
           v
@@ -130,7 +139,17 @@ module ArelExtensions
           if @date_type == :date
             Arel.sql('day')
           elsif @date_type == :datetime
-            Arel.sql('second')
+            res = if v.parts.size == 1
+                    #       first entry in the dict v.parts; one of [:years, :months, :weeks, :days, :hours, :minutes, :seconds]
+                    #       |     the key
+                    #       |     |     convert symbol to string
+                    #       |     |     |   remove the plural suffix `s`
+                    #       v     v     v   v
+                    v.parts.first.first.to_s[0..-2]
+                  else
+                    'second'
+                  end
+            Arel.sql(res)
           end
         else
           if ArelExtensions::Nodes::Duration === v
@@ -141,9 +160,9 @@ module ArelExtensions
             when 'h','mn','s'
               Arel.sql('second')
             when /i\z/
-              Arel.sql(Arel::Visitors::MSSQL::DATE_MAPPING[v.left[0..-2]])
+              Arel.sql(ArelExtensions::Visitors::MSSQL::LOADED_VISITOR::DATE_MAPPING[v.left[0..-2]])
             else
-              Arel.sql(Arel::Visitors::MSSQL::DATE_MAPPING[v.left])
+              Arel.sql(ArelExtensions::Visitors::MSSQL::LOADED_VISITOR::DATE_MAPPING[v.left])
             end
           end
         end

data/lib/arel_extensions/nodes/format.rb

@@ -5,11 +5,12 @@ module ArelExtensions
     class Format < Function
       RETURN_TYPE = :string
 
-      attr_accessor :col_type, :iso_format
+      attr_accessor :col_type, :iso_format, :time_zone
 
       def initialize expr
-        col = expr.first
+        col = expr[0]
         @iso_format = convert_format(expr[1])
+        @time_zone  = Arel::Nodes.build_quoted(expr[2]) if expr[2]
         @col_type = type_of_attribute(col)
         super [col, convert_to_string_node(@iso_format)]
       end

data/lib/arel_extensions/nodes/function.rb

@@ -51,11 +51,7 @@ module ArelExtensions
       def type_of_attribute(att)
         case att
         when Arel::Attributes::Attribute
-          begin
-            Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
-          rescue
-            att
-          end
+          ArelExtensions::column_of(att.relation.table_name, att.name.to_s)&.type || att
         when ArelExtensions::Nodes::Function
           att.return_type
           #        else
@@ -80,7 +76,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.1.1".freeze
 end