arel_extensions 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcbd0d968a06d04df7d1b214a72aeaf46dd9e950
-  data.tar.gz: 717c053e7925a4d4ec6c1aa43d7db95a928224ba
+  metadata.gz: 57e8a31276fb8b6bba831c0934378f6e45150e86
+  data.tar.gz: 36aa4b3a0792e618cc2fce1ea7afd0736b2229f6
 SHA512:
-  metadata.gz: c47c4d2544182c27b7effe868a157545d3bb9b16096ebf0c9078373d3682a008a7e481d30f2a2d2a2bf40e1f1b6ea2431e08a8129b07998bf90f005e0eb9173a
-  data.tar.gz: 4817767ae9f17846f9909a1f7ceadaddd4ca9745d65c64b50be06184e31ddfc93ae55ac9c27e4b0d97fbc1c91fd14c805f298d2414a9b77130c4737bf3489e8a
+  metadata.gz: 0ea1d6ad9ee4b4417edee7773cc86982e8dc844e5e6d907fbf859c806b152a7b0dd96832fa452d760157e26a5774282544761aa045633ad19592dc6fea377585
+  data.tar.gz: 1ee956c003f1d2edcae2d57c38b3e66205091c66323e9dda0c0c46138b9b0fe11679a7ad5c92aecda65e6cd9f0f03f4a1d59fb30f68a8c0cedbf6d8e39c39062

data/.travis.yml

@@ -175,6 +175,8 @@ matrix:
     gemfile: gemfiles/rails5_1_4.gemfile
   - rvm: 2.1
     gemfile: gemfiles/rails5_1_4.gemfile
+  - rvm: 2.2.5
+    gemfile: gemfiles/rails5_1_4.gemfile
   - rvm: ruby-head
     gemfile: gemfiles/rails4.gemfile
   - rvm: 2.0.0

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem "sqlite3", :platforms => [:mri, :mswin, :x64_mingw, :mingw]
+  gem "sqlite3", '<= 1.3.13', :platforms => [:mri, :mswin, :x64_mingw, :mingw]
   gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :x64_mingw, :mingw]
   gem "pg", '< 1', :platforms => [:mri, :mingw, :x64_mingw, :mswin]
 

data/gemfiles/rails3.gemfile

@@ -3,18 +3,18 @@ source "https://rubygems.org"
 gem 'arel', '~> 3.0' # too old...
 
 group :development, :test do
-	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-	gem "mysql2", '0.4.10', :platform => [:ruby, :mswin, :mingw]
-	gem "activerecord-mysql2-adapter", :platform => [:ruby, :mswin, :mingw]
-	gem "pg", :platform => [:ruby, :mswin, :mingw]
-	# for JRuby
-	gem "jdbc-sqlite3", :platform => :jruby
-	gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-	gem "activerecord-jdbcmysql-adapter", :platform => :jruby
-	gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
-	gem 'activesupport', '~> 3.2'
-	gem 'activemodel', '~> 3.2'
-	gem 'activerecord', '~> 3.2'
+  gem "sqlite3", '<= 1.3.13', :platform => [:ruby, :mswin, :mingw]
+  gem "mysql2", '0.4.10', :platform => [:ruby, :mswin, :mingw]
+  gem "activerecord-mysql2-adapter", :platform => [:ruby, :mswin, :mingw]
+  gem "pg", :platform => [:ruby, :mswin, :mingw]
+  # for JRuby
+  gem "jdbc-sqlite3", :platform => :jruby
+  gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+  gem "activerecord-jdbcmysql-adapter", :platform => :jruby
+  gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
+  gem 'activesupport', '~> 3.2'
+  gem 'activemodel', '~> 3.2'
+  gem 'activerecord', '~> 3.2'
 end
 
 gemspec :path => "../"

data/gemfiles/rails4.gemfile

@@ -3,27 +3,27 @@ source "https://rubygems.org"
 gem 'arel', '~> 6.0'
 
 group :development, :test do
-	gem 'activesupport', '~> 4.0'
-	gem 'activemodel', '~> 4.0'
-	gem 'activerecord', '~> 4.0'
+  gem 'activesupport', '~> 4.0'
+  gem 'activemodel', '~> 4.0'
+  gem 'activerecord', '~> 4.0'
 
-	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
-	gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
-    gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
+  gem "sqlite3", '<= 1.3.13', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
 
-    gem "tiny_tds", :platforms => [:mri, :mingw, :mswin] if RUBY_PLATFORM =~ /windows/
-    gem "activerecord-sqlserver-adapter", '~> 4.2.0', :platforms => [:mri, :mingw, :mswin] if RUBY_PLATFORM =~ /windows/
+  gem "tiny_tds", :platforms => [:mri, :mingw, :mswin] if RUBY_PLATFORM =~ /windows/
+  gem "activerecord-sqlserver-adapter", '~> 4.2.0', :platforms => [:mri, :mingw, :mswin] if RUBY_PLATFORM =~ /windows/
 
-	gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
-	gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0' if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0' if ENV.has_key? 'ORACLE_HOME'
 
-	# for JRuby
-	gem 'activerecord-jdbc-adapter', :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
+  # for JRuby
+  gem 'activerecord-jdbc-adapter', :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/rails5_0.gemfile

@@ -3,27 +3,27 @@ source "https://rubygems.org"
 gem 'arel', '~> 7.0'
 
 group :development, :test do
-	gem 'activesupport', '~> 5.0'
-	gem 'activemodel', '~> 5.0'
-	gem 'activerecord', '5.0.6'
+  gem 'activesupport', '~> 5.0'
+  gem 'activemodel', '~> 5.0'
+  gem 'activerecord', '5.0.6'
 
-	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
-	gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
-    gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
+  gem "sqlite3", '<= 1.3.13', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
 
-    gem "tiny_tds", :platforms => [:mri, :mingw] if RUBY_PLATFORM =~ /windows/
-#    gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+  gem "tiny_tds", :platforms => [:mri, :mingw] if RUBY_PLATFORM =~ /windows/
+  #gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
 
-	gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
-	gem 'activerecord-oracle_enhanced-adapter', '~> 1.7' if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 1.7' if ENV.has_key? 'ORACLE_HOME'
 
-	# for JRuby
-	gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v50.0', :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
+  # for JRuby
+  gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v50.0', :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/rails5_1_4.gemfile

@@ -4,27 +4,27 @@ gem 'rails', '5.1.4'
 gem 'arel', '~> 8'
 
 group :development, :test do
-	gem 'activesupport', '5.1.4'
-	gem 'activemodel', '5.1.4'
-	gem 'activerecord', '5.1.4'
+  gem 'activesupport', '5.1.4'
+  gem 'activemodel', '5.1.4'
+  gem 'activerecord', '5.1.4'
 
-	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
-	gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
-    gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
+  gem "sqlite3", '<= 1.3.13', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
 
-    gem "tiny_tds", :platforms => [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
-#    gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+  gem "tiny_tds", :platforms => [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
+  #gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
 
-	gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
-	gem 'activerecord-oracle_enhanced-adapter', '~> 1.8' if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 1.8' if ENV.has_key? 'ORACLE_HOME'
 
-	# for JRuby
-	gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v51.0', :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
+  # for JRuby
+  gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v51.0', :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/rails5_2.gemfile

@@ -4,27 +4,27 @@ gem 'rails', '~> 5.2.0'
 gem 'arel', '~> 9'
 
 group :development, :test do
-	gem 'activesupport', '~> 5.2.0'
-	gem 'activemodel', '~> 5.2.0'
-	gem 'activerecord', '~> 5.2.0'
+  gem 'activesupport', '~> 5.2.0'
+  gem 'activemodel', '~> 5.2.0'
+  gem 'activerecord', '~> 5.2.0'
 
-	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
-	gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
-    gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
+  gem "sqlite3", '<= 1.3.13', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
 
-    gem "tiny_tds", :platforms => [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
-#    gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+  gem "tiny_tds", :platforms => [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
+  #gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
 
-	gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
-	gem 'activerecord-oracle_enhanced-adapter', '~> 5.2.0' if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 5.2.0' if ENV.has_key? 'ORACLE_HOME'
 
-	# for JRuby
-	gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v52.0', :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
+  # for JRuby
+  gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v52.0', :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/lib/arel_extensions/boolean_functions.rb

@@ -1,20 +1,33 @@
 require 'arel_extensions/nodes/then'
 
 module ArelExtensions
-	module BooleanFunctions
+  module BooleanFunctions
 
-		def ⋀(other)
-			self.and(other)
-		end
+    def ⋀(other)
+      self.and(other)
+    end
 
-		def ⋁(other)
-			self.or(other)
-		end
+    def and *others
+      Arel::Nodes::And.new([self]+ others.flatten)
+    end
 
-		def then(t, f = nil)
-        	ArelExtensions::Nodes::Then.new [self, t, f]
-		end
-	end
+    def ⋁(other)
+      self.or(other)
+    end
+
+    def or *others
+      args = others.flatten
+      if args.length == 1
+        Arel::Nodes::Or.new(self, args.first)
+      else
+        ArelExtensions::Nodes::Or.new([self]+ args)
+      end
+    end
+
+    def then(t, f = nil)
+      ArelExtensions::Nodes::Then.new [self, t, f]
+    end
+  end
 end
 
 Arel::Nodes::And.class_eval do
@@ -24,3 +37,9 @@ end
 Arel::Nodes::Or.class_eval do
   include ArelExtensions::BooleanFunctions
 end
+
+ArelExtensions::Nodes.const_set('Or',Class.new(Arel::Nodes::And)).class_eval do
+  include ArelExtensions::BooleanFunctions
+end
+
+

data/lib/arel_extensions/math.rb

@@ -15,123 +15,122 @@ module ArelExtensions
     #String and others (convert in string)  allows you to concatenate 2 or more strings together.
     #Date and integer adds or subtracts a specified time interval from a date.
     def +(other)
-	  case self
-	  when Arel::Nodes::Quoted
-		return self.concat(other)  
-	  when Arel::Nodes::Grouping
-		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)
-		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)
-		  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)
-	  else		  
-		  begin 
-			col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
-		  rescue Exception
-			col = nil
-		  end
-		  if (!col) #if the column doesn't exist in the database
-			Arel::Nodes::Grouping.new(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)
-			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)
-			elsif arg == :datetime || arg == :date
-			  ArelExtensions::Nodes::DateAdd.new [self, other]
-			elsif arg == :string || arg == :text
-			  self.concat(other)
-			end  
-		  end
-	  end
+      case self
+        when Arel::Nodes::Quoted
+          return self.concat(other)
+        when Arel::Nodes::Grouping
+          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)
+          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)
+        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)
+      else
+        begin
+          col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
+        rescue Exception
+          col = nil
+        end
+        if (!col) #if the column doesn't exist in the database
+          Arel::Nodes::Grouping.new(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)
+          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)
+          elsif arg == :datetime || arg == :date
+            ArelExtensions::Nodes::DateAdd.new [self, other]
+          elsif arg == :string || arg == :text
+            self.concat(other)
+          end
+        end
+      end
     end
 
     #function returns the time between two dates
     #function returns the substraction between two ints
     def -(other)
