arel_extensions 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa9a662954d3fc3157f1275991e4bf04e13ea63
-  data.tar.gz: ff96c79a38ce3a7f9f675ac3af7596caf689f7f0
+  metadata.gz: c66dd287fd3b27c733812e1bc6c0a516bbc54494
+  data.tar.gz: accb309d06e293a5d5542d76ad4e6dd1c6da8411
 SHA512:
-  metadata.gz: 741e88fb943d9482ff4e7966747f56bf94d0aed909ed6f838e084eef53f89b74a55a90ad22daeaed1a53ee7d05192b52a7c03ca3c9988d32e2e511052821411e
-  data.tar.gz: 75dcbf19327872a9d6b7eab78c334f9875e56ba3ef5f6c2d571c10c6acc2d2eb91254cd757ef97590ea4770689db59e9a9775869f6d7345e8a4eb00572c388d0
+  metadata.gz: e80b2f3c6950084e9b654e7ce213b7cda34b2d1c3142f559c04a4d7be3db090cafb4efd74532f3400b669eaae7f787980804347d7eefc1d398dd8af6849d5a93
+  data.tar.gz: 3e52c96fd662d2e8a6869480ddb53f6714a07dfb6dfdf080a0864d092a14dc53e6f4186d5531467eeac0877e49fe3c559c744919fa0dc93de336d564b4a12caf

data/Rakefile

@@ -1,5 +1,5 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks :name => "arel_extensions"
 
 require 'rake/testtask'
 

data/appveyor.yml

@@ -40,4 +40,9 @@ environment:
     - RUBY_VERSION: 21
     - RUBY_VERSION: 22
     - RUBY_VERSION: 23
-    - RUBY_VERSION: "23-x64"
+    - RUBY_VERSION: 23-x64
+    - RUBY_VERSION: 24
+    - RUBY_VERSION: 24-x64
+    - RUBY_VERSION: 25
+    - RUBY_VERSION: 25-x64
+    

data/gemfiles/rails3.gemfile

@@ -4,7 +4,7 @@ gem 'arel', '~> 3.0' # too old...
 
 group :development, :test do
 	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-	gem "mysql2", :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
@@ -17,4 +17,4 @@ group :development, :test do
 	gem 'activerecord', '~> 3.2'
 end
 
-gemspec :path => "../"
+gemspec :path => "../"

data/gemfiles/rails4.gemfile

@@ -8,7 +8,7 @@ group :development, :test do
 	gem 'activerecord', '~> 4.0'
 
 	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
-	gem "mysql2", :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/

data/gemfiles/rails5_0.gemfile

@@ -8,7 +8,7 @@ group :development, :test do
 	gem 'activerecord', '~> 5.0'
 
 	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
-	gem "mysql2", :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/

data/gemfiles/rails5_1_4.gemfile

@@ -9,7 +9,7 @@ group :development, :test do
 	gem 'activerecord', '5.1.4'
 
 	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
-	gem "mysql2", :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/

data/gemfiles/rails5_2_beta.gemfile

@@ -9,7 +9,7 @@ group :development, :test do
 	gem 'activerecord', '~> 5.2.0.beta2'
 
 	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
-	gem "mysql2", :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/

data/lib/arel_extensions/nodes/cast.rb

@@ -1,52 +1,49 @@
 module ArelExtensions
-  module Nodes
-    class Cast < Function  
-	  @@return_type= :string
-
-      def initialize expr 
-		as_attr = expr[1]
-		case expr[1]
-		when 'bigint', 'int', 'smallint', 'tinyint', 'bit', 'decimal', 'numeric', 'money', 'smallmoney', 'float', 'real'
-			@@return_type= :number
-		when 'datetime', 'smalldatetime'		
-			@@return_type= :ruby_time
-		when 'char', 'varchar', 'text', 'nchar', 'nvarchar', 'ntext'
-			@@return_type= :string
-		when 'binary', 'varbinary', 'image'
-			@@return_type= :binary			
-		when :number 
-			@@return_type= :number
-			as_attr = 'int'
-		when :datetime 
-			@@return_type= :ruby_time
-			as_attr = 'datetime'
-		when :string 
+	module Nodes
+		class Cast < Function  
 			@@return_type= :string
-			as_attr = 'char'
-		when :binary
-			@@return_type= :binary			
-			as_attr = 'binary'
-		else
-			@@return_type= :string
-			as_attr =  'char'
-		end
-        tab = [convert_to_node(expr.first), Arel::Nodes::SqlLiteral.new(as_attr)]
-		return super(tab)
-	  end
-	  
-		def +(other)
-		  case @@return_type
-		  when :string
-			return ArelExtensions::Nodes::Concat.new [self, other]
-		  when :ruby_time
-			ArelExtensions::Nodes::DateAdd.new [self, other]
-		  else
-			Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
-		  end
+
+			attr_accessor :as_attr
+
+			def initialize expr 
+				@as_attr = expr[1]
+				case expr[1]
+				when 'bigint', 'int', 'smallint', 'tinyint', 'bit'
+					@@return_type= :int
+				when 'decimal', 'numeric', 'money', 'smallmoney', 'float', 'real'
+					@@return_type= :decimal
+				when 'datetime', 'smalldatetime','time','date'		
+					@@return_type= :ruby_time
+				when 'char', 'varchar', 'text', 'nchar', 'nvarchar', 'ntext'
+					@@return_type= :string
+				when 'binary', 'varbinary', 'image'
+					@@return_type= :binary			
+				when :int 
+					@@return_type= :number			
+				when :float, :decimal
+					@@return_type= :decimal
+				when :datetime, :time, :date
+					@@return_type= :ruby_time
+				when :binary
+					@@return_type= :binary	
+				else
+					@@return_type= :string
+					@as_attr = :string
+				end
+				tab = [convert_to_node(expr.first)]
+				return super(tab)
+			end
+
+			def +(other)
+				case @@return_type
+				when :string
+					return ArelExtensions::Nodes::Concat.new [self, other]
+				when :ruby_time
+					ArelExtensions::Nodes::DateAdd.new [self, other]
+				else
+					Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+				end
+			end
 		end
-	    
-	
-	  
-    end
-  end
+	end
 end

data/lib/arel_extensions/nodes/formatted_number.rb

@@ -19,38 +19,6 @@ module ArelExtensions
 				super [col]
 			end
 			
-			def locale 
-				@locale
-			end
-					
-			def prefix
-				@prefix
-			end
-			
-			def suffix
-				@suffix
-			end
-			
-			def width
-				@width
-			end
-			
-			def precision
-				@precision	
-			end
-			
-			def type
-				@type
-			end
-			
-			def flags
-				@flags
-			end
-			
-			def scientific_notation
-				@scientific_notation
-			end
-    	end
-				
+		end				
 	end
 end

data/lib/arel_extensions/nodes/function.rb

@@ -47,8 +47,10 @@ module ArelExtensions
         case object
         when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
           object
-        when DateTime, Time
-          Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
+        when DateTime
+		  Arel::Nodes.build_quoted(object, self)
+        when Time
+          Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
         when String
           Arel::Nodes.build_quoted(object)
         when Date
@@ -72,11 +74,15 @@ module ArelExtensions
           case self.type_of_attribute(object)
           when :date
             ArelExtensions::Nodes::Format.new [object, 'yyyy-mm-dd']
+          when :time
+            ArelExtensions::Nodes::Format.new [object, '%H:%M:%S']
           else
             object
           end
-        when DateTime, Time
-          Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
+        when DateTime
+		  Arel::Nodes.build_quoted(object, self)
+        when Time
+          Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
         when String
           Arel::Nodes.build_quoted(object)
         when Date

