arel_extensions 1.0.5 → 1.0.6

data/lib/arel_extensions/nodes/power.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Nodes
     class Power < Function
-    	@@return_type = :number
+    	RETURN_TYPE = :number
 		
 		def initialize expr
 		  super [convert_to_node(expr.first), convert_to_number(expr[1])]		  

data/lib/arel_extensions/nodes/rand.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Nodes
     class Rand < Function
-      @@return_type = :number
+      RETURN_TYPE = :number
 
       def initialize(seed = nil)
         if seed && seed.length == 1

data/lib/arel_extensions/nodes/repeat.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Nodes
     class Repeat < Function
-      @@return_type = :string
+      RETURN_TYPE = :string
       
       def initialize expr
         tab = expr.map { |arg|

data/lib/arel_extensions/nodes/replace.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Nodes
     class Replace < Function
-      @@return_type = :string
+      RETURN_TYPE = :string
 
       def initialize expr
         tab = expr.map { |arg|

data/lib/arel_extensions/nodes/round.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Nodes
     class Round < Function
-      @@return_type = :number
+      RETURN_TYPE = :number
 
       def initialize expr
       	if expr && expr.length == 1

data/lib/arel_extensions/nodes/soundex.rb

@@ -4,7 +4,7 @@ module ArelExtensions
 			include Arel::Expressions
 			include ArelExtensions::Comparators			
 							
-			@@return_type = :string
+			RETURN_TYPE = :string
 				
 			def ==(other)
 				Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)

data/lib/arel_extensions/nodes/substring.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Nodes
     class Substring < Function
-    	@@return_type = :string
+    	RETURN_TYPE = :string
 
 		def initialize expr
 			tab = [convert_to_node(expr[0]), convert_to_node(expr[1])]

data/lib/arel_extensions/nodes/trim.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Nodes
     class Trim < Function
-      @@return_type = :string
+      RETURN_TYPE = :string
       
       def initialize expr
         tab = expr.map { |arg|
@@ -17,9 +17,11 @@ module ArelExtensions
     end
 
     class Ltrim < Trim
+	  RETURN_TYPE = :string
     end
 
     class Rtrim < Trim
+      RETURN_TYPE = :string
     end
 
   end

data/lib/arel_extensions/nodes/wday.rb

@@ -14,9 +14,9 @@ module ArelExtensions
         @expressions.first
       end
 
-      def as other
-        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
-      end
+      #def as other
+      #  Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
+      #end
 
     end
   end

data/lib/arel_extensions/string_functions.rb

@@ -1,4 +1,4 @@
-require 'arel_extensions/nodes/concat' if Arel::VERSION.to_i < 7
+require 'arel_extensions/nodes/concat' #if Arel::VERSION.to_i < 7
 require 'arel_extensions/nodes/length'
 require 'arel_extensions/nodes/locate'
 require 'arel_extensions/nodes/substring'
@@ -12,6 +12,7 @@ require 'arel_extensions/nodes/blank'
 require 'arel_extensions/nodes/format'
 require 'arel_extensions/nodes/repeat'
 require 'arel_extensions/nodes/cast'
+require 'arel_extensions/nodes/collate'
       
 
 module ArelExtensions
@@ -36,6 +37,7 @@ module ArelExtensions
     def substring start, len = nil
       ArelExtensions::Nodes::Substring.new [self, start, len]
     end
+    
     def [](start, ind = nil)
       start += 1 if start.is_a?(Integer)
       if start.is_a?(Range)
@@ -75,11 +77,39 @@ module ArelExtensions
     def idoes_not_match_all others, escape = nil
       grouping_all :idoes_not_match, others, escape
     end
+    
+    def ai_matches other # accent insensitive & case sensitive
+      ArelExtensions::Nodes::AiMatches.new(self,other)
+    end
+    
+    def ai_imatches other # accent insensitive & case insensitive
+      ArelExtensions::Nodes::AiIMatches.new(self,other)
+    end
+    
+    def smatches other # accent sensitive & case sensitive
+      ArelExtensions::Nodes::SMatches.new(self,other)
+    end
+    
+    def ai_collate 
+		ArelExtensions::Nodes::Collate.new(self,nil,true,false)
+    end
+    
+    def ci_collate
+		ArelExtensions::Nodes::Collate.new(self,nil,false,true)
+    end
+    
+    def collate ai=false,ci=false, option=nil
+		ArelExtensions::Nodes::Collate.new(self,option,ai,ci)
+    end
 
     #REPLACE function replaces a sequence of characters in a string with another set of characters, not case-sensitive.
     def replace left, right
       ArelExtensions::Nodes::Replace.new [self, left, right]
     end
+    
+    def concat other
+      ArelExtensions::Nodes::Concat.new [self, other]
+    end
 
     def group_concat sep = nil
       ArelExtensions::Nodes::GroupConcat.new [self, sep]

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/mssql.rb

@@ -302,7 +302,9 @@ module ArelExtensions
 
       # TODO; manage case insensitivity
       def visit_ArelExtensions_Nodes_IMatches o, collector
-        collector = infix_value o, collector, ' LIKE '
+        collector = visit o.left.ci_collate, collector
+        collector << ' LIKE '
+        collector = visit o.right.ci_collate, collector
         if o.escape
           collector << ' ESCAPE '
           visit o.escape, collector
@@ -313,13 +315,72 @@ module ArelExtensions
 
       # TODO; manage case insensitivity
       def visit_ArelExtensions_Nodes_IDoesNotMatch o, collector
-        collector = infix_value o, collector, ' NOT LIKE '
+        collector = visit o.left.ci_collate, collector
+        collector << ' NOT LIKE '
+        collector = visit o.right.ci_collate, collector
         if o.escape
           collector << ' ESCAPE '
-          collector = visit o.escape, collector
+          visit o.escape, collector
+        else
+          collector
         end
-        collector
       end
+      
+	  def visit_ArelExtensions_Nodes_AiMatches o, collector 
+        collector = visit o.left.ai_collate, collector
+        collector << ' LIKE '
+        collector = visit o.right.ai_collate, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+	  end
+      
+	  def visit_ArelExtensions_Nodes_AiIMatches o, collector 
+        collector = visit o.left.collate(true,true), collector
+        collector << ' LIKE '
+        collector = visit o.right.collate(true,true), collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+	  end
+
+	  def visit_ArelExtensions_Nodes_SMatches o, collector 
+        collector = visit o.left.collate, collector
+        collector << ' LIKE '
+        collector = visit o.right.collate, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+	  end
+	  
+	  def visit_ArelExtensions_Nodes_Collate o, collector        
+		if o.ai && o.ci
+			collector = visit o.expressions.first, collector
+			collector << ' COLLATE Latin1_General_CI_AI'
+		elsif o.ai
+			collector = visit o.expressions.first, collector
+			collector << ' COLLATE Latin1_General_CS_AI'
+		elsif o.ci
+			collector = visit o.expressions.first, collector
+			collector << ' COLLATE Latin1_General_CI_AS'
+		else
+			collector = visit o.expressions.first, collector
+			collector << ' COLLATE Latin1_General_CS_AS'
+		end       
+        collector
+	  end 
+      
+      
+      
 
       # SQL Server does not know about REGEXP
       def visit_Arel_Nodes_Regexp o, collector
@@ -348,6 +409,29 @@ 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('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
   end

data/lib/arel_extensions/visitors/mysql.rb

@@ -33,9 +33,35 @@ module ArelExtensions
 
       #String functions
       def visit_ArelExtensions_Nodes_IMatches o, collector # insensitive on ASCII
+		collector << 'LOWER('
         collector = visit o.left, collector
-        collector << ' LIKE '
+        collector << ') LIKE LOWER('
         collector = visit o.right, collector
+        collector << ')'
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+      end
+      
+      def visit_ArelExtensions_Nodes_AiMatches o, collector 
+        collector = visit o.left.ai_collate, collector
+        collector << ' LIKE '
+        collector = visit o.right.ai_collate, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+      end
+      
+      def visit_ArelExtensions_Nodes_AiIMatches o, collector 
+        collector = visit o.left.ai_collate, collector
+        collector << ' LIKE '
+        collector = visit o.right.ai_collate, collector
         if o.escape
           collector << ' ESCAPE '
           visit o.escape, collector
@@ -44,10 +70,24 @@ module ArelExtensions
         end
       end
 
+	  def visit_ArelExtensions_Nodes_SMatches o, collector 
+        collector = visit o.left.collate, collector
+        collector << ' LIKE '
+        collector = visit o.right.collate, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+	  end     
+
       def visit_ArelExtensions_Nodes_IDoesNotMatch o, collector
-        collector = visit o.left.lower, collector
-        collector << ' NOT LIKE '
-        collector = visit o.right.lower(o.right), collector
+        collector << 'LOWER('
+        collector = visit o.left, collector
+        collector << ') NOT LIKE LOWER('
+        collector = visit o.right, collector
+        collector << ')'
         if o.escape
           collector << ' ESCAPE '
           visit o.escape, collector
@@ -55,6 +95,30 @@ module ArelExtensions
           collector
         end
       end
+      
+	  def visit_ArelExtensions_Nodes_Collate o, collector
+		case o.expressions.first
+		when Arel::Attributes::Attribute
+			charset = case o.option
+				when 'latin1','utf8'
+					o.option
+				else
+					Arel::Table.engine.connection.charset || 'utf8'
+				end
+		else
+			charset = (o.option == 'latin1') ? 'latin1' : 'utf8'
+		end	
+        collector = visit o.expressions.first, collector
+		if o.ai  
+			collector << " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
+			#doesn't work in latin1
+		elsif o.ci
+			collector << " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
+		else
+			collector << " COLLATE #{charset}_bin"
+		end       
+        collector
+	  end
 
       def visit_ArelExtensions_Nodes_Concat o, collector
 		collector << "CONCAT("

data/lib/arel_extensions/visitors/oracle.rb

@@ -41,9 +41,35 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_IMatches o, collector
-        collector = visit o.left.lower, collector
+		collector << 'LOWER('
+        collector = visit o.left, collector
+        collector << ') LIKE LOWER('
+        collector = visit o.right, collector
+        collector << ')'
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+      end
+      
+      def visit_ArelExtensions_Nodes_AiMatches o, collector
+        collector = visit o.left.ai_collate, collector
+        collector << ' LIKE '
+        collector = visit o.right.ai_collate, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+      end
+      
+      def visit_ArelExtensions_Nodes_AiIMatches o, collector
+        collector = visit o.left.ai_collate, collector
         collector << ' LIKE '
-        collector = visit o.right.lower(o.right), collector
+        collector = visit o.right.ai_collate, collector
         if o.escape
           collector << ' ESCAPE '
           visit o.escape, collector
@@ -51,11 +77,26 @@ module ArelExtensions
           collector
         end
       end
+      
+      def visit_ArelExtensions_Nodes_SMatches o, collector
+		collector = visit o.left, collector
+        collector << ' LIKE '
+        collector = visit o.right, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+      end  
+      
 
       def visit_ArelExtensions_Nodes_IDoesNotMatch o, collector
-        collector = visit o.left.lower, collector
-        collector << ' NOT LIKE '
-        collector = visit o.right.lower(o.right), collector
+        collector << 'LOWER('
+        collector = visit o.left, collector
+        collector << ') NOT LIKE LOWER('
+        collector = visit o.right, collector
+        collector << ')'
         if o.escape
           collector << ' ESCAPE '
           visit o.escape, collector
@@ -63,6 +104,26 @@ module ArelExtensions
           collector
         end
       end
+      
+      def visit_ArelExtensions_Nodes_Collate o, collector        
+		if o.ai
+			collector << "NLSSORT("
+			collector = visit o.expressions.first, collector
+			collector << Arel::Visitors::Oracle::COMMA 
+			collector << "'NLS_SORT = BINARY_AI NLS_COMP = LINGUISTIC'"			
+			collector << ")"
+		elsif o.ci
+			collector << "NLSSORT("
+			collector = visit o.expressions.first, collector
+			collector << Arel::Visitors::Oracle::COMMA 
+			collector << "'NLS_SORT = BINARY_CI NLS_COMP = LINGUISTIC'"			
+			collector << ")"
+		else
+			collector = visit o.expressions.first, collector
+		end       
+        collector
+      end
+      
 
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "(LISTAGG("
@@ -95,7 +156,7 @@ module ArelExtensions
         }
         collector << ")"
         collector
-      end
+      end     
 
       # :date is not possible in Oracle since this type does not really exist
       def visit_ArelExtensions_Nodes_DateDiff o, collector

data/lib/arel_extensions/visitors/postgresql.rb

@@ -131,6 +131,55 @@ module ArelExtensions
         collector << ")"
         collector
       end      
+      
+      def visit_ArelExtensions_Nodes_AiMatches o, collector 
+        collector = visit o.left.ai_collate, collector
+        collector << ' LIKE '
+        collector = visit o.right.ai_collate, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+      end
+      
+      def visit_ArelExtensions_Nodes_AiIMatches o, collector 
+        collector = visit o.left.ai_collate, collector
+        collector << ' ILIKE '
+        collector = visit o.right.ai_collate, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+      end
+      
+      def visit_ArelExtensions_Nodes_SMatches o, collector 
+        collector = visit o.left, collector
+        collector << ' LIKE '
+        collector = visit o.right, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+      end
+      
+	  def visit_ArelExtensions_Nodes_Collate o, collector        
+		if o.ai
+			collector << "unaccent("
+			collector = visit o.expressions.first, collector
+			collector << ")"
+		elsif o.ci
+			collector = visit o.expressions.first, collector
+		else
+			collector = visit o.expressions.first, collector
+		end       
+        collector
+	  end
 
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector = visit o.left, collector

data/lib/arel_extensions/visitors/sqlite.rb

@@ -11,9 +11,9 @@ module ArelExtensions
 
       #String functions
       def visit_ArelExtensions_Nodes_IMatches o, collector # insensitive on ASCII
-        collector = visit o.left, collector
+        collector = visit o.left.ci_collate, collector
         collector << ' LIKE '
-        collector = visit o.right, collector
+        collector = visit o.right.ci_collate, collector
         if o.escape
           collector << ' ESCAPE '
           visit o.escape, collector
@@ -21,6 +21,57 @@ module ArelExtensions
           collector
         end
       end
+      
+	  def visit_ArelExtensions_Nodes_AiMatches o, collector 
+        collector = visit o.left.ai_collate, collector
+        collector << ' LIKE '
+        collector = visit o.right.ai_collate, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+	  end
+      
+	  def visit_ArelExtensions_Nodes_AiIMatches o, collector 
+        collector = visit o.left.collate(true,true), collector
+        collector << ' LIKE '
+        collector = visit o.right.collate(true,true), collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+	  end
+
+	  def visit_ArelExtensions_Nodes_SMatches o, collector 
+        collector = visit o.left.collate, collector
+        collector << ' LIKE '
+        collector = visit o.right.collate, collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
+	  end
+	  
+	  def visit_ArelExtensions_Nodes_Collate o, collector        
+		if o.ai
+			collector = visit o.expressions.first, collector
+			collector << ' COLLATE NOACCENTS'
+		elsif o.ci
+			collector = visit o.expressions.first, collector
+			collector << ' COLLATE NOCASE'
+		else
+			collector = visit o.expressions.first, collector
+			collector << ' COLLATE BINARY'
+		end       
+        collector
+	  end 
+      
 
       def visit_ArelExtensions_Nodes_IDoesNotMatch o, collector
         collector = visit o.left.lower, collector

data/lib/arel_extensions/visitors/to_sql.rb

@@ -211,6 +211,7 @@ module ArelExtensions
       end
 
       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 << Arel::Visitors::ToSql::COMMA
@@ -221,6 +222,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 << Arel::Visitors::ToSql::COMMA

data/lib/arel_extensions.rb

@@ -48,6 +48,7 @@ require 'arel_extensions/math'
 require 'arel_extensions/math_functions'
 require 'arel_extensions/string_functions'
 require 'arel_extensions/set_functions'
+require 'arel_extensions/predications'
 
 require 'arel_extensions/insert_manager'
 
@@ -59,7 +60,6 @@ require 'arel_extensions/nodes/as'
 require 'arel_extensions/nodes/case'
 require 'arel_extensions/nodes/soundex'
 require 'arel_extensions/nodes/cast'
-require 'arel_extensions/predications'
 
 
 
@@ -75,6 +75,7 @@ Arel::Attributes::Attribute.class_eval do
 end
 
 Arel::Nodes::Function.class_eval do
+  include ArelExtensions::Math
   include ArelExtensions::Comparators
   include ArelExtensions::DateDuration
   include ArelExtensions::MathFunctions