-	  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])
-		else		
-		  Arel::Nodes::Grouping.new(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)) # ??
-		  when :integer, :decimal, :float, :number
-			Arel::Nodes::Grouping.new(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))
-		  end 
-	  when Arel::Nodes::Function
-		Arel::Nodes::Grouping.new(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]
-		rescue Exception
-			col = nil
-		end
-		if (!col) #if the column doesn't exist in the database
-			Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, 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
-					col = nil
-				  end
-				  if (!col2) #if the column doesn't exist in the database
-					ArelExtensions::Nodes::DateSub.new [self, other]
-				  else
-					arg2 = col2.type
-					if arg2 == :date || arg2 == :datetime
-					  ArelExtensions::Nodes::DateDiff.new [self, other]
-					else
-					  ArelExtensions::Nodes::DateSub.new [self, other]
-					end
-				  end  
-				when Arel::Nodes::Node, DateTime, Time, String, Date
-				  ArelExtensions::Nodes::DateDiff.new [self, other]
-				when Integer
-				  ArelExtensions::Nodes::DateSub.new [self, other]
-				end
-			else
-				case other
-				when Integer, Float, BigDecimal
-				  Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other.to_s)))
-				when String
-				  Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other)))
-				else
-				  Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
-				end
-			end
-		end
-	  end
+      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])
+        else
+          Arel::Nodes::Grouping.new(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)) # ??
+        when :integer, :decimal, :float, :number
+          Arel::Nodes::Grouping.new(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))
+        end
+      when Arel::Nodes::Function
+        Arel::Nodes::Grouping.new(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]
+        rescue Exception
+          col = nil
+        end
+        if (!col) #if the column doesn't exist in the database
+          Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, 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
+                col = nil
+              end
+              if (!col2) #if the column doesn't exist in the database
+                ArelExtensions::Nodes::DateSub.new [self, other]
+              else
+                arg2 = col2.type
+                if arg2 == :date || arg2 == :datetime
+                  ArelExtensions::Nodes::DateDiff.new [self, other]
+                else
+                  ArelExtensions::Nodes::DateSub.new [self, other]
+                end
+              end
+            when Arel::Nodes::Node, DateTime, Time, String, Date
+              ArelExtensions::Nodes::DateDiff.new [self, other]
+            when Integer
+              ArelExtensions::Nodes::DateSub.new [self, other]
+            end
+          else
+            case other
+            when Integer, Float, BigDecimal
+              Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other.to_s)))
+            when String
+              Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other)))
+            else
+              Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+            end
+          end
+        end
+      end
     end
-     
+
   end
 end