data/lib/arel_extensions/predications.rb

@@ -13,10 +13,6 @@ module ArelExtensions
 		def imatches(other, escape=nil)
 			ArelExtensions::Nodes::IMatches.new(self, other, escape)
 		end			
-			
-		def cast_as_char
-		  ArelExtensions::Nodes::Cast.new([self,'char'])
-		end
 		
 		def cast right	
 		  ArelExtensions::Nodes::Cast.new([self,right])

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.0.3".freeze
+  VERSION = "1.0.4".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -37,7 +37,7 @@ module ArelExtensions
         }
         collector << ")"
         collector
-      end
+	  end
       
       def visit_ArelExtensions_Nodes_Power o, collector
         collector << "POWER("

data/lib/arel_extensions/visitors/mysql.rb

@@ -1,6 +1,6 @@
 module ArelExtensions
   module Visitors
-    Arel::Visitors::MySQL.class_eval do
+	Arel::Visitors::MySQL.class_eval do
       Arel::Visitors::MySQL::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'WEEKDAY', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
       Arel::Visitors::MySQL::DATE_FORMAT_DIRECTIVES = { # ISO C / POSIX
         '%Y' => '%Y', '%C' =>   '', '%y' => '%y', '%m' => '%m', '%B' => '%M', '%b' => '%b', '%^b' => '%b',  # year, month
@@ -19,7 +19,7 @@ module ArelExtensions
         }
         collector << ")"
         collector
-      end
+	  end
 	  
 	  def visit_ArelExtensions_Nodes_Power o, collector
         collector << "POW("
@@ -29,7 +29,7 @@ module ArelExtensions
         }
         collector << ")"
         collector
-      end
+	  end
 
       #String functions
       def visit_ArelExtensions_Nodes_IMatches o, collector # insensitive on ASCII
@@ -57,16 +57,16 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Concat o, collector
-        collector << "CONCAT("
-        o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::MySQL::COMMA unless i == 0
-          if (arg.is_a?(Numeric)) || (arg.is_a?(Arel::Attributes::Attribute))
+		collector << "CONCAT("
+		o.expressions.each_with_index { |arg, i|
+		collector << Arel::Visitors::MySQL::COMMA unless i == 0
+		  if (arg.is_a?(Numeric)) || (arg.is_a?(Arel::Attributes::Attribute))
 			collector << "CAST("
 			collector = visit arg, collector
 			collector << " AS char)"
 		  else
 			collector = visit arg, collector
-	   	  end
+		  end
         }
         collector << ")"
         collector
@@ -199,6 +199,28 @@ module ArelExtensions
         collector
       end
 
+	  def visit_ArelExtensions_Nodes_Cast o, collector
+        collector << "CAST("
+        collector = visit o.left, collector
+        collector << " AS "
+		case o.as_attr
+		when :string
+			as_attr = Arel::Nodes::SqlLiteral.new('char')
+		when :time
+			as_attr = Arel::Nodes::SqlLiteral.new('time')
+		when :number 
+			as_attr = Arel::Nodes::SqlLiteral.new('int')
+		when :datetime 
+			as_attr = Arel::Nodes::SqlLiteral.new('datetime')
+		when :binary			
+			as_attr = Arel::Nodes::SqlLiteral.new('binary')		
+		else
+			as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
+		end
+        collector = visit as_attr, collector
+        collector << ")"
+        collector
+	  end
 		
     end
   end

data/lib/arel_extensions/visitors/oracle.rb

@@ -18,7 +18,7 @@ module ArelExtensions
         }
         collector << ",10)"
         collector
-      end
+	  end
 	  
 	  def visit_ArelExtensions_Nodes_Power o, collector
         collector << "POWER("
@@ -28,10 +28,8 @@ module ArelExtensions
         }
         collector << ")"
         collector
-      end      
-      
-      
-
+	  end    
+	  
       def visit_ArelExtensions_Nodes_Concat o, collector
         collector << '('
         o.expressions.each_with_index { |arg, i|
@@ -141,6 +139,32 @@ module ArelExtensions
         collector << ")"
         collector
       end
+		
+	  def visit_ArelExtensions_Nodes_Cast o, collector
+        collector << "CAST("
+        left = o.left
+		case o.as_attr
+		when :string
+			as_attr = Arel::Nodes::SqlLiteral.new('varchar(255)')
+		when :time
+			left = Arel::Nodes::NamedFunction.new('TO_CHAR',[left,Arel::Nodes::SqlLiteral.new('HH24:MI:SS')])			
+			as_attr = Arel::Nodes::SqlLiteral.new('varchar(8)')
+		when :number 
+			as_attr = Arel::Nodes::SqlLiteral.new('int')
+		when :datetime 
+			as_attr = Arel::Nodes::SqlLiteral.new('timestamp')
+		when :binary			
+			as_attr = Arel::Nodes::SqlLiteral.new('binary')		
+		else
+			as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
+		end
+        collector = visit left, collector
+        collector << " AS "
+        collector = visit as_attr, collector
+        collector << ")"
+        collector
+	  end
+
 
 
       def visit_ArelExtensions_Nodes_Length o, collector
@@ -359,6 +383,54 @@ module ArelExtensions
     end
 
 
+	def get_time_converted element
+		if element.is_a?(Time)
+			res = ArelExtensions::Nodes::Format.new [element, '%H:%M:%S']
+		elsif element.is_a?(Arel::Attributes::Attribute)
+			col = Arel::Table.engine.connection.schema_cache.columns_hash(element.relation.table_name)[element.name.to_s]
+			if col && (col.type == :time)
+				res = ArelExtensions::Nodes::Format.new [element, '%H:%M:%S']
+			else
+				res = element
+			end
+		else
+			res = element
+		end
+		return res
+	end
+	
+	remove_method(:visit_Arel_Nodes_GreaterThanOrEqual) rescue nil 
+	def visit_Arel_Nodes_GreaterThanOrEqual o, collector
+		collector = visit get_time_converted(o.left), collector
+		collector << " >= "		
+		collector = visit get_time_converted(o.right), collector
+		collector
+	end
+
+	remove_method(:visit_Arel_Nodes_GreaterThan) rescue nil 
+	def visit_Arel_Nodes_GreaterThan o, collector
+		collector = visit get_time_converted(o.left), collector
+		collector << " > "		
+		collector = visit get_time_converted(o.right), collector
+		collector
+	end
+
+	remove_method(:visit_Arel_Nodes_LessThanOrEqual) rescue nil 
+	def visit_Arel_Nodes_LessThanOrEqual o, collector
+		collector = visit get_time_converted(o.left), collector
+		collector << " <= "		
+		collector = visit get_time_converted(o.right), collector
+		collector
+	end
+	
+	remove_method(:visit_Arel_Nodes_LessThan) rescue nil 
+	def visit_Arel_Nodes_LessThan o, collector
+		collector = visit get_time_converted(o.left), collector
+		collector << " < "		
+		collector = visit get_time_converted(o.right), collector
+		collector
+	end
+
 
     end
   end

data/lib/arel_extensions/visitors/postgresql.rb

@@ -199,6 +199,29 @@ module ArelExtensions
         collector << ')'
         collector
       end
+      
+	  def visit_ArelExtensions_Nodes_Cast o, collector
+        collector << "CAST("
+        collector = visit o.left, collector
+        collector << " AS "
+		case o.as_attr
+		when :string
+			as_attr = Arel::Nodes::SqlLiteral.new('varchar')
+		when :time
+			as_attr = Arel::Nodes::SqlLiteral.new('time')
+		when :number 
+			as_attr = Arel::Nodes::SqlLiteral.new('int')
+		when :datetime 
+			as_attr = Arel::Nodes::SqlLiteral.new('datetime')
+		when :binary			
+			as_attr = Arel::Nodes::SqlLiteral.new('binary')		
+		else
+			as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
+		end
+        collector = visit as_attr, collector
+        collector << ")"
+        collector
+	  end
 
 
     end

data/lib/arel_extensions/visitors/sqlite.rb

@@ -242,6 +242,54 @@ module ArelExtensions
 			collector
 		end
 
+		
+		def get_time_converted element
+			if element.is_a?(Time)
+				return Arel::Nodes::NamedFunction.new('STRFTIME',[element, '%H:%M:%S'])
+			elsif element.is_a?(Arel::Attributes::Attribute)
+				col = Arel::Table.engine.connection.schema_cache.columns_hash(element.relation.table_name)[element.name.to_s]
+				if col && (col.type == :time)
+					return Arel::Nodes::NamedFunction.new('STRFTIME',[element, '%H:%M:%S'])
+				else
+					return element
+				end
+			else
+				return element
+			end
+		end
+		
+		remove_method(:visit_Arel_Nodes_GreaterThanOrEqual) rescue nil 
+		def visit_Arel_Nodes_GreaterThanOrEqual o, collector
+			collector = visit get_time_converted(o.left), collector
+			collector << " >= "		
+			collector = visit get_time_converted(o.right), collector
+			collector
+		end
+
+		remove_method(:visit_Arel_Nodes_GreaterThan) rescue nil 
+		def visit_Arel_Nodes_GreaterThan o, collector
+					collector = visit get_time_converted(o.left), collector
+			collector << " > "		
+			collector = visit get_time_converted(o.right), collector
+			collector
+		end
+
+		remove_method(:visit_Arel_Nodes_LessThanOrEqual) rescue nil 
+		def visit_Arel_Nodes_LessThanOrEqual o, collector
+					collector = visit get_time_converted(o.left), collector
+			collector << " <= "		
+			collector = visit get_time_converted(o.right), collector
+			collector
+		end
+		
+		remove_method(:visit_Arel_Nodes_LessThan) rescue nil 
+		def visit_Arel_Nodes_LessThan o, collector
+					collector = visit get_time_converted(o.left), collector
+			collector << " < "		
+			collector = visit get_time_converted(o.right), collector
+			collector
+		end
+
     end
   end
 end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -231,7 +231,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_Format o, collector
         case o.col_type
-        when :date, :datetime
+        when :date, :datetime, :time
           collector << "STRFTIME("
           collector = visit o.right, collector
           collector << Arel::Visitors::ToSql::COMMA
@@ -251,14 +251,30 @@ module ArelExtensions
 
   	  #comparators
 
-      def visit_ArelExtensions_Nodes_Cast o, collector
+	  def visit_ArelExtensions_Nodes_Cast o, collector
         collector << "CAST("
         collector = visit o.left, collector
         collector << " AS "
-        collector = visit o.right, collector
+		case o.as_attr
+		when :string
+			as_attr = Arel::Nodes::SqlLiteral.new('char')
+		when :number 
+			as_attr = Arel::Nodes::SqlLiteral.new('int')
+		when :decimal, :float 
+			as_attr = Arel::Nodes::SqlLiteral.new('float')
+		when :datetime 
+			as_attr = Arel::Nodes::SqlLiteral.new('datetime')
+		when :time
+			as_attr = Arel::Nodes::SqlLiteral.new('time')
+		when :binary			
+			as_attr = Arel::Nodes::SqlLiteral.new('binary')		
+		else
+			as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
+		end
+        collector = visit as_attr, collector
         collector << ")"
         collector
-      end
+	  end
       
       def visit_ArelExtensions_Nodes_Coalesce o, collector
         collector << "COALESCE("
@@ -474,7 +490,7 @@ module ArelExtensions
     
     
     
-	 def visit_ArelExtensions_Nodes_FormattedNumber o, collector		
+	def visit_ArelExtensions_Nodes_FormattedNumber o, collector		
 		col = o.left
 		params = o.locale ? [o.precision,Arel::Nodes.build_quoted(o.locale)] : [o.precision]
 		sign = ArelExtensions::Nodes::Case.new.when(col<0).
@@ -516,10 +532,16 @@ module ArelExtensions
 				after
 			])
 		)				
-		collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector
-		
+		collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
 		collector		
-	  end
+	end
+		
+		remove_method(:visit_Arel_Nodes_LessThan) rescue nil 
+		def visit_Arel_Nodes_LessThan o, collector
+			collector = visit o.left, collector
+			collector << " < "
+			visit o.right, collector
+		end
 		
   	end
   end

data/test/visitors/test_to_sql.rb

@@ -262,12 +262,7 @@ module ArelExtensions
 			.must_be_like %{COALESCE("fake_table"."fake_attribute", 'other_value') ILIKE 'truc'}				
 	  end
 	  
-	  it "should be possible to cast nodes types" do
-	  		
-	    
-		compile(@table[:id].cast_as_char)
-			.must_be_like %{CAST("users"."id" AS char)}
-		
+	  it "should be possible to cast nodes types" do	    
 		compile(@table[:id].cast('char'))
 			.must_be_like %{CAST("users"."id" AS char)}
 		
@@ -276,22 +271,26 @@ module ArelExtensions
 	
 		compile(@table[:id].coalesce(' ').cast(:string))
 			.must_be_like %{CAST(COALESCE("users"."id", ' ') AS char)}
+			
+		compile(@table[:id].cast(:string).coalesce(' '))
+			.must_be_like %{COALESCE(CAST(\"users\".\"id\" AS char), ' ')}
 				
 		compile(@table[:id].cast('char') + ' ')
 			.must_be_like %{CONCAT(CAST("users"."id" AS char), ' ')}
 			
 		compile(@table[:id].cast('int') + 2)
 			.must_be_like %{(CAST("users"."id" AS int) + 2)}
-		
 	  end
-	  
+	  	  
 	  
 	  it "should be possible to specify a cool format on number" do	  
 		#puts @price.format_number("$$ %+030.2e €€","fr_FR").to_sql
-	#	compile(@price.format_number("$$ %+030.2e €€","fr_FR"))
-	#		.must_be_like %{CONCAT('$$ ', CASE \"products\".\"price\" WHEN 0 THEN 0 ELSE CONCAT('', CASE WHEN \"products\".\"price\" < 0 THEN '-' ELSE '+' END, CASE WHEN (ABS(30) - (LENGTH(CONCAT(FORMAT(ABS(\"products\".\"price\") / POW(10, FLOOR(LOG10(ABS(\"products\".\"price\")))), 2, 'fr_FR'), 'e', FORMAT(FLOOR(LOG10(ABS(\"products\".\"price\"))), 0))) + LENGTH(CASE WHEN \"products\".\"price\" < 0 THEN '-' ELSE '+' END))) > 0 THEN REPEAT('0', (ABS(30) - (LENGTH(CONCAT(FORMAT(ABS(\"products\".\"price\") / POW(10, FLOOR(LOG10(ABS(\"products\".\"price\")))), 2, 'fr_FR'), 'e', FORMAT(FLOOR(LOG10(ABS(\"products\".\"price\"))), 0))) + LENGTH(CASE WHEN \"products\".\"price\" < 0 THEN '-' ELSE '+' END)))) ELSE '' END, CONCAT(FORMAT(ABS(\"products\".\"price\") / POW(10, FLOOR(LOG10(ABS(\"products\".\"price\")))), 2, 'fr_FR'), 'e', FORMAT(FLOOR(LOG10(ABS(\"products\".\"price\"))), 0)), '') END, ' €€')}
+		compile(@price.format_number("$$ %+030.2e €€","fr_FR"))
+			.must_be_like %{CONCAT('$$ ', CASE \"products\".\"price\" WHEN 0 THEN 0 ELSE CONCAT('', CASE WHEN \"products\".\"price\" < 0 THEN '-' ELSE '+' END, CASE WHEN (ABS(30) - (LENGTH(CONCAT(FORMAT(ABS(\"products\".\"price\") / POW(10, FLOOR(LOG10(ABS(\"products\".\"price\")))), 2, 'fr_FR'), 'e', FORMAT(FLOOR(LOG10(ABS(\"products\".\"price\"))), 0))) + LENGTH(CASE WHEN \"products\".\"price\" < 0 THEN '-' ELSE '+' END))) > 0 THEN REPEAT('0', (ABS(30) - (LENGTH(CONCAT(FORMAT(ABS(\"products\".\"price\") / POW(10, FLOOR(LOG10(ABS(\"products\".\"price\")))), 2, 'fr_FR'), 'e', FORMAT(FLOOR(LOG10(ABS(\"products\".\"price\"))), 0))) + LENGTH(CASE WHEN \"products\".\"price\" < 0 THEN '-' ELSE '+' END)))) ELSE '' END, CONCAT(FORMAT(ABS(\"products\".\"price\") / POW(10, FLOOR(LOG10(ABS(\"products\".\"price\")))), 2, 'fr_FR'), 'e', FORMAT(FLOOR(LOG10(ABS(\"products\".\"price\"))), 0)), '') END, ' €€')}
 	  end
 	  
+	
+	  
 	  puts "AREL VERSION : " + Arel::VERSION.to_s
     end
   end

data/test/with_ar/all_agnostic_test.rb

@@ -31,6 +31,7 @@ module ArelExtensions
           t.column :comments, :text
           t.column :created_at, :date
           t.column :updated_at, :datetime
+          t.column :duration, :time
           t.column :score, :decimal, :precision => 20, :scale => 10
         end
         @cnx.drop_table(:product_tests) rescue nil
@@ -60,12 +61,13 @@ module ArelExtensions
         @arthur = User.where(:id => u.id)
         u = User.create :age => 23, :name => "Myung", :created_at => d, :score => 20.16, :comments => ' '
         @myung = User.where(:id => u.id)
-        u = User.create :age => 25, :name => "Laure", :created_at => d, :score => 20.16
+        u = User.create :age => 25, :name => "Laure", :created_at => d, :score => 20.16, :duration => Time.utc(2001, 1, 1, 12, 42, 21),:updated_at => Time.utc(2014, 3, 3, 12, 42, 0)
         @laure = User.where(:id => u.id)
         u = User.create :age => nil, :name => "Test", :created_at => d, :score => 1.62
         @test = User.where(:id => u.id)
         u = User.create :age => -42, :name => "Negatif", :comments => '1,22,3,42,2', :created_at => d, :updated_at => d.to_time, :score => 0.17
         @neg = User.where(:id => u.id)
+        
 
         @age = User.arel_table[:age]
         @name = User.arel_table[:name]
@@ -73,6 +75,7 @@ module ArelExtensions
         @created_at = User.arel_table[:created_at]
         @updated_at = User.arel_table[:updated_at]
         @comments = User.arel_table[:comments]
+        @duration = User.arel_table[:duration]
         @price = Product.arel_table[:price]
         @not_in_table = User.arel_table[:not_in_table]
         
@@ -207,16 +210,40 @@ module ArelExtensions
       end
 
       def test_string_comparators
-        skip "Oracle can't use math operators to compare strings" if @env_db == 'oracle' # use GREATEST ?
+        #skip "Oracle can't use math operators to compare strings" if @env_db == 'oracle' # use GREATEST ?
         skip "SQL Server can't use math operators to compare strings" if @env_db == 'mssql' # use GREATEST ?
         if @env_db == 'postgresql' # may return real boolean
           assert t(@neg, @name >= 'Mest') == true || t(@neg, @name >= 'Mest') == 't' # depends of ar version
           assert t(@neg, @name <= (@name + 'Z')) == true || t(@neg, @name <= (@name + 'Z')) == 't'
+        elsif @env_db == 'oracle' 
+		  assert_equal 1, t(@neg, ArelExtensions::Nodes::Case.new.when(@name >= 'Mest').then(1).else(0))
+          assert_equal 1, t(@neg, ArelExtensions::Nodes::Case.new.when(@name <= (@name + 'Z')).then(1).else(0))
+          assert_equal 1, t(@neg, ArelExtensions::Nodes::Case.new.when(@name > 'Mest').then(1).else(0))
+          assert_equal 1, t(@neg, ArelExtensions::Nodes::Case.new.when(@name < (@name + 'Z')).then(1).else(0))
         else
           assert_equal 1, t(@neg, @name >= 'Mest')
           assert_equal 1, t(@neg, @name <= (@name + 'Z'))
+          assert_equal 1, t(@neg, @name > 'Mest')
+          assert_equal 1, t(@neg, @name < (@name + 'Z'))
         end
       end
+      
+      def test_compare_on_date_time_types 
+		skip "Sqlite can't compare time" if $sqlite 		
+		skip "Oracle can't compare time" if @env_db == 'oracle'
+		#@created_at == 2016-05-23
+        assert_includes [true,'t',1], t(@laure, ArelExtensions::Nodes::Case.new.when(@created_at >= '2014-01-01').then(1).else(0))
+        assert_includes [false,'f',0], t(@laure, ArelExtensions::Nodes::Case.new.when(@created_at >= '2018-01-01').then(1).else(0))
+        #@updated_at == 2014-03-03 12:42:00
+	    assert_includes [true,'t',1], t(@laure, ArelExtensions::Nodes::Case.new.when(@updated_at >= '2014-03-03 10:10:10').then(1).else(0))
+	    assert_includes [false,'f',0], t(@laure, ArelExtensions::Nodes::Case.new.when(@updated_at >= '2014-03-03 13:10:10').then(1).else(0))
+	    #@duration == 12:42:21
+	    #puts @laure.select(ArelExtensions::Nodes::Case.new.when(@duration >= '10:10:10').then(1).else(0)).to_sql
+	    #puts @laure.select(ArelExtensions::Nodes::Case.new.when(@duration >= '14:10:10').then(1).else(0)).to_sql
+	    assert_includes [true,'t',1], t(@laure, ArelExtensions::Nodes::Case.new.when(@duration >= '10:10:10').then(1).else(0))
+	    assert_includes [false,'f',0], t(@laure, ArelExtensions::Nodes::Case.new.when(@duration >= '14:10:10').then(1).else(0))
+      end
+      
 
       def test_regexp_not_regexp
         skip "Sqlite version can't load extension for regexp" if $sqlite && $load_extension_disabled
@@ -386,8 +413,13 @@ module ArelExtensions
 
       # TODO; cast types
       def test_cast_types
-        skip "not implemented yet"
-        assert_equal true, t(@arthur, @score =~ /22/)
+		assert_equal "5", t(@lucas, @age.cast(:string))
+		if @env_db == 'mysql' || @env_db == 'postgresql'
+			assert_equal "12:42:21", t(@laure, @duration.cast(:time).cast(:string))
+			assert_equal "12:42:21", t(@laure, @duration.cast(:string))
+			assert_includes [true,1,'t'], t(@laure, @duration.cast('time').cast(:string) > @updated_at.cast('time').cast(:string))
+			assert_includes [false,0,'f'], t(@laure, @duration.cast('time').cast(:string) < @updated_at.cast('time').cast(:string))        
+		end
       end
 
       def test_is_null

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel