arel_extensions 2.0.21 → 2.2.2

data/gemfiles/rails7.gemfile

@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 7.0.1'
+
+group :development, :test do
+  gem 'ruby-lsp', platforms: %i[mri]
+  gem 'debug', platforms: %i[mri]
+
+  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', platforms: [:mri]
+  gem 'pg', '~> 1.1', platforms: [:mri]
+
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 7.0.7', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
+
+  gem 'ruby-oci8', platforms: %i[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 'jdbc-mssql', platforms: :jruby, require: true
+  gem 'jdbc-sqlite3', platform: :jruby
+  gem 'activerecord-jdbc-alt-adapter', '~> 70.0', platform: :jruby, require: true
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+end
+
+gemspec path: Dir.pwd

data/gemfiles/rails7_1.gemfile

@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 7.1'
+
+group :development, :test do
+  gem 'ruby-lsp', platforms: %i[mri]
+  gem 'debug', platforms: %i[mri]
+
+  gem 'activesupport', '~> 7.1'
+  gem 'activemodel', '~> 7.1'
+  gem 'activerecord', '~> 7.1'
+
+  gem 'sqlite3', '~> 1.6', platforms: [:mri]
+  gem 'mysql2', '~>0.5', platforms: [:mri]
+  gem 'pg', '~> 1.5', platforms: [:mri]
+
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 7.1.0.beta1', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
+
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 7.0.0' if ENV.has_key? 'ORACLE_HOME'
+
+  # for JRuby
+  gem 'jdbc-mssql', platforms: :jruby, require: true
+  gem 'jdbc-sqlite3', platform: :jruby
+  gem 'activerecord-jdbc-alt-adapter', '~> 71.0.0.alpha1', platform: :jruby, require: true
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+end
+
+gemspec path: Dir.pwd

data/gemfiles/rails7_2.gemfile

@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 7.2'
+
+group :development, :test do
+  gem 'ruby-lsp', platforms: %i[mri]
+  gem 'debug', platforms: %i[mri]
+
+  gem 'activesupport', '~> 7.2'
+  gem 'activemodel', '~> 7.2'
+  gem 'activerecord', '~> 7.2'
+
+  gem 'sqlite3', '~> 1.6', platforms: [:mri]
+  gem 'mysql2', '~>0.5', platforms: [:mri]
+  gem 'pg', '~> 1.5', platforms: [:mri]
+
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 7.2', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
+
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 7.0.0' if ENV.has_key? 'ORACLE_HOME'
+
+  # for JRuby
+  gem 'jdbc-mssql', platforms: :jruby, require: true
+  gem 'jdbc-sqlite3', platform: :jruby
+  # gem 'activerecord-jdbc-alt-adapter', '~> 71.0.0.alpha1', platform: :jruby, require: true
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+end
+
+gemspec path: Dir.pwd

data/gemspecs/arel_extensions-v1.gemspec

@@ -1,28 +1,27 @@
-$:.push File.expand_path("../lib", __FILE__)
-require "arel_extensions/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'arel_extensions/version'
 
 Gem::Specification.new do |s|
-  s.name        = "arel_extensions"
+  s.name        = 'arel_extensions'
   s.version     = ArelExtensions::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Yann Azoury", "Félix Bellanger", "Julien Delporte"]
-  s.email       = ["yann.azoury@faveod.com", "felix.bellanger@faveod.com", "julien.delporte@faveod.com"]
-  s.homepage    = "https://github.com/Faveod/arel-extensions"
-  s.description = "Adds new features to Arel"
-  s.summary     = "Extending Arel"
+  s.authors     = ['Yann Azoury', 'Félix Bellanger', 'Julien Delporte']
+  s.email       = ['yann.azoury@faveod.com', 'felix.bellanger@faveod.com', 'julien.delporte@faveod.com']
+  s.homepage    = 'https://github.com/Faveod/arel-extensions'
+  s.description = 'Adds new features to Arel'
+  s.summary     = 'Extending Arel'
   s.license     = 'MIT'
 
-  s.rdoc_options = ["--main", "README.md"]
-  s.extra_rdoc_files = ["MIT-LICENSE.txt", "README.md", 'functions.html']
+  s.rdoc_options = ['--main', 'README.md']
+  s.extra_rdoc_files = ['MIT-LICENSE.txt', 'README.md', 'functions.html']
 
   # Manifest
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
   s.add_dependency('arel', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
-  s.add_development_dependency('rdoc', '~> 4.0')
   s.add_development_dependency('rake', '~> 12.3.3')
-end
+end

data/gemspecs/arel_extensions-v2.gemspec

@@ -1,28 +1,27 @@
-$:.push File.expand_path("../lib", __FILE__)
-require "arel_extensions/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'arel_extensions/version'
 
 Gem::Specification.new do |s|
-  s.name        = "arel_extensions"
+  s.name        = 'arel_extensions'
   s.version     = ArelExtensions::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Yann Azoury", "Félix Bellanger", "Julien Delporte"]
-  s.email       = ["yann.azoury@faveod.com", "felix.bellanger@faveod.com", "julien.delporte@faveod.com"]
-  s.homepage    = "https://github.com/Faveod/arel-extensions"
-  s.description = "Adds new features to Arel"
-  s.summary     = "Extending Arel"
+  s.authors     = ['Yann Azoury', 'Félix Bellanger', 'Julien Delporte']
+  s.email       = ['yann.azoury@faveod.com', 'felix.bellanger@faveod.com', 'julien.delporte@faveod.com']
+  s.homepage    = 'https://github.com/Faveod/arel-extensions'
+  s.description = 'Adds new features to Arel'
+  s.summary     = 'Extending Arel'
   s.license     = 'MIT'
 
-  s.rdoc_options = ["--main", "README.md"]
-  s.extra_rdoc_files = ["MIT-LICENSE.txt", "README.md", 'functions.html']
+  s.rdoc_options = ['--main', 'README.md']
+  s.extra_rdoc_files = ['MIT-LICENSE.txt', 'README.md', 'functions.html']
 
   # Manifest
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
   s.add_dependency('activerecord', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
-  s.add_development_dependency('rdoc', '~> 4.0')
   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
@@ -17,11 +19,17 @@ module ArelExtensions
     include ArelExtensions::Predications
 
     def ==(other)
-      Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
+      if Gem::Version.create(ArelExtensions::VERSION) >= Gem::Version.create('2.2')
+        warn("#{caller(1..1).first} arel_extensions: `==` is now deprecated and will be removed soon. Use `.eq` instead.")
+      end
+      Arel::Nodes::Equality.new self, Arel.quoted(other, self)
     end
 
     def !=(other)
-      Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
+      if Gem::Version.create(ArelExtensions::VERSION) >= Gem::Version.create('2.2')
+        warn("#{caller(1..1).first} arel_extensions: `!=` is now deprecated and will be removed soon. Use `.not_eq` instead.")
+      end
+      Arel::Nodes::NotEqual.new self, Arel.quoted(other, self)
     end
   end
 end

data/lib/arel_extensions/boolean_functions.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require 'arel_extensions/nodes/then'
 
 module ArelExtensions
@@ -32,7 +30,7 @@ class Arel::Nodes::And
   def self.new *children
     children =
       children.flatten.map { |c|
-      c.is_a?(self) ? c.children : c
+        c.is_a?(self) ? c.children : c
       }.flatten
     super(children)
   end
@@ -52,7 +50,7 @@ class Arel::Nodes::Or
   def self.new *children
     children =
       children.flatten.map { |c|
-      c.is_a?(self) ? c.children : c
+        c.is_a?(self) ? c.children : c
       }.flatten
     super(*children)
   end

data/lib/arel_extensions/common_sql_functions.rb

@@ -6,8 +6,8 @@ module ArelExtensions
         begin
           db = cnx.raw_connection
           db.enable_load_extension(1)
-          db.load_extension("/usr/lib/sqlite3/pcre.so")
-          db.load_extension("/usr/lib/sqlite3/extension-functions.so")
+          db.load_extension('/usr/lib/sqlite3/pcre.so')
+          db.load_extension('/usr/lib/sqlite3/extension-functions.so')
           db.enable_load_extension(0)
         rescue => e
           $load_extension_disabled = true
@@ -18,28 +18,28 @@ module ArelExtensions
 
     def add_sqlite_functions
       db = @cnx.raw_connection
-      db.create_function("find_in_set", 1) do |func, val, list|
+      db.create_function('find_in_set', 1) do |func, val, list|
         case list
         when String
           i = list.split(',').index(val.to_s)
-          func.result = i ? (i+1) : 0
+          func.result = i ? (i + 1) : 0
         when NilClass
           func.result = nil
         else
           i = list.to_s.split(',').index(val.to_s)
-          func.result = i ? (i+1) : 0
+          func.result = i ? (i + 1) : 0
         end
       end
-      db.create_function("instr", 1) do |func, value1, value2|
+      db.create_function('instr', 1) do |func, value1, value2|
         i = value1.to_s.index(value2.to_s)
-        func.result = i ? (i+1) : 0
-      end rescue "function instr already here (>= 3.8.5)"
+        func.result = i ? (i + 1) : 0
+      end rescue 'function instr already here (>= 3.8.5)'
     end
 
     def add_sql_functions(env_db = nil)
       env_db ||= @cnx.adapter_name
-      env_db = 'mysql' if env_db =~ /mysql/i
-      if env_db =~ /sqlite/i
+      env_db = 'mysql' if /mysql/i.match?(env_db)
+      if /sqlite/i.match?(env_db)
         begin
           add_sqlite_functions
         rescue => e
@@ -52,8 +52,8 @@ module ArelExtensions
           sql.split(/^GO\s*$/).each {|str|
             @cnx.execute(str.strip) unless str.blank?
           }
-        elsif env_db =='mysql'
-          sql.split("$$")[1..-2].each { |str|
+        elsif env_db == 'mysql'
+          sql.split('$$')[1..-2].each { |str|
             @cnx.execute(str.strip) unless str.strip.blank?
           }
         else

data/lib/arel_extensions/comparators.rb

@@ -1,19 +1,19 @@
 module ArelExtensions
   module Comparators
     def >(other)
-      Arel::Nodes::GreaterThan.new self, Arel::Nodes.build_quoted(other, self)
+      Arel::Nodes::GreaterThan.new self, Arel.quoted(other, self)
     end
 
     def >=(other)
-      Arel::Nodes::GreaterThanOrEqual.new self, Arel::Nodes.build_quoted(other, self)
+      Arel::Nodes::GreaterThanOrEqual.new self, Arel.quoted(other, self)
     end
 
     def <(other)
-      Arel::Nodes::LessThan.new self, Arel::Nodes.build_quoted(other, self)
+      Arel::Nodes::LessThan.new self, Arel.quoted(other, self)
     end
 
     def <=(other)
-      Arel::Nodes::LessThanOrEqual.new self, Arel::Nodes.build_quoted(other, self)
+      Arel::Nodes::LessThanOrEqual.new self, Arel.quoted(other, self)
     end
 
     # REGEXP function
@@ -21,7 +21,7 @@ module ArelExtensions
     def =~(other)
         #      arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
         #      if arg == :string || arg == :text
-        Arel::Nodes::Regexp.new self, convert_regexp(other)
+      Arel::Nodes::Regexp.new self, convert_regexp(other)
       #      end
     end
 
@@ -30,7 +30,7 @@ module ArelExtensions
     def !~(other)
         #      arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
         #      if arg == :string || arg == :text
-        Arel::Nodes::NotRegexp.new self, convert_regexp(other)
+      Arel::Nodes::NotRegexp.new self, convert_regexp(other)
       #      end
     end
 
@@ -42,17 +42,17 @@ module ArelExtensions
       when String
         # Do nothing.
       when Regexp
-        other = other.source.gsub('\A','^')
-        other.gsub!('\z','$')
-        other.gsub!('\Z','$')
-        other.gsub!('\d','[0-9]')
-        other.gsub!('\D','[^0-9]')
-        other.gsub!('\w','[0-9A-Za-z]')
-        other.gsub!('\W','[^A-Za-z0-9_]')
+        other = other.source.gsub('\A', '^')
+        other.gsub!('\z', '$')
+        other.gsub!('\Z', '$')
+        other.gsub!('\d', '[0-9]')
+        other.gsub!('\D', '[^0-9]')
+        other.gsub!('\w', '[0-9A-Za-z]')
+        other.gsub!('\W', '[^A-Za-z0-9_]')
       else
         raise(ArgumentError)
       end
-      Arel::Nodes.build_quoted(other, self)
+      Arel.quoted(other, self)
     end
   end
 end

data/lib/arel_extensions/date_duration.rb

@@ -1,4 +1,5 @@
 require 'arel_extensions/nodes/format'
+require 'arel_extensions/nodes/formatted_date'
 require 'arel_extensions/nodes/duration'
 require 'arel_extensions/nodes/wday'
 
@@ -6,22 +7,22 @@ module ArelExtensions
   module DateDuration
     # function returns the year (as a number) given a date value.
     def year
-      ArelExtensions::Nodes::Duration.new "y", self
+      ArelExtensions::Nodes::Duration.new 'y', self
     end
 
     # function returns the month (as a number) given a date value.
     def month
-      ArelExtensions::Nodes::Duration.new "m", self
+      ArelExtensions::Nodes::Duration.new 'm', self
     end
 
     # function returns the  week (as a number) given a date value.
     def week
-      ArelExtensions::Nodes::Duration.new "w", self
+      ArelExtensions::Nodes::Duration.new 'w', self
     end
 
     # function returns the month (as a number) given a date value.
     def day
-      ArelExtensions::Nodes::Duration.new "d", self
+      ArelExtensions::Nodes::Duration.new 'd', self
     end
 
     def wday
@@ -29,19 +30,23 @@ module ArelExtensions
     end
 
     def hour
-      ArelExtensions::Nodes::Duration.new "h", self
+      ArelExtensions::Nodes::Duration.new 'h', self
     end
 
     def minute
-      ArelExtensions::Nodes::Duration.new "mn", self
+      ArelExtensions::Nodes::Duration.new 'mn', self
     end
 
     def second
-      ArelExtensions::Nodes::Duration.new "s", self
+      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
+
+    def format_date(tpl, time_zone = nil)
+      ArelExtensions::Nodes::FormattedDate.new [self, tpl, time_zone]
     end
   end
 end

data/lib/arel_extensions/helpers.rb

@@ -0,0 +1,62 @@
+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)
+    Arel::Table.engine.connection.schema_cache.columns_hash(table_name)[column_name]
+  rescue NoMethodError
+    nil
+  rescue => e
+    warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of_via_arel_table`\n#{e.class}")
+    warn(e.backtrace)
+    nil
+  end
+
+  def self.column_of(table_name, column_name)
+    pool = ActiveRecord::Base.connection.pool
+    use_arel_table = !ActiveRecord::Base.connected? || \
+      (pool.respond_to?(:schema_cache) && pool.schema_cache.nil?)
+
+    if use_arel_table
+      column_of_via_arel_table(table_name, column_name)
+    else
+      if pool.respond_to?(:pool_config)
+        if pool.pool_config.respond_to?(:schema_reflection) # activerecord >= 7.1
+          if ActiveRecord.version >= Gem::Version.create('7.2')
+            pool.pool_config.schema_reflection.columns_hash(pool, table_name)[column_name]
+          else
+            pool.pool_config.schema_reflection.columns_hash(ActiveRecord::Base.connection, table_name)[column_name]
+          end
+        else # activerecord < 7.1
+          pool.pool_config.schema_cache.columns_hash(table_name)[column_name]
+        end
+      elsif pool.respond_to?(:schema_cache) # activerecord < 6.1
+        pool.schema_cache.columns_hash(table_name)[column_name]
+      else # activerecord < 5.0
+        column_of_via_arel_table(table_name, column_name)
+      end
+    end
+  rescue ActiveRecord::ConnectionNotEstablished
+    column_of_via_arel_table(table_name, column_name)
+  rescue ActiveRecord::StatementInvalid
+    nil
+  rescue => e
+    warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of`")
+    warn(e)
+    warn(e.backtrace)
+    nil
+  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