arel_extensions 2.4.0 → 2.5.0

data/gemfiles/rails7_1.gemfile

@@ -1,33 +1,40 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'rails', '~> 7.1'
 
 group :development, :test do
-  gem 'ruby-lsp', platforms: %i[mri]
   gem 'debug', platforms: %i[mri]
+  gem 'minitest', '~> 5.9'
+  gem 'rake', '~> 12.3.3'
+  gem 'rubocop'
+  gem 'rubocop-performance'
+  gem 'ruby-lsp', platforms: %i[mri]
 
-  gem 'activesupport', '~> 7.1'
   gem 'activemodel', '~> 7.1'
   gem 'activerecord', '~> 7.1'
+  gem 'activesupport', '~> 7.1'
 
-  gem 'sqlite3', '~> 1.6', platforms: [:mri]
   gem 'mysql2', '~>0.5', platforms: [:mri]
   gem 'pg', '~> 1.5', platforms: [:mri]
+  gem 'sqlite3', '~> 1.6', platforms: [:mri]
 
+  gem 'activerecord-sqlserver-adapter', '~> 7.1.0', platforms: %i[mri mingw x64_mingw mswin]
   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'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 7.0.0' if ENV.key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.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
+  gem 'jar-dependencies', '0.4.1', platforms: :jruby
+  gem 'jdbc-mssql', platforms: :jruby, require: true
+  gem 'jdbc-sqlite3', platform: :jruby
 
   # Ruby 3.4+ removes the following gems from the standard distribution.
   # Warnings are emitted from 3.3 .

data/gemfiles/rails7_2.gemfile

@@ -1,25 +1,31 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'rails', '~> 7.2'
 
 group :development, :test do
-  gem 'ruby-lsp', platforms: %i[mri]
   gem 'debug', platforms: %i[mri]
+  gem 'minitest', '~> 5.9'
+  gem 'rake', '~> 12.3.3'
+  gem 'rubocop'
+  gem 'rubocop-performance'
+  gem 'ruby-lsp', platforms: %i[mri]
 
-  gem 'activesupport', '~> 7.2'
   gem 'activemodel', '~> 7.2'
   gem 'activerecord', '~> 7.2'
+  gem 'activesupport', '~> 7.2'
 
-  gem 'sqlite3', '~> 1.6', platforms: [:mri]
   gem 'mysql2', '~>0.5', platforms: [:mri]
   gem 'pg', '~> 1.5', platforms: [:mri]
+  gem 'sqlite3', '~> 1.6', 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 'tiny_tds', 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'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 7.0.0' if ENV.key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.key? 'ORACLE_HOME'
 
   # for JRuby
   gem 'jdbc-mssql', platforms: :jruby, require: true

data/gemfiles/rails8.gemfile

@@ -3,30 +3,30 @@ source 'https://rubygems.org'
 gem 'rails', '~> 8.0'
 
 group :development, :test do
-  gem 'ruby-lsp', platforms: %i[mri]
   gem 'debug', platforms: %i[mri]
+  gem 'ruby-lsp', platforms: %i[mri]
 
-  gem 'activesupport', '~> 8.0'
   gem 'activemodel', '~> 8.0'
   gem 'activerecord', '~> 8.0'
+  gem 'activesupport', '~> 8.0'
 
-  gem 'sqlite3', '~> 2.1', platforms: [:mri]
   gem 'mysql2', '~>0.5', platforms: [:mri]
   gem 'pg', '~> 1.5', platforms: [:mri]
+  gem 'sqlite3', '~> 2.1', platforms: [:mri]
 
-  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
   gem 'activerecord-sqlserver-adapter', '~> 8.0', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tiny_tds', 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', '~> 8.0' if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'jdbc-mssql', platforms: :jruby, require: true
-  gem 'jdbc-sqlite3', platform: :jruby
   gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
   gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
   gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+  gem 'jdbc-mssql', platforms: :jruby, require: true
+  gem 'jdbc-sqlite3', platform: :jruby
 
   # Ruby 3.4+ removes the following gems from the standard distribution.
   # Warnings are emitted from 3.3.

data/gemfiles/rails8_1.gemfile

@@ -3,19 +3,19 @@ source 'https://rubygems.org'
 gem 'rails', '~> 8.1'
 
 group :development, :test do
-  gem 'ruby-lsp', platforms: %i[mri]
   gem 'debug', platforms: %i[mri]
+  gem 'ruby-lsp', platforms: %i[mri]
 
-  gem 'activesupport', '~> 8.1'
   gem 'activemodel', '~> 8.1'
   gem 'activerecord', '~> 8.1'
+  gem 'activesupport', '~> 8.1'
 
-  gem 'sqlite3', '~> 2.1', platforms: [:mri]
   gem 'mysql2', '~>0.5', platforms: [:mri]
   gem 'pg', '~> 1.5', platforms: [:mri]
+  gem 'sqlite3', '~> 2.1', platforms: [:mri]
 
-  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
   gem 'activerecord-sqlserver-adapter', '~> 8.1', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tiny_tds', 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'

data/gemspecs/arel_extensions-v1.gemspec

@@ -1,4 +1,6 @@
-$:.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'arel_extensions/version'
 
 Gem::Specification.new do |s|
@@ -17,11 +19,7 @@ Gem::Specification.new do |s|
 
   # Manifest
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
 
   s.add_dependency('arel', '>= 6.0')
-
-  s.add_development_dependency('minitest', '~> 5.9')
-  s.add_development_dependency('rake', '~> 12.3.3')
 end

data/gemspecs/arel_extensions-v2.gemspec

@@ -1,4 +1,6 @@
-$:.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'arel_extensions/version'
 
 Gem::Specification.new do |s|
@@ -17,11 +19,7 @@ Gem::Specification.new do |s|
 
   # Manifest
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
 
   s.add_dependency('activerecord', '>= 6.0')
-
-  s.add_development_dependency('minitest', '~> 5.9')
-  s.add_development_dependency('rake', '~> 12.3.3')
 end

data/lib/arel_extensions/aliases.rb

@@ -1,14 +1,14 @@
+# frozen_string_literal: true
+
 module ArelExtensions
   module Aliases
-
     # Install an alias, if present.
-    def xas other
+    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,5 @@
+# frozen_string_literal: true
+
 require 'arel_extensions/aliases'
 require 'arel_extensions/math'
 require 'arel_extensions/comparators'

data/lib/arel_extensions/boolean_functions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'arel_extensions/nodes/then'
 
 module ArelExtensions
@@ -6,7 +8,7 @@ module ArelExtensions
       self.and(other)
     end
 
-    def and *others
+    def and(*others)
       Arel::Nodes::And.new self, others
     end
 
@@ -14,7 +16,7 @@ module ArelExtensions
       self.or(other)
     end
 
-    def or *others
+    def or(*others)
       Arel::Nodes::Or.new self, others
     end
 
@@ -27,7 +29,7 @@ end
 class Arel::Nodes::And
   include ArelExtensions::BooleanFunctions
 
-  def self.new *children
+  def self.new(*children)
     children =
       children.flatten.map { |c|
         c.is_a?(self) ? c.children : c
@@ -47,15 +49,15 @@ class Arel::Nodes::Or
 
   attr_reader :children
 
-  def self.new *children
+  def self.new(*children)
     children =
       children.flatten.map { |c|
         c.is_a?(self) ? c.children : c
       }.flatten
-    super(*children)
+    super
   end
 
-  def initialize *children
+  def initialize(*children)
     @children = children
   end
 
@@ -80,5 +82,5 @@ class Arel::Nodes::Or
     self.class == other.class &&
       children == other.children
   end
-  alias :== :eql?
+  alias == eql?
 end

data/lib/arel_extensions/common_sql_functions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArelExtensions
   class CommonSqlFunctions
     def initialize(cnx)
@@ -9,7 +11,7 @@ module ArelExtensions
           db.load_extension('/usr/lib/sqlite3/pcre.so')
           db.load_extension('/usr/lib/sqlite3/extension-functions.so')
           db.enable_load_extension(0)
-        rescue => e
+        rescue StandardError => e
           $load_extension_disabled = true
           puts "cannot load extensions #{e.inspect}"
         end
@@ -42,14 +44,14 @@ module ArelExtensions
       if /sqlite/i.match?(env_db)
         begin
           add_sqlite_functions
-        rescue => e
+        rescue StandardError => e
           puts "cannot add sqlite functions #{e.inspect}"
         end
       end
       if File.exist?("init/#{env_db}.sql")
         sql = File.read("init/#{env_db}.sql")
         if env_db == 'mssql'
-          sql.split(/^GO\s*$/).each {|str|
+          sql.split(/^GO\s*$/).each { |str|
             @cnx.execute(str.strip) unless str.blank?
           }
         elsif env_db == 'mysql'

data/lib/arel_extensions/comparators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArelExtensions
   module Comparators
     def >(other)
@@ -19,8 +21,8 @@ module ArelExtensions
     # REGEXP function
     # Pattern matching using regular expressions
     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
+      #      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)
       #      end
     end
@@ -30,8 +32,8 @@ module ArelExtensions
     # NOT_REGEXP function
     # Negation of Regexp
     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
+      #      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)
       #      end
     end

data/lib/arel_extensions/date_duration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'arel_extensions/nodes/format'
 require 'arel_extensions/nodes/formatted_date'
 require 'arel_extensions/nodes/duration'

data/lib/arel_extensions/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArelExtensions
   #
   # column_of
@@ -18,7 +20,7 @@ module ArelExtensions
     Arel::Table.engine.connection.schema_cache.columns_hash(table_name)[column_name]
   rescue NoMethodError
     nil
-  rescue => e
+  rescue StandardError => 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
@@ -26,33 +28,31 @@ module ArelExtensions
 
   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?)
+    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)
-          if ACTIVE_RECORD_VERSION >= V7_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
+    elsif 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_cache.columns_hash(table_name)[column_name]
+          pool.pool_config.schema_reflection.columns_hash(ActiveRecord::Base.connection, 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)
+      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
   rescue ActiveRecord::ConnectionNotEstablished
     column_of_via_arel_table(table_name, column_name)
   rescue ActiveRecord::StatementInvalid
     nil
-  rescue => e
+  rescue StandardError => e
     warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of`")
     warn(e)
     warn(e.backtrace)

data/lib/arel_extensions/insert_manager.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 require 'arel'
 
 module ArelExtensions
   module InsertManager
     def bulk_insert(cols, data)
       raise ArgumentError, 'cols must be present' if cols.blank?
+
       columns =
         case cols.first
         when Array
@@ -11,7 +14,7 @@ module ArelExtensions
           when Arel::Attributes::Attribute
             cols
           when String, Symbol
-            cols.map {|c| [@ast.relation[c.first]] }
+            cols.map { |c| [@ast.relation[c.first]] }
           else
             raise ArgumentError, "cols has an invalid type: #{cols.first.first.class}"
           end
@@ -28,6 +31,7 @@ module ArelExtensions
       attr_accessor :left, :cols
 
       def initialize(cols, values)
+        super()
         @left = values
         @cols = cols
       end

data/lib/arel_extensions/math.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'arel_extensions/nodes'
 require 'arel_extensions/nodes/function'
 require 'arel_extensions/nodes/concat'
@@ -17,48 +19,46 @@ module ArelExtensions
     def +(other)
       case self
       when Arel::Nodes::Quoted
-        self.concat(other)
+        concat(other)
       when Arel::Nodes::Grouping
-        if self.expr.left.is_a?(String) || self.expr.right.is_a?(String)
-          self.concat(other)
+        if expr.left.is_a?(String) || expr.right.is_a?(String)
+          concat(other)
         else
-          Arel.grouping(Arel::Nodes::Addition.new self, other)
+          Arel.grouping(Arel::Nodes::Addition.new(self, other))
         end
       when ArelExtensions::Nodes::Function, ArelExtensions::Nodes::Case
-        case self.return_type
-        when :string, :text
-          self.concat(other)
+        case return_type
         when :integer, :decimal, :float, :number, :int
-          Arel.grouping(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)
+          concat(other)
         end
       when Arel::Nodes::Function
-        Arel.grouping(Arel::Nodes::Addition.new self, other)
+        Arel.grouping(Arel::Nodes::Addition.new(self, other))
       else
         col =
-          if self.is_a?(Arel::Attribute) && self.respond_to?(:type_caster) && self.able_to_type_cast?
-            self.type_caster
-          else
-            Arel.column_of(self.relation.table_name, self.name.to_s) if self.respond_to?(:relation)
+          if is_a?(Arel::Attribute) && respond_to?(:type_caster) && able_to_type_cast?
+            type_caster
+          elsif respond_to?(:relation)
+            Arel.column_of(relation.table_name, name.to_s)
           end
-        if !col # if the column doesn't exist in the database
-          Arel.grouping(Arel::Nodes::Addition.new(self, Arel.quoted(other)))
-        else
+        if col
           arg = col.type
           if arg == :integer || !arg
             other = other.to_i if other.is_a?(String)
-            Arel.grouping(Arel::Nodes::Addition.new self, Arel.quoted(other))
-          elsif arg == :decimal || arg == :float
+            Arel.grouping(Arel::Nodes::Addition.new(self, Arel.quoted(other)))
+          elsif %i[decimal float].include?(arg)
             other = Arel.sql(other) if other.is_a?(String) # Arel should accept Float & BigDecimal!
-            Arel.grouping(Arel::Nodes::Addition.new self, Arel.quoted(other))
-          elsif arg == :datetime || arg == :date
+            Arel.grouping(Arel::Nodes::Addition.new(self, Arel.quoted(other)))
+          elsif %i[datetime date].include?(arg)
             ArelExtensions::Nodes::DateAdd.new [self, other]
-          elsif arg == :string || arg == :text
-            self.concat(other)
+          elsif %i[string text].include?(arg)
+            concat(other)
           end
+        else
+          Arel.grouping(Arel::Nodes::Addition.new(self, Arel.quoted(other)))
         end
       end
     end
@@ -68,17 +68,13 @@ module ArelExtensions
     def -(other)
       case self
       when Arel::Nodes::Grouping
-        if self.expr.left.is_a?(Date) || self.expr.left.is_a?(DateTime)
-          Arel.grouping(ArelExtensions::Nodes::DateSub.new [self, Arel.quoted(other)])
+        if expr.left.is_a?(Date) || expr.left.is_a?(DateTime)
+          Arel.grouping(ArelExtensions::Nodes::DateSub.new([self, Arel.quoted(other)]))
         else
           Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.quoted(other)))
         end
       when ArelExtensions::Nodes::Function, ArelExtensions::Nodes::Case
-        case self.return_type
-        when :string, :text # ???
-          Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.quoted(other))) # ??
-        when :integer, :decimal, :float, :number
-          Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.quoted(other)))
+        case return_type
         when :date, :datetime
           ArelExtensions::Nodes::DateSub.new [self, Arel.quoted(other)]
         else
@@ -88,33 +84,31 @@ module ArelExtensions
         Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.quoted(other)))
       else
         col =
-          if self.is_a?(Arel::Attribute) && self.respond_to?(:type_caster) && self.able_to_type_cast?
-            self.type_caster
-          else
-            Arel.column_of(self.relation.table_name, self.name.to_s) if self.respond_to?(:relation)
+          if is_a?(Arel::Attribute) && respond_to?(:type_caster) && able_to_type_cast?
+            type_caster
+          elsif respond_to?(:relation)
+            Arel.column_of(relation.table_name, name.to_s)
           end
-        if !col # if the column doesn't exist in the database
-          Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.quoted(other)))
-        else
+        if col
           arg = col.type
-          if (arg == :date || arg == :datetime)
+          if %i[date datetime].include?(arg)
             case other
             when Arel::Attributes::Attribute
               col2 =
                 if other.is_a?(Arel::Attribute) && other.respond_to?(:type_caster) && other.able_to_type_cast?
                   other.type_caster
-                else
-                  Arel.column_of(other.relation.table_name, other.name.to_s) if other.respond_to?(:relation)
+                elsif other.respond_to?(:relation)
+                  Arel.column_of(other.relation.table_name, other.name.to_s)
                 end
-              if !col2 # if the column doesn't exist in the database
-                ArelExtensions::Nodes::DateSub.new [self, other]
-              else
+              if col2
                 arg2 = col2.type
-                if arg2 == :date || arg2 == :datetime
+                if %i[date datetime].include?(arg2)
                   ArelExtensions::Nodes::DateDiff.new [self, other]
                 else
                   ArelExtensions::Nodes::DateSub.new [self, other]
                 end
+              else
+                ArelExtensions::Nodes::DateSub.new [self, other]
               end
             when Arel::Nodes::Node, DateTime, Time, String, Date
               ArelExtensions::Nodes::DateDiff.new [self, other]
@@ -133,6 +127,8 @@ module ArelExtensions
               Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.quoted(other)))
             end
           end
+        else
+          Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.quoted(other)))
         end
       end
     end