arel_extensions 1.1.10 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 708dfbc3e662298b3d0cb782b5555182ea9758a3
-  data.tar.gz: 71bb77c55986474cf7a55b4687a2eca93517df47
+  metadata.gz: 1ff15cd23745599b0d20b2ee2057aa60e67f884b
+  data.tar.gz: c9f5c30cc2ba738fbdba34fab575fc93d1d01645
 SHA512:
-  metadata.gz: b98769af5db36a1ad6bc978e5ca5787ef423ad4be3c8708024e199825809fb75fa6a34b7a92468842a55679dd11e4cfb3fcc5dc1105fca6bf7d289f0a120dca0
-  data.tar.gz: ff10289ae7c04a4849bddcdcf5046e9adc7dd20913ab37914d0a81e4825597ce9bff4273608ea524607086191df016d4e6719bf5e3d06258c9135a1756723a65
+  metadata.gz: b03cf4dcfe3f2f1c5c754e3ab42045702b7be1fd906ea44797a70dc6c8d44d6f2a7ed417e247dc95c1f1021bfd1d41574ba2b001fbdb9b7700ec3d8cce3a5126
+  data.tar.gz: cfb1ebf5427a66e1637d3ab023e84eee3cfaa41353bc303ed8fccddfdfd517e670e54f7750b00dd8c14dd9cc5c8b2488d6d8854e221efca3a63887b99430c78b

data/lib/arel_extensions.rb

@@ -72,7 +72,7 @@ module Arel
   def self.rand
     ArelExtensions::Nodes::Rand.new
   end
-  
+
   def self.shorten s
     Base64.urlsafe_encode64(Digest::MD5.new.digest(s)).tr('=', '').tr('-', '_')
   end
@@ -84,6 +84,11 @@ module Arel
       ArelExtensions::Nodes::Json.new(expr)
     end
   end
+
+  def self.when condition
+    ArelExtensions::Nodes::Case.new.when(condition)
+  end
+
 end
 
 Arel::Attributes::Attribute.class_eval do

data/lib/arel_extensions/nodes/cast.rb

@@ -1,54 +1,52 @@
 module ArelExtensions
-	module Nodes
-		class Cast < Function  
-			@return_type = :string
+  module Nodes
+    class Cast < Function
+      @return_type = :string
 
-			attr_accessor :as_attr
+      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 'char', 'varchar', 'text', 'nchar', 'nvarchar', 'ntext'
-					@return_type= :string
-				when :int 
-					@return_type= :number
-				when :float, :decimal
-					@return_type= :decimal
-				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
-					@as_attr = :string
-				end
-				tab = [convert_to_node(expr.first)]
-				return super(tab)
-			end
+      def initialize expr
+        @as_attr = expr[1]
+        case expr[1]
+        when :int, 'bigint', 'int', 'smallint', 'tinyint', 'bit'
+          @return_type = :int
+        when :float, :decimal, 'decimal', 'numeric', 'money', 'smallmoney', 'float', 'real'
+          @return_type = :decimal
+        when :number
+          @return_type = :number
+        when 'char', 'varchar', 'text', 'nchar', 'nvarchar', 'ntext'
+          @return_type = :string
+        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
+          @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
+      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
 
-			def return_type
-				@return_type
-			end
-			
-		end
-	end
+      def return_type
+        @return_type
+      end
+
+    end
+  end
 end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.1.10".freeze
+  VERSION = "1.2.0".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -406,23 +406,30 @@ module ArelExtensions
       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 :date
+          as_attr = Arel::Nodes::SqlLiteral.new('date')
         when :datetime
           as_attr = Arel::Nodes::SqlLiteral.new('datetime')
+        when :number,:decimal, :float
+          as_attr = Arel::Nodes::SqlLiteral.new('decimal(10,6)')
+        when :int
+          collector << "CAST(CAST("
+          collector = visit o.left, collector
+          collector << " AS decimal(10,0)) AS int)"
+          return collector
         when :binary
           as_attr = Arel::Nodes::SqlLiteral.new('binary')
         else
           as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
         end
+        collector << "CAST("
+        collector = visit o.left, collector
+        collector << " AS "
         collector = visit as_attr, collector
         collector << ")"
         collector

data/lib/arel_extensions/visitors/mysql.rb

@@ -290,10 +290,16 @@ module ArelExtensions
           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 :int
+          as_attr = Arel::Nodes::SqlLiteral.new('signed')
+        when :number, :decimal
+          as_attr = Arel::Nodes::SqlLiteral.new('decimal(20,6)')
         when :datetime
           as_attr = Arel::Nodes::SqlLiteral.new('datetime')
+        when :date
+          as_attr = Arel::Nodes::SqlLiteral.new('date')
+        when :time
+          as_attr = Arel::Nodes::SqlLiteral.new('time')
         when :binary
           as_attr = Arel::Nodes::SqlLiteral.new('binary')
         else
@@ -464,6 +470,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_JsonGroup o, collector
+        return super if !json_supported?
         if o.as_array
           collector << 'JSON_ARRAYAGG('
           collector = visit o.hash, collector

data/lib/arel_extensions/visitors/oracle.rb

@@ -222,15 +222,27 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Cast o, collector
         case o.as_attr
         when :string
-          as_attr = Arel::Nodes::SqlLiteral.new('varchar(255)')
+          collector << "TO_CHAR("
+          collector = visit o.left, collector
+          collector << ")"
+          return collector
         when :time
-          left = Arel::Nodes::NamedFunction.new('TO_CHAR',[o.left,Arel::Nodes.build_quoted('HH24:MI:SS')])
-          collector = visit left, collector
+          collector << "TO_DATE(TO_CHAR("
+          collector = visit o.left, collector
+          collector << ",'HH24:MI:SS'),'HH24:MI:SS')"
+          return collector
+        when :number, :decimal
+          collector << "TO_NUMBER("
+          collector = visit o.left, collector
+          collector << ")"
           return collector
-        when :number
-          as_attr = Arel::Nodes::SqlLiteral.new('int')
         when :datetime
           as_attr = Arel::Nodes::SqlLiteral.new('timestamp')
+        when :date
+          collector << "TO_DATE(TO_CHAR("
+          collector = visit o.left, collector
+          collector << ",'YYYY-MM-DD'),'YYYY-MM-DD')"
+          return collector
         when :binary
           as_attr = Arel::Nodes::SqlLiteral.new('binary')
         else

data/lib/arel_extensions/visitors/postgresql.rb

@@ -278,23 +278,30 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Cast o, collector
-        collector << "CAST("
-        collector = visit o.left, collector
-        collector << " AS "
-        case o.as_attr
+        as_attr = case o.as_attr
         when :string
-          as_attr = Arel::Nodes::SqlLiteral.new('varchar')
+          Arel::Nodes::SqlLiteral.new('varchar')
         when :time
-          as_attr = Arel::Nodes::SqlLiteral.new('time')
-        when :number
-          as_attr = Arel::Nodes::SqlLiteral.new('int')
+          Arel::Nodes::SqlLiteral.new('time')
+        when :int
+          collector << "CAST(CAST("
+          collector = visit o.left, collector
+          collector << " AS numeric) AS int)"
+          return collector
+        when :number, :decimal, :float
+          Arel::Nodes::SqlLiteral.new('numeric')
         when :datetime
-          as_attr = Arel::Nodes::SqlLiteral.new('datetime')
+          Arel::Nodes::SqlLiteral.new('timestamp')
+        when :date
+          Arel::Nodes::SqlLiteral.new('date')
         when :binary
-          as_attr = Arel::Nodes::SqlLiteral.new('binary')
+          Arel::Nodes::SqlLiteral.new('binary')
         else
-          as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
+          Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
         end
+        collector << "CAST("
+        collector = visit o.left, collector
+        collector << " AS "
         collector = visit as_attr, collector
         collector << ")"
         collector

data/lib/arel_extensions/visitors/to_sql.rb

@@ -265,9 +265,9 @@ module ArelExtensions
         case o.as_attr
         when :string
           as_attr = Arel::Nodes::SqlLiteral.new('char')
-        when :number  
+        when :int
           as_attr = Arel::Nodes::SqlLiteral.new('int')
-        when :decimal, :float  
+        when :decimal, :float, :number
           as_attr = Arel::Nodes::SqlLiteral.new('float')
         when :datetime  
           as_attr = Arel::Nodes::SqlLiteral.new('datetime')

data/test/with_ar/all_agnostic_test.rb

@@ -433,9 +433,24 @@ module ArelExtensions
       # TODO; cast types
       def test_cast_types
         assert_equal "5", t(@lucas, @age.cast(:string))
-        if @env_db == 'mysql' || @env_db == 'postgresql' || @env_db == 'oracle'
-          assert_equal 1, t(@laure,ArelExtensions::Nodes::Case.new.when(@duration.cast(:time).cast(:string).eq("12:42:21")).then(1).else(0))
-          assert_equal 1, t(@laure,ArelExtensions::Nodes::Case.new.when(@duration.cast(:time).eq("12:42:21")).then(1).else(0))
+        updated_at = Time.utc(2014, 3, 3, 12, 42, 0)
+        if @env_db == 'mysql' || @env_db == 'postgresql' || @env_db == 'oracle' || @env_db == 'mssql'
+          assert_equal 1, t(@laure,ArelExtensions::Nodes::Case.new.when(@duration.cast(:time).cast(:string).eq("12:42:21")).then(1).else(0)) unless @env_db == 'oracle' || @env_db == 'mssql'
+          assert_equal 1, t(@laure,ArelExtensions::Nodes::Case.new.when(@duration.cast(:time).eq("12:42:21")).then(1).else(0)) unless @env_db == 'oracle'
+          assert_equal "20.16", t(@laure,@score.cast(:string)).gsub(/[0]*\z/,'')
+          assert_equal "20.161", t(@laure,@score.cast(:string)+1).gsub(/[0]*1\z/,'1')
+          assert_equal 21.16, t(@laure,@score.cast(:string).cast(:decimal)+1)
+          assert_equal 21, t(@laure,@score.cast(:string).cast(:int)+1)
+
+          assert_equal String, t(@lucas,@updated_at.cast(:string)).class
+          assert_equal Date, t(@lucas,@updated_at.cast(:date)).class unless @env_db == 'oracle'
+          assert_equal Time, t(@lucas,@updated_at.cast(:string).cast(:datetime)).class
+          assert_equal Time, t(@lucas,@updated_at.cast(:time)).class
+
+          assert_equal "2014-03-03 12:42:00", t(@lucas,@updated_at.cast(:string)) unless @env_db == 'mssql' #locale dependent
+          assert_equal Time.parse("2014-03-03 12:42:00 UTC"), t(@lucas,@updated_at.cast(:string).cast(:datetime))
+          assert_equal Date.parse("2014-03-03"), t(@lucas,@updated_at.cast(:date))
+          assert_equal "12:42:00", t(@lucas,@updated_at.cast(:time).cast(:string)).split('.').first unless @env_db == 'oracle' 
         end
       end
 
@@ -707,7 +722,7 @@ module ArelExtensions
               parse_json(t(User.group(:score).where(@age.is_not_null).where(@score == 20.16),Arel.json({@age => @name,@name => @age}).group(false)))
         assert_equal ([{"5" => "Lucas"},{ "15" => "Sophie"},{ "23" => "Myung"},{ "25" => "Laure"}]),
               parse_json(t(User.group(:score).where(@age.is_not_null).where(@score == 20.16),Arel.json({@age => @name}).group(true,[@age])))
-              
+
         skip "Not Yet Implemented" if $sqlite || ['oracle','mssql'].include?(@env_db)
         #get
         h1 = Arel.json({@name => @name+@name,@name+"2" => 1})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.2.0
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel