arel_extensions 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc05c41fcdcdc0c411f00c62947f80e1004791ae
-  data.tar.gz: 9d8ea2d6dfc47f8268e0eee6fd974fceb2a700e8
+  metadata.gz: 19306a80e5058901e7d9db6da1e05cea53e54f3c
+  data.tar.gz: e79f09a5b088c2d571079b796cb819ddec25ebd3
 SHA512:
-  metadata.gz: ab845f8bd4ad51383c2858542183aedc38cbc1a56158249678fe6f89e5d0aae4b036710fc72d4f5c1b95c33bad430ffbc5844964b31730206c541061cffa1e5f
-  data.tar.gz: c3bce90a322ffadcb309f2e183ef4c323bca7ee70c11d5ec75e12b6e1ad0d409757fda40826ee9f5645bb64eaa39063d74b61ac82f8ba097ac2a677ed25748ce
+  metadata.gz: 29df0447069762b05d5daaa2e53884a3cfa68fef1a67fe9df34ef09923c2ef152da138694a564e59b7302317895b150272f8ef9da5ef2eca20bcde54384068c1
+  data.tar.gz: b9102e07381a96d449c9257467e7437f5c4746c6a9f047172f72daf3d5cf0d1fa9c49d5bc6fcc61119032695ee58e84e4db0fdff068d5d820288a591631a9e1b

data/lib/arel_extensions/nodes/blank.rb

@@ -1,20 +1,23 @@
+require 'arel_extensions/boolean_functions'
+
 module ArelExtensions
   module Nodes
-    class Blank < Function
-    	RETURN_TYPE = :boolean
+    class Blank < Arel::Nodes::Unary
+      include ArelExtensions::BooleanFunctions
+      RETURN_TYPE = :boolean
 
-    	def initialize expr
-#        	super [expr.first.coalesce('').trim.trim("\t").trim("\n")]
-        	super expr
-    	end
+      def initialize expr
+        super expr.first
+      end
     end
 
-    class NotBlank < Function
-    	RETURN_TYPE = :boolean
+    class NotBlank < Arel::Nodes::Unary
+      include ArelExtensions::BooleanFunctions
+      RETURN_TYPE = :boolean
 
-    	def initialize expr
-        	super expr
-    	end
+      def initialize expr
+          super expr.first
+      end
     end
 
   end

data/lib/arel_extensions/nodes/change_case.rb

@@ -1,11 +1,11 @@
 module ArelExtensions
   module Nodes
     class Downcase < Function
-    	RETURN_TYPE = :string
+      RETURN_TYPE = :string
     end
 
     class Upcase < Function
-    	RETURN_TYPE = :string
+      RETURN_TYPE = :string
     end
   end
 end

data/lib/arel_extensions/nodes/collate.rb

@@ -1,18 +1,18 @@
 module ArelExtensions
   module Nodes
     class Collate < Function
-	  RETURN_TYPE = :string
-	  
-	  attr_accessor :ai, :ci, :option
-	  
-	  def initialize left, option=nil, ai=false, ci=false
-		@ai = ai
-		@ci = ci
-		@option = option
-        tab = [convert_to_node(left)]
-        return super(tab)
-	  end
-    
+    RETURN_TYPE = :string
+
+    attr_accessor :ai, :ci, :option
+
+    def initialize left, option=nil, ai=false, ci=false
+      @ai = ai
+      @ci = ci
+      @option = option
+      tab = [convert_to_node(left)]
+      return super(tab)
+    end
+
     end
   end
 end

data/lib/arel_extensions/nodes/function.rb

@@ -32,6 +32,14 @@ module ArelExtensions
         @expressions[1]
       end
 
+      def ==(other)
+        Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
+      end
+
+      def !=(other)
+        Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
+      end
+
       def type_of_attribute(att)
         case att
         when Arel::Attributes::Attribute

data/lib/arel_extensions/nodes/is_null.rb

@@ -1,13 +1,15 @@
+require 'arel_extensions/boolean_functions'
+
 module ArelExtensions
   module Nodes
-    class IsNull < Function
-    	RETURN_TYPE = :boolean
-    	
+    class IsNull < Arel::Nodes::Unary
+      include ArelExtensions::BooleanFunctions
+      RETURN_TYPE = :boolean
+    end
+
+    class IsNotNull < Arel::Nodes::Unary
+      include ArelExtensions::BooleanFunctions
+      RETURN_TYPE = :boolean
     end
-    
-    class IsNotNull < Function
-    	RETURN_TYPE = :boolean
-    	
-    end    
   end
 end

data/lib/arel_extensions/nodes/levenshtein_distance.rb

@@ -1,11 +1,11 @@
 module ArelExtensions
   module Nodes
     class LevenshteinDistance < Function
-    	RETURN_TYPE = :number
-		
-		def initialize expr
-		  super [convert_to_node(expr.first), Arel::Nodes.build_quoted(expr[1])]		  
-		end
+      RETURN_TYPE = :number
+
+      def initialize expr
+        super [convert_to_node(expr.first), Arel::Nodes.build_quoted(expr[1])]
+      end
     end
   end
 end

data/lib/arel_extensions/nodes/locate.rb

@@ -1,14 +1,14 @@
 module ArelExtensions
   module Nodes
     class Locate < Function
-    	RETURN_TYPE = :integer
+      RETURN_TYPE = :integer
 
-		def initialize expr
-			tab = expr.map do |arg|
-			  convert_to_node(arg)
-			end
-			return super(tab)
-		end
+      def initialize expr
+        tab = expr.map do |arg|
+          convert_to_node(arg)
+        end
+        return super(tab)
+      end
 
     end
   end

data/lib/arel_extensions/nodes/union_all.rb

@@ -7,7 +7,7 @@ module ArelExtensions
       end
 
       def union_all(other)
-        return ArelExtensions::Nodes::UnionAll.new(self,other) 
+        return ArelExtensions::Nodes::UnionAll.new(self,other)
       end
 
       def as other

data/lib/arel_extensions/set_functions.rb

@@ -2,25 +2,25 @@ require 'arel_extensions/nodes/union'
 require 'arel_extensions/nodes/union_all'
 
 module ArelExtensions
-	module SetFunctions
+  module SetFunctions
 
-		def +(other)
-			ArelExtensions::Nodes::Union.new(self,other)
-		end		
+    def +(other)
+      ArelExtensions::Nodes::Union.new(self,other)
+    end
 
-		def union(other)
-			ArelExtensions::Nodes::Union.new(self,other)
-		end		
+    def union(other)
+      ArelExtensions::Nodes::Union.new(self,other)
+    end
 
-		def union_all(other)
-			ArelExtensions::Nodes::UnionAll.new(self,other)
-		end
+    def union_all(other)
+      ArelExtensions::Nodes::UnionAll.new(self,other)
+    end
 
-		def uniq
-			self
-		end
+    def uniq
+      self
+    end
 
-	end
+  end
 end
 
 Arel::Nodes::Union.class_eval do

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.2".freeze
+  VERSION = "1.2.3".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -51,14 +51,14 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector << "("
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << " IS NULL)"
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNotNull o, collector
           collector << "("
-          collector = visit o.left, collector
+          collector = visit o.expr, collector
           collector << " IS NOT NULL)"
           collector
       end
@@ -234,11 +234,11 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Blank o, collector
-        visit o.left.coalesce('').trim.length.eq(0), collector
+        visit o.expr.coalesce('').trim.length.eq(0), collector
       end
 
       def visit_ArelExtensions_Nodes_NotBlank o, collector
-        visit o.left.coalesce('').trim.length.gt(0), collector
+        visit o.expr.coalesce('').trim.length.gt(0), collector
       end
 
       def visit_ArelExtensions_Nodes_Format o, collector

data/lib/arel_extensions/visitors/mysql.rb

@@ -284,22 +284,14 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector << "ISNULL("
-        collector = visit o.left, collector
-        if o.right
-          collector << Arel::Visitors::MySQL::COMMA
-          collector = visit o.right, collector
-        end
+        collector = visit o.expr, collector
         collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNotNull o, collector
           collector << "NOT ISNULL("
-          collector = visit o.left, collector
-          if o.right
-            collector << Arel::Visitors::MySQL::COMMA
-            collector = visit o.right, collector
-          end
+          collector = visit o.expr, collector
           collector << ")"
           collector
       end

data/lib/arel_extensions/visitors/oracle.rb

@@ -154,8 +154,8 @@ module ArelExtensions
         o.expressions.each_with_index { |arg, i|
           collector << Arel::Visitors::Oracle::COMMA unless i == 0
           if i > 0 && o.left_node_type == :text
-            if arg == ''
-              collector << 'empty_clob()'
+            if arg == ''  || (arg.is_a?(Arel::Nodes::Quoted) && (arg.expr == ''))
+              collector << "NULL"
             else
               collector << 'TO_CLOB('
               collector = visit arg, collector
@@ -257,9 +257,15 @@ module ArelExtensions
           collector << ")"
           return collector
         when :time
-          collector << "TO_DATE(TO_CHAR("
-          collector = visit o.left, collector
-          collector << ",'HH24:MI:SS'),'HH24:MI:SS')"
+          if (o.left.respond_to?(:return_type) && o.left.return_type == :string) || o.left.is_a?(Arel::Nodes::Quoted)
+            collector << "TO_DATE("
+            collector = visit o.left, collector
+            collector << ",'HH24:MI:SS')"
+          else
+            collector << "TO_DATE(TO_CHAR("
+            collector = visit o.left, collector
+            collector << ",'HH24:MI:SS'),'HH24:MI:SS')"
+          end
           return collector
         when :number, :decimal
           collector << "TO_NUMBER("
@@ -269,9 +275,15 @@ module ArelExtensions
         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')"
+          if (o.left.respond_to?(:return_type) && o.left.return_type == :string) || o.left.is_a?(Arel::Nodes::Quoted)
+            collector << "TO_DATE("
+            collector = visit o.left, collector
+            collector << ",'YYYY-MM-DD')"
+          else
+            collector << "TO_DATE(TO_CHAR("
+            collector = visit o.left, collector
+            collector << ",'YYYY-MM-DD'),'YYYY-MM-DD')"
+          end
           return collector
         when :binary
           as_attr = Arel::Nodes::SqlLiteral.new('binary')
@@ -294,13 +306,13 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << ' IS NULL'
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNotNull o, collector
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << ' IS NOT NULL'
         collector
       end
@@ -407,11 +419,11 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Blank o, collector
-        visit o.left.trim.length.coalesce(0).eq(0), collector
+        visit o.expr.trim.length.coalesce(0).eq(0), collector
       end
 
       def visit_ArelExtensions_Nodes_NotBlank o, collector
-        visit o.left.trim.length.coalesce(0).gt(0), collector
+        visit o.expr.trim.length.coalesce(0).gt(0), collector
       end
 
       def visit_ArelExtensions_Nodes_DateAdd o, collector
@@ -571,7 +583,7 @@ module ArelExtensions
         else
           collector = visit o.left, collector
         end
-        quote = o.right.to_s =~ /[^a-zA-Z_]/ ? '"' : ''
+        quote = o.right.to_s =~ /(\A["].*["]\z)|\A[a-zA-Z_]*\z/ ? '' : '"'
         collector << " AS #{quote}"
         collector = visit o.right, collector
         collector << "#{quote}"

data/lib/arel_extensions/visitors/postgresql.rb

@@ -278,13 +278,13 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << ' IS NULL'
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNotNull o, collector
-          collector = visit o.left, collector
+          collector = visit o.expr, collector
           collector << ' IS NOT NULL'
           collector
       end

data/lib/arel_extensions/visitors/sqlite.rb

@@ -150,13 +150,13 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << ' IS NULL'
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNotNull o, collector
-          collector = visit o.left, collector
+          collector = visit o.expr, collector
           collector << ' IS NOT NULL'
           collector
       end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -218,7 +218,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Blank o, collector
     #visit o.left.coalesce('').trim.length.eq(0), collector
         collector << 'LENGTH(TRIM(COALESCE('
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << Arel::Visitors::ToSql::COMMA
         collector = visit Arel::Nodes.build_quoted(''), collector
         collector << "))) = 0"
@@ -229,7 +229,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_NotBlank o, collector
     #visit o.left.coalesce('').trim.length.gt(0), collector
         collector << 'LENGTH(TRIM(COALESCE('
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << Arel::Visitors::ToSql::COMMA
         collector = visit Arel::Nodes.build_quoted(''), collector
         collector << "))) > 0"
@@ -367,14 +367,14 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector << "ISNULL("
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNotNull o, collector
           collector << "NOT ISNULL("
-          collector = visit o.left, collector
+          collector = visit o.expr, collector
           collector << ")"
           collector
       end

data/test/with_ar/all_agnostic_test.rb

@@ -32,6 +32,7 @@ module ArelExtensions
           t.column :created_at, :date
           t.column :updated_at, :datetime
           t.column :duration, :time
+          t.column :other, :string
           t.column :score, :decimal, :precision => 20, :scale => 10
         end
         @cnx.drop_table(:product_tests) rescue nil
@@ -63,7 +64,7 @@ module ArelExtensions
         @myung = User.where(:id => u.id)
         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
+        u = User.create :age => nil, :name => "Test", :created_at => d, :score => 1.62, :other => 'toto'
         @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)
@@ -77,6 +78,7 @@ module ArelExtensions
         @comments = User.arel_table[:comments]
         @duration = User.arel_table[:duration]
         @price = Product.arel_table[:price]
+        @other = User.arel_table[:other]
         @not_in_table = User.arel_table[:not_in_table]
 
         @ut = User.arel_table
@@ -347,12 +349,16 @@ module ArelExtensions
       def test_coalesce
         assert_equal 'Camille concat', t(@camille, @name.coalesce(nil, "default") + ' concat')
 
+        assert_equal 'toto', t(@test, @other.coalesce(""))
+
         assert_equal ' ', t(@myung, @comments.coalesce("Myung").coalesce('ignored'))
         assert_equal 'Laure', t(@laure, @comments.coalesce("Laure"))
         if @env_db == 'oracle'
           assert_nil t(@laure, @comments.coalesce(""))
+          assert_nil t(@camille, @other.coalesce(""))
         else
           assert_equal('', t(@laure, @comments.coalesce("")))
+          assert_equal '', t(@camille, @other.coalesce(""))
         end
         assert_equal 100, t(@test, @age.coalesce(100))
         assert_equal "Camille", t(@camille, @name.coalesce(nil, "default"))
@@ -470,20 +476,26 @@ module ArelExtensions
           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 Date, t(@lucas,@updated_at.cast(:date)).class unless @env_db == 'oracle' # DateTime
           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 Date.parse("2014-03-03"), t(@lucas,Arel::Nodes.build_quoted('2014-03-03').cast(:date))
+          assert_equal Date.parse("5014-03-03"), t(@lucas,(@age.cast(:string) + '014-03-03').cast(:date))
           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' 
+          assert_equal "12:42:00", t(@lucas,@updated_at.cast(:time).cast(:string)).split('.').first unless @env_db == 'oracle'  #DateTime
         end
       end
 
       def test_is_null
         #puts User.where(@age.is_null).select(@name).to_sql
-        assert_equal "Test", User.where(@age.is_null).select(@name).first.name
+        #puts @age.is_null
+        #puts @age.is_null.inspect
+        #puts @age.is_null.to_sql
+        #puts @age=='34'
+        assert_equal "Test", User.select(@name).where(@age.is_null.to_sql).first.name
       end
 
       def test_math_plus
@@ -778,6 +790,7 @@ module ArelExtensions
         assert_equal 'Arthur', @arthur.select(@name.as('Na Me')).first.attributes["Na Me"]
         assert_equal 'ArthurArthur', @arthur.select((@name+@name).as('Na-Me')).first.attributes["Na-Me"]
       end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel