arel_extensions 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c66dd287fd3b27c733812e1bc6c0a516bbc54494
-  data.tar.gz: accb309d06e293a5d5542d76ad4e6dd1c6da8411
+  metadata.gz: 364a53a49187891d3add1e4a814e82260c1d4b7a
+  data.tar.gz: 2d900d081c019b2ae21820e1d58846ef86ed05d6
 SHA512:
-  metadata.gz: e80b2f3c6950084e9b654e7ce213b7cda34b2d1c3142f559c04a4d7be3db090cafb4efd74532f3400b669eaae7f787980804347d7eefc1d398dd8af6849d5a93
-  data.tar.gz: 3e52c96fd662d2e8a6869480ddb53f6714a07dfb6dfdf080a0864d092a14dc53e6f4186d5531467eeac0877e49fe3c559c744919fa0dc93de336d564b4a12caf
+  metadata.gz: f203bce68e820023fc7ab8213a9b252318a81cc5cc9ee4eb736a1910b16ab4c5ce5575c33d4ca8742fc15c3bd21e54cc88b64eaa4133040ce10aee664e2c6300
+  data.tar.gz: 266c7f340ebf29c64adf2064a6d7db4578a4918174bc932811b3b7c242f9c27217e5d094ae407fe34eba8c4509cf687ea6b9d21df85b03b9889c4bce315c6799

data/lib/arel_extensions/nodes/cast.rb

@@ -12,19 +12,19 @@ module ArelExtensions
 					@@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			
+					@@return_type= :string		
 				when :int 
 					@@return_type= :number			
 				when :float, :decimal
 					@@return_type= :decimal
-				when :datetime, :time, :date
-					@@return_type= :ruby_time
-				when :binary
+				when :datetime, 'datetime','smalldatetime'
+					@@return_type= :datetime
+				when :time,'time'
+					@@return_type= :time
+				when :date,'date'
+					@@return_type= :date
+				when :binary, 'binary', 'varbinary', 'image'
 					@@return_type= :binary	
 				else
 					@@return_type= :string

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/oracle.rb

@@ -140,15 +140,14 @@ module ArelExtensions
         collector
       end
 		
-	  def visit_ArelExtensions_Nodes_Cast o, collector
-        collector << "CAST("
-        left = o.left
+	  def visit_ArelExtensions_Nodes_Cast o, collector	
 		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)')
+			left = Arel::Nodes::NamedFunction.new('TO_CHAR',[o.left,Arel::Nodes.build_quoted('HH24:MI:SS')])			
+			collector = visit left, collector
+			return collector
 		when :number 
 			as_attr = Arel::Nodes::SqlLiteral.new('int')
 		when :datetime 
@@ -158,7 +157,8 @@ module ArelExtensions
 		else
 			as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
 		end
-        collector = visit left, collector
+		collector << "CAST("
+        collector = visit o.left, collector
         collector << " AS "
         collector = visit as_attr, collector
         collector << ")"
@@ -399,6 +399,7 @@ module ArelExtensions
 		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

data/test/with_ar/all_agnostic_test.rb

@@ -414,11 +414,8 @@ module ArelExtensions
       # TODO; cast types
       def test_cast_types
 		assert_equal "5", t(@lucas, @age.cast(:string))
-		if @env_db == 'mysql' || @env_db == 'postgresql'
+		if @env_db == 'mysql' || @env_db == 'postgresql' || @env_db == 'oracle'			
 			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
 

metadata

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