arel_extensions 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99e66779787e74a1e41f072a4515bc0aabcd4146
-  data.tar.gz: 5918126e0d59efe520b893949f2f18d9a4c659b1
+  metadata.gz: 7e6925dda8ff2e84e0501da7f283326b69feb5ad
+  data.tar.gz: 8935f5b0b37b38c8bfa63f5858eea8fc00fbe389
 SHA512:
-  metadata.gz: 26f6700d800e3a1426977d924233fc3f7db52482018792e3cd3f1c9338f543132d4fa656fb24b1af47e0c3532b31deab6d26b6b1ec54cc9e0e4e9c9e09febb12
-  data.tar.gz: 15f28347171e501dd95ca8a3ac2a1897d21805f81b5125b0a9765509c01daba4c263babfc53a03226e57d8c8acebfe4f41fb5f9c65b010a2aa7dcd54d7e82bdb
+  metadata.gz: e14c35a07d01adce7aec5b79a5b0e063262cdb4ae35c6684d45ab334ea19fd988790eb158a539fe25d9f6801562295fbb80afc3e630fadf0cd3af58debd08e66
+  data.tar.gz: a81609fa1c9281814271fa5d3fcebf269c08818e60c67c89b550d9072e0196f5606e1cadd3cb8465ab82899b9bec6a4878713b66a01ab62c4015a74c7bfaa58d

data/README.md

@@ -192,7 +192,7 @@ User.connection.execute(insert_manager.to_sql)
   </thead>
   <tbody>
   <tr>
-    <th class="tg-82sq" rowspan="6"><div>Number functions</div></th>
+    <th class="tg-82sq" rowspan="7"><div>Number functions</div></th>
     <td class="tg-yw4l">ABS<br>column.abs<br></td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
@@ -246,6 +246,15 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="ok">✔</td>
   </tr>
+  <tr>
+    <td class="tg-yw4l">POSIX FORMATTING<br>column.format_number("$ %7.2f","en_US")</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ko">not implemented</td>
+  </tr>
   <tr>
     <th class="tg-ffjm" rowspan="17"><div>String functions</div></th>
     <td class="tg-yw4l">CONCAT<br>column + "string"</td>

data/TODO

@@ -14,7 +14,7 @@ TODO:
 New features:
 - POSIX format numbers (%.2f), dates (man 3 printf)
 - cast, to_char
-- auto-remove order by in sub queries
+- auto-remove order by  (when no limit) in sub queries
 - avoid incompatible queries in PgSQL/Oracle/SQLServer when columns are used outside of group by columns (in select or order by)
 
 Tests improvements:

data/lib/arel_extensions/math_functions.rb

@@ -68,7 +68,8 @@ module ArelExtensions
 				:precision  => m[4] != '' ? m[4].to_i : 6,
 				:type       => m[5],
 				:suffix     => m[6],
-				:locale		=> locale
+				:locale		=> locale,
+				:original_string => format_string
 			}
 			# opts = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
 			ArelExtensions::Nodes::FormattedNumber.new [self,opts]

data/lib/arel_extensions/nodes/formatted_number.rb

@@ -3,7 +3,7 @@ module ArelExtensions
 		class FormattedNumber < Function		
 			RETURN_TYPE = :string
 			
-			attr_accessor :locale, :prefix, :suffix, :flags, :scientific_notation, :width,:precision, :type
+			attr_accessor :locale, :prefix, :suffix, :flags, :scientific_notation, :width,:precision, :type, :original_string
 			
 			def initialize expr
 				# expr[1] = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
@@ -16,6 +16,7 @@ module ArelExtensions
 				@type = expr[1][:type]
 				@flags = expr[1][:flags]
 				@scientific_notation = /[eE]/.match(expr[1][:type]) || false
+				@original_string = expr[1][:original_string]
 				super [col]
 			end
 			

data/lib/arel_extensions/nodes/is_null.rb

@@ -4,5 +4,10 @@ module ArelExtensions
     	RETURN_TYPE = :boolean
     	
     end
+    
+    class IsNotNull < Function
+    	RETURN_TYPE = :boolean
+    	
+    end    
   end
 end

data/lib/arel_extensions/null_functions.rb

@@ -8,6 +8,12 @@ module ArelExtensions
     def is_null
       ArelExtensions::Nodes::IsNull.new [self]
     end
+    
+    #ISNOTNULL function lets you return an alternative value when an expression is NOT NULL.
+    def is_not_null
+      ArelExtensions::Nodes::IsNotNull.new [self]
+    end
+    
     # returns the first non-null expr in the expression list. You must specify at least two expressions.
     #If all occurrences of expr evaluate to null, then the function returns null.
     def coalesce *args

data/lib/arel_extensions/predications.rb

@@ -18,6 +18,82 @@ module ArelExtensions
 		  ArelExtensions::Nodes::Cast.new([self,right])
 		end
 
+		def in(other) #In should handle nil element in the Array
+			res = nil
+			case other
+			when Enumerable
+				if other.include?(nil)
+					other.delete(nil)
+					case other.length
+					when 0
+						res = self.is_null
+					when 1
+						res = self.is_null.or(self==other[0])
+					else
+						res = self.is_null.or(Arel::Nodes::In.new(self,other.map{|e| convert_to_node(e)}))
+					end
+				else
+					res = Arel::Nodes::In.new(self,other.map{|e| convert_to_node(e)})
+				end
+			when nil
+				res = self.is_null
+			when Arel::SelectManager
+				res = Arel::Nodes::In.new(self, other.ast)
+			when Range
+				res = self.between(other)
+			else
+				res = Arel::Nodes::In.new(self,convert_to_node(other))
+			end
+			res
+		end
+		
+		def not_in(other) #In should handle nil element in the Array
+			res = nil
+			case other
+			when Enumerable
+				if other.include?(nil)
+					other.delete(nil)
+					case other.length
+					when 0
+						res = self.is_not_null
+					when 1
+						res = self.is_not_null.and(self!=other[0])
+					else
+						res = self.is_not_null.and(Arel::Nodes::NotIn.new(self,other.map{|e| convert_to_node(e)}))
+					end
+				else
+					res = Arel::Nodes::NotIn.new(self,other.map{|e| convert_to_node(e)})
+				end
+			when nil
+				res = self.is_not_null
+			when Arel::SelectManager
+				res = Arel::Nodes::NotIn.new(self, other.ast)
+			else
+				res = Arel::Nodes::NotIn.new(self,convert_to_node(other))
+			end
+			res
+		end
+		
+		def convert_to_node(object)
+			case object
+			when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
+			  object
+			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
+			  Arel::Nodes.build_quoted(object.to_s, self)
+			when NilClass
+			  Arel.sql('NULL')
+			when ActiveSupport::Duration
+			  object.to_i
+			else
+			  raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
+			end
+		end
 		
 	end
 end

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors.rb

@@ -7,6 +7,15 @@ require 'arel_extensions/visitors/mssql'
 
 Arel::Visitors::MSSQL.class_eval do
 	include ArelExtensions::Visitors::MSSQL
+	
+	alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
+	def visit_Arel_Nodes_SelectStatement o, collector	
+		if !collector.value.blank? && o.limit.blank? && o.offset.blank? 		
+			o = o.dup
+			o.orders = []
+		end
+		old_visit_Arel_Nodes_SelectStatement(o,collector)
+	end	
 end
 
 begin 
@@ -15,6 +24,15 @@ begin
 		if Arel::Visitors::VISITORS['sqlserver'] && Arel::Visitors::VISITORS['sqlserver'] != Arel::Visitors::MSSQL
 			Arel::Visitors::VISITORS['sqlserver'].class_eval do
 		  		include ArelExtensions::Visitors::MSSQL
+		  		
+		  		alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
+				def visit_Arel_Nodes_SelectStatement o, collector	
+					if !collector.value.blank? && o.limit.blank? && o.offset.blank? 					
+						o = o.dup
+						o.orders = []
+					end
+					old_visit_Arel_Nodes_SelectStatement(o,collector)
+				end	
 			end 
 		end
 	end

data/lib/arel_extensions/visitors/mssql.rb

@@ -56,6 +56,14 @@ module ArelExtensions
         collector << " IS NULL)"
         collector
       end
+      
+	  def visit_ArelExtensions_Nodes_IsNotNull o, collector
+        collector << "("
+        collector = visit o.left, collector
+#         collector << Arel::Visitors::MSSQL::COMMA
+        collector << " IS NOT NULL)"
+        collector
+	  end
 
       # Deprecated
       def visit_ArelExtensions_Nodes_ConcatOld o, collector
@@ -231,11 +239,11 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Blank o, collector
-        visit o.left.trim.length.eq(0), collector
+        visit o.left.coalesce('').trim.length.eq(0), collector
       end
 
       def visit_ArelExtensions_Nodes_NotBlank o, collector
-        visit o.left.trim.length.gt(0), collector
+        visit o.left.coalesce('').trim.length.gt(0), collector
       end
 
       def visit_ArelExtensions_Nodes_Format o, collector
@@ -432,6 +440,62 @@ module ArelExtensions
         collector << ")"
         collector
 	  end
+	  
+		def visit_ArelExtensions_Nodes_FormattedNumber o, collector		
+			col = o.left
+			locale = Arel::Nodes.build_quoted(o.locale.tr('_','-'))			
+			param = Arel::Nodes.build_quoted("N#{o.precision}")
+			sign = ArelExtensions::Nodes::Case.new.when(col<0).
+								then('-').
+								else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
+			sign_length = o.flags.include?('+') || o.flags.include?(' ') ? 
+						Arel::Nodes.build_quoted(1) : 
+						ArelExtensions::Nodes::Case.new.when(col<0).then(1).else(0)
+			
+			if o.scientific_notation 
+				number = ArelExtensions::Nodes::Concat.new([
+								Arel::Nodes::NamedFunction.new('FORMAT',[
+									col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor),
+									param,
+									locale
+								]),
+								o.type, 
+								Arel::Nodes::NamedFunction.new('FORMAT',[
+									col.abs.log10.floor,
+									Arel::Nodes.build_quoted('N0'),
+									locale
+								])
+							])			
+			else			
+				number = Arel::Nodes::NamedFunction.new('FORMAT',[
+							Arel::Nodes.build_quoted(col.abs),
+							param,
+							locale
+						])				
+			end
+			
+			repeated_char = (o.width == 0) ? Arel::Nodes.build_quoted('') : ArelExtensions::Nodes::Case.new().
+				when(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length)>0).
+				then(Arel::Nodes.build_quoted(
+						o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
+					).repeat(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length))
+				).
+				else('')
+			before = (!o.flags.include?('0'))&&(!o.flags.include?('-')) ? repeated_char : ''
+			middle = (o.flags.include?('0'))&&(!o.flags.include?('-'))  ? repeated_char : ''
+			after  = o.flags.include?('-') ? repeated_char : ''
+			full_number =  col.when(0).then('0').else(
+				ArelExtensions::Nodes::Concat.new([
+					before,
+					sign,
+					middle,
+					number,
+					after
+				])
+			)				
+			collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
+			collector		
+		end
 
     end
   end

data/lib/arel_extensions/visitors/mysql.rb

@@ -255,6 +255,17 @@ module ArelExtensions
         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 << ")"
+        collector
+	  end
 
       def visit_ArelExtensions_Nodes_Wday o, collector
         collector << "(WEEKDAY("
@@ -285,7 +296,63 @@ module ArelExtensions
         collector << ")"
         collector
 	  end
-		
+
+		alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
+		def visit_Arel_Nodes_SelectStatement o, collector	
+			if !collector.value.blank? && o.limit.blank? && o.offset.blank? 				
+				o = o.dup
+				o.orders = []
+			end
+			old_visit_Arel_Nodes_SelectStatement(o,collector)
+		end	
+			
+		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).
+								then('-').
+								else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
+			sign_length = ArelExtensions::Nodes::Length.new([sign])
+			
+			if o.scientific_notation 
+				number = ArelExtensions::Nodes::Concat.new([
+								Arel::Nodes::NamedFunction.new('FORMAT',[
+									col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor)
+								]+params),
+								o.type, 
+								Arel::Nodes::NamedFunction.new('FORMAT',[
+									col.abs.log10.floor,
+									0
+								])
+							])			
+			else
+				number = Arel::Nodes::NamedFunction.new('FORMAT',[col.abs]+params)
+			end
+			
+			repeated_char = (o.width == 0) ? Arel::Nodes.build_quoted('') : ArelExtensions::Nodes::Case.new().
+				when(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length)>0).
+				then(Arel::Nodes.build_quoted(
+						o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
+					).repeat(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length))
+				).
+				else('')
+			before = (!o.flags.include?('0'))&&(!o.flags.include?('-')) ? repeated_char : ''
+			middle = (o.flags.include?('0'))&&(!o.flags.include?('-'))  ? repeated_char : ''
+			after  = o.flags.include?('-') ? repeated_char : ''
+			full_number =  col.when(0).then('0').else(
+				ArelExtensions::Nodes::Concat.new([
+					before,
+					sign,
+					middle,
+					number,
+					after
+				])
+			)				
+			collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
+			collector		
+		end
+
+
     end
   end
 end

data/lib/arel_extensions/visitors/oracle.rb

@@ -9,6 +9,7 @@ module ArelExtensions
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM',                   # hours
         '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz'                                # seconds, subseconds
       }
+      Arel::Visitors::Oracle::NUMBER_COMMA_MAPPING = { 'en_US' => '.,', 'fr_FR' => ', ' }
       
 	  def visit_ArelExtensions_Nodes_Log10 o, collector
         collector << "LOG("
@@ -241,6 +242,12 @@ module ArelExtensions
         collector << ' IS NULL'
         collector
       end
+      
+      def visit_ArelExtensions_Nodes_IsNotNull o, collector
+        collector = visit o.left, collector
+        collector << ' IS NOT NULL'
+        collector
+      end
 
       def visit_ArelExtensions_Nodes_Rand o, collector
         collector << "DBMS_RANDOM.VALUE("
@@ -374,7 +381,9 @@ module ArelExtensions
       end
       
       def visit_ArelExtensions_Nodes_Repeat o, collector
-        collector << "LPAD('',"        
+        collector << "LPAD("
+	    collector = visit o.expressions[0], collector #can't put empty string, otherwise it wouldn't work
+	    collector << Arel::Visitors::ToSql::COMMA
 	    collector = visit o.expressions[1], collector
 	    collector << Arel::Visitors::ToSql::COMMA
 	    collector = visit o.expressions[0], collector
@@ -493,6 +502,69 @@ module ArelExtensions
 		collector
 	end
 
+	
+	alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
+	def visit_Arel_Nodes_SelectStatement o, collector	
+		if !collector.value.blank? && o.limit.blank? && o.offset.blank? 					
+			o = o.dup
+			o.orders = []
+		end
+		old_visit_Arel_Nodes_SelectStatement(o,collector)
+	end	
+
+	def visit_ArelExtensions_Nodes_FormattedNumber o, collector		
+		col = o.left
+		comma = Arel::Visitors::Oracle::NUMBER_COMMA_MAPPING[o.locale] || '.,'	
+		options = Arel::Nodes.build_quoted("NLS_NUMERIC_CHARACTERS = '"+comma+"'")		
+		nines_after = (1..o.precision).map{'9'}.join('')
+		nines_before = (1..16).map{'9'}.join('')
+		sign = ArelExtensions::Nodes::Case.new.when(col<0).
+							then('-').
+							else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
+		sign_length = o.flags.include?('+') || o.flags.include?(' ') ? 
+						Arel::Nodes.build_quoted(1) : 
+						ArelExtensions::Nodes::Case.new.when(col<0).then(1).else(0)
+		
+		if o.scientific_notation 
+			number = Arel::Nodes::NamedFunction.new('TO_CHAR',[
+						Arel::Nodes.build_quoted(col.abs),
+						Arel::Nodes.build_quoted('FM'+nines_before+'D'+nines_after+'EEEE'),
+						options								
+					])	
+			if o.type == 'e'
+			number = number.replace('E','e')
+			end
+		else			
+			number = Arel::Nodes::NamedFunction.new('TO_CHAR',[
+						Arel::Nodes.build_quoted(col.abs),
+						Arel::Nodes.build_quoted('FM'+nines_before+'D'+nines_after),
+						options
+					])				
+		end
+		
+		repeated_char = (o.width == 0) ? Arel::Nodes.build_quoted('') : ArelExtensions::Nodes::Case.new().
+			when(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length)>0).
+			then(Arel::Nodes.build_quoted(
+					o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
+				).repeat(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length))
+			).
+			else('')
+		before = (!o.flags.include?('0'))&&(!o.flags.include?('-')) ? repeated_char : ''
+		middle = (o.flags.include?('0'))&&(!o.flags.include?('-'))  ? repeated_char : ''
+		after  = o.flags.include?('-') ? repeated_char : ''
+		full_number =  col.when(0).then('0').else(
+			ArelExtensions::Nodes::Concat.new([
+				before,
+				sign,
+				middle,
+				number,
+				after
+			])
+		)				
+		collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
+		collector		
+	end
+
 
     end
   end

data/lib/arel_extensions/visitors/postgresql.rb

@@ -8,6 +8,7 @@ module ArelExtensions
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM', # hours
         '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz' # seconds, subseconds
       }
+      Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING = { 'en_US' => '.', 'fr_FR' => ',' }
 
       def visit_ArelExtensions_Nodes_Rand o, collector
         collector << "RANDOM("
@@ -234,6 +235,12 @@ module ArelExtensions
         collector << ' IS NULL'
         collector
       end
+      
+	  def visit_ArelExtensions_Nodes_IsNotNull o, collector
+        collector = visit o.left, collector
+        collector << ' IS NOT NULL'
+        collector
+	  end
 
       def visit_ArelExtensions_Nodes_Sum o, collector
         collector << "sum("
@@ -272,6 +279,67 @@ module ArelExtensions
         collector
 	  end
 
+	  def visit_ArelExtensions_Nodes_FormattedNumber o, collector		
+			col = o.left
+			comma = Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING[o.locale] || '.'			
+			nines_after = (1..o.precision).map{'9'}.join('')
+			nines_before = (1..16).map{'9'}.join('')
+			sign = ArelExtensions::Nodes::Case.new.when(col<0).
+								then('-').
+								else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
+			sign_length = ArelExtensions::Nodes::Length.new([sign])
+			
+			if o.scientific_notation 
+				number = ArelExtensions::Nodes::Concat.new([
+								Arel::Nodes::NamedFunction.new('TO_CHAR',[
+									col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor),
+									Arel::Nodes.build_quoted('FM'+nines_before+'"'+comma+'"V'+nines_after)
+								]),
+								o.type, 
+								Arel::Nodes::NamedFunction.new('TO_CHAR',[
+									col.abs.log10.floor,
+									Arel::Nodes.build_quoted('FM'+nines_before)
+								])
+							])			
+			else			
+				number = Arel::Nodes::NamedFunction.new('TO_CHAR',[
+							Arel::Nodes.build_quoted(col.abs),
+							Arel::Nodes.build_quoted('FM'+nines_before+'"'+comma+'"V'+nines_after)
+						])				
+			end
+			
+			repeated_char = (o.width == 0) ? Arel::Nodes.build_quoted('') : ArelExtensions::Nodes::Case.new().
+				when(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length)>0).
+				then(Arel::Nodes.build_quoted(
+						o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
+					).repeat(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length))
+				).
+				else('')
+			before = (!o.flags.include?('0'))&&(!o.flags.include?('-')) ? repeated_char : ''
+			middle = (o.flags.include?('0'))&&(!o.flags.include?('-'))  ? repeated_char : ''
+			after  = o.flags.include?('-') ? repeated_char : ''
+			full_number =  col.when(0).then('0').else(
+				ArelExtensions::Nodes::Concat.new([
+					before,
+					sign,
+					middle,
+					number,
+					after
+				])
+			)				
+			collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
+			collector		
+	  end
+
+
+		alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
+		def visit_Arel_Nodes_SelectStatement o, collector	
+			if !collector.value.blank? && o.limit.blank? && o.offset.blank?  			
+				o = o.dup
+				o.orders = []
+			end
+			old_visit_Arel_Nodes_SelectStatement(o,collector)
+		end	
 
     end
   end

data/lib/arel_extensions/visitors/sqlite.rb

@@ -8,6 +8,7 @@ module ArelExtensions
         '%H' => '%H', '%k' => '%k', '%I' => '%I', '%l' => '%l', '%P' => '%p', '%p' => '%p', # hours
         '%M' => '%M', '%S' => '%S', '%L' =>   '', '%N' => '%f', '%z' => '' # seconds, subseconds
       }
+      Arel::Visitors::SQLite::NUMBER_COMMA_MAPPING = { 'fr_FR' => {',' => ' ','.' =>','} }
 
       #String functions
       def visit_ArelExtensions_Nodes_IMatches o, collector # insensitive on ASCII
@@ -153,6 +154,12 @@ module ArelExtensions
         collector << ' IS NULL'
         collector
       end
+      
+	  def visit_ArelExtensions_Nodes_IsNotNull o, collector
+        collector = visit o.left, collector
+        collector << ' IS NOT NULL'
+        collector
+	  end
 
       def visit_ArelExtensions_Nodes_Rand o, collector
         collector << "RANDOM("
@@ -319,7 +326,7 @@ module ArelExtensions
 
 		remove_method(:visit_Arel_Nodes_GreaterThan) rescue nil 
 		def visit_Arel_Nodes_GreaterThan o, collector
-					collector = visit get_time_converted(o.left), collector
+			collector = visit get_time_converted(o.left), collector
 			collector << " > "		
 			collector = visit get_time_converted(o.right), collector
 			collector
@@ -327,7 +334,7 @@ module ArelExtensions
 
 		remove_method(:visit_Arel_Nodes_LessThanOrEqual) rescue nil 
 		def visit_Arel_Nodes_LessThanOrEqual o, collector
-					collector = visit get_time_converted(o.left), collector
+			collector = visit get_time_converted(o.left), collector
 			collector << " <= "		
 			collector = visit get_time_converted(o.right), collector
 			collector
@@ -335,12 +342,33 @@ module ArelExtensions
 		
 		remove_method(:visit_Arel_Nodes_LessThan) rescue nil 
 		def visit_Arel_Nodes_LessThan o, collector
-					collector = visit get_time_converted(o.left), collector
+			collector = visit get_time_converted(o.left), collector
 			collector << " < "		
 			collector = visit get_time_converted(o.right), collector
 			collector
 		end
+		
+		
+		alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
+		def visit_Arel_Nodes_SelectStatement o, collector	
+			if !collector.value.blank? && o.limit.blank? 			
+				o = o.dup
+				o.orders = []
+			end
+			old_visit_Arel_Nodes_SelectStatement(o,collector)
+		end	
 
+		def visit_ArelExtensions_Nodes_FormattedNumber o, collector	
+		
+			format = Arel::Nodes::NamedFunction.new('printf',[Arel::Nodes.build_quoted(o.original_string),o.left])					
+			locale_map = Arel::Visitors::SQLite::NUMBER_COMMA_MAPPING[o.locale]
+			if locale_map
+				format = format.replace(',',locale_map[',']).replace('.',locale_map['.'])
+			end
+			visit format, collector
+			collector
+		end
+		
     end
   end
 end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -366,6 +366,13 @@ module ArelExtensions
         collector << ")"
         collector
       end
+      
+	  def visit_ArelExtensions_Nodes_IsNotNull o, collector
+        collector << "NOT ISNULL("
+        collector = visit o.left, collector
+        collector << ")"
+        collector
+	  end
 
       def visit_ArelExtensions_Nodes_Then o, collector
         collector << "CASE WHEN ("
@@ -434,109 +441,67 @@ module ArelExtensions
       end
     end
 
-	def visit_ArelExtensions_Nodes_Union o, collector
-		collector = visit o.left, collector
-		collector << " UNION "
-		collector = visit o.right, collector
-		collector
-	end
-	
-	def visit_ArelExtensions_Nodes_UnionAll o, collector
-		collector = visit o.left, collector
-		collector << " UNION ALL "
-		collector = visit o.right, collector
-		collector
-	end
-	
-	def visit_ArelExtensions_Nodes_As o, collector
-		if o.left.is_a?(ArelExtensions::Nodes::Union) || o.left.is_a?(ArelExtensions::Nodes::UnionAll)
-			collector << "("
+		def visit_ArelExtensions_Nodes_Union o, collector
 			collector = visit o.left, collector
-			collector << ") "			
-			visit o.right, collector
-		else
+			collector << " UNION "
+			collector = visit o.right, collector
+			collector
+		end
+		
+		def visit_ArelExtensions_Nodes_UnionAll o, collector
 			collector = visit o.left, collector
-			collector << " AS "
+			collector << " UNION ALL "
+			collector = visit o.right, collector
+			collector
+		end
+		
+		def visit_ArelExtensions_Nodes_As o, collector
+			if o.left.is_a?(ArelExtensions::Nodes::Union) || o.left.is_a?(ArelExtensions::Nodes::UnionAll)
+				collector << "("
+				collector = visit o.left, collector
+				collector << ") "			
+				visit o.right, collector
+			else
+				collector = visit o.left, collector
+				collector << " AS "
+				visit o.right, collector
+			end
+		end
+		
+		def visit_ArelExtensions_Nodes_Case o, collector
+			collector << "CASE "
+			if o.case
+			  visit o.case, collector
+			  collector << " "
+			end
+			o.conditions.each do |condition|
+			  visit condition, collector
+			  collector << " "
+			end
+			if o.default
+			  visit o.default, collector
+			  collector << " "
+			end
+			collector << "END"
+		end
+
+		def visit_ArelExtensions_Nodes_When o, collector
+			collector << "WHEN "
+			visit o.left, collector
+			collector << " THEN "
 			visit o.right, collector
 		end
-	end
-	
-	def visit_ArelExtensions_Nodes_Case o, collector
-        collector << "CASE "
-        if o.case
-          visit o.case, collector
-          collector << " "
-        end
-        o.conditions.each do |condition|
-          visit condition, collector
-          collector << " "
-        end
-        if o.default
-          visit o.default, collector
-          collector << " "
-        end
-        collector << "END"
-	end
-
-    def visit_ArelExtensions_Nodes_When o, collector
-        collector << "WHEN "
-        visit o.left, collector
-        collector << " THEN "
-        visit o.right, collector
-    end
 
-    def visit_ArelExtensions_Nodes_Else o, collector
-        collector << "ELSE "
-        visit o.expr, collector
-    end
-    
-    
-    
-	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).
-							then('-').
-							else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
-		sign_length = ArelExtensions::Nodes::Length.new([sign])
-		
-		if o.scientific_notation 
-			number = ArelExtensions::Nodes::Concat.new([
-							Arel::Nodes::NamedFunction.new('FORMAT',[
-								col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor)
-							]+params),
-							o.type, 
-							Arel::Nodes::NamedFunction.new('FORMAT',[
-								col.abs.log10.floor,
-								0
-							])
-						])			
-		else
-			number = Arel::Nodes::NamedFunction.new('FORMAT',[col.abs]+params)
+		def visit_ArelExtensions_Nodes_Else o, collector
+			collector << "ELSE "
+			visit o.expr, collector
 		end
 		
-		repeated_char = (o.width == 0) ? Arel::Nodes.build_quoted('') : ArelExtensions::Nodes::Case.new().
-			when(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length)>0).
-			then(Arel::Nodes.build_quoted(
-					o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
-				).repeat(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length))
-			).
-			else('')
-		before = (!o.flags.include?('0'))&&(!o.flags.include?('-')) ? repeated_char : ''
-		middle = (o.flags.include?('0'))&&(!o.flags.include?('-'))  ? repeated_char : ''
-		after  = o.flags.include?('-') ? repeated_char : ''
-		full_number =  col.when(0).then(0).else(
-			ArelExtensions::Nodes::Concat.new([
-				before,
-				sign,
-				middle,
-				number,
-				after
-			])
-		)				
-		collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
-		collector		
-	end
+		
+		
+		def visit_ArelExtensions_Nodes_FormattedNumber o, collector		
+			visit o.left, collector
+		end
 		
 		remove_method(:visit_Arel_Nodes_LessThan) rescue nil 
 		def visit_Arel_Nodes_LessThan o, collector
@@ -545,6 +510,8 @@ module ArelExtensions
 			visit o.right, collector
 		end
 		
+
+		
   	end
   end
 end

data/test/visitors/test_to_sql.rb

@@ -302,15 +302,24 @@ module ArelExtensions
 			.must_be_like %{(CAST("users"."id" AS int) + 2)}
 	  end
 	  	  
+	  it "should be possible to to have nil element in the function NIL" do	 
+		compile(@table[:id].in(nil))
+			.must_be_like %{ISNULL("users"."id")}			
+		compile(@table[:id].in([nil]))
+			.must_be_like %{ISNULL("users"."id")}
+		compile(@table[:id].in([nil,1]))
+			.must_be_like %{(ISNULL("users"."id") OR "users"."id" = 1)}
+		compile(@table[:id].in([nil,1,2]))
+			.must_be_like %{(ISNULL("users"."id") OR "users"."id" IN (1, 2))}
+		compile(@table[:id].in(1))
+			.must_be_like %{"users"."id" IN (1)}
+		compile(@table[:id].in([1]))
+			.must_be_like %{"users"."id" IN (1)}
+		compile(@table[:id].in([1,2]))
+			.must_be_like %{"users"."id" IN (1, 2)}
 	  
-	  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, ' €€')}
 	  end
-	  
-	
-	  
+	 	  
 	  puts "AREL VERSION : " + Arel::VERSION.to_s
     end
   end

data/test/with_ar/all_agnostic_test.rb

@@ -55,7 +55,7 @@ module ArelExtensions
         @lucas = User.where(:id => u.id)
         u = User.create :age => 15, :name => "Sophie", :created_at => d, :score => 20.16
         @sophie = User.where(:id => u.id)
-        u = User.create :age => 20, :name => "Camille", :created_at => d, :score => -20.16
+        u = User.create :age => 20, :name => "Camille", :created_at => d, :score => -20.16, :comments => ''
         @camille = User.where(:id => u.id)
         u = User.create :age => 21, :name => "Arthur", :created_at => d, :score => 65.62, :comments => 'arrêté'
         @arthur = User.where(:id => u.id)
@@ -310,9 +310,14 @@ module ArelExtensions
         assert_equal 0, @myung.where(@name.blank).count
         assert_equal 1, @myung.where(@name.not_blank).count
         assert_equal 1, @myung.where(@comments.blank).count
+        assert_equal 0, @myung.where(@comments.not_blank).count
+        assert_equal 1, @sophie.where(@comments.blank).count
+        assert_equal 0, @sophie.where(@comments.not_blank).count
+        assert_equal 1, @camille.where(@comments.blank).count
+        assert_equal 0, @camille.where(@comments.not_blank).count
+        
         assert_equal 0, @neg.where(@comments.blank).count
         assert_equal 1, @neg.where(@comments.not_blank).count
-        assert_equal 0, @myung.where(@comments.not_blank).count
         assert_equal 'false', t(@myung, @name.blank.then('true', 'false'))
         assert_equal 'true', t(@myung, @name.not_blank.then('true', 'false'))
         assert_equal 'true', t(@myung, @comments.blank.then('true', 'false'))
@@ -437,9 +442,12 @@ module ArelExtensions
         assert_equal "Sophie2", t(@sophie, @name + 2)
         assert_equal "Sophie1997-06-15", t(@sophie, @name + d)
         assert_equal "Sophie15", t(@sophie, @name + @age)
-        assert_equal "SophieSophie", t(@sophie, @name + @name)
+        assert_equal "SophieSophie", t(@sophie, @name + @name)        
+        assert_equal "SophieSophieSophie", t(@sophie, @name + @name + @name)
+        assert_equal "SophieSophieSophie", t(@sophie, @name.concat(@name.concat(@name)))
+        assert_equal "SophieSophieSophie", t(@sophie, @name.concat(@name).concat(@name))
         #FIXME: should work as expected in Oracle
-        assert_equal "Sophie2016-05-23", t(@sophie, @name + @created_at) unless @env_db == 'oracle'
+        assert_equal "Sophie2016-05-23", t(@sophie, @name + @created_at) unless @env_db == 'oracle' 
         #concat Integer
         assert_equal 1, User.where((@age + 10).eq(33)).count
         assert_equal 1, User.where((@age + "1").eq(6)).count
@@ -496,20 +504,22 @@ module ArelExtensions
 	    assert_equal 4, User.find_by_sql(@ut.project(@score.when(20.16).then(1).else(0).as('score_bin')).to_sql).sum(&:score_bin)
 	  end
 	  
-	  def test_format_numbers
-		skip "Not yet implemented" if @env_db != 'mysql'
+	  def test_format_numbers 
 		#score of Arthur = 65.62
+		skip " Works with SQLite if the version used knows printf" if @env_db = $sqlite
 		assert_equal "AZERTY65,62" , t(@arthur, @score.format_number("AZERTY%.2f","fr_FR"))
 		assert_equal "65,62AZERTY" , t(@arthur, @score.format_number("%.2fAZERTY","fr_FR"))
-		assert_equal "$ 65.62 €" , t(@arthur, @score.format_number("$ %.2f €","en_EN"))		
+		assert_equal "$ 65.62 €" , t(@arthur, @score.format_number("$ %.2f €","en_US"))
 		assert_equal "$ 0065,62 €" , t(@arthur, @score.format_number("$ %07.2f €","fr_FR"))
 		assert_equal "$ 65,62   €" , t(@arthur, @score.format_number("$ %-07.2f €","fr_FR"))
 		assert_equal "$ 65,62   €" , t(@arthur, @score.format_number("$ %-7.2f €","fr_FR"))
 		assert_equal "$   65,62 €" , t(@arthur, @score.format_number("$ % 7.2f €","fr_FR"))
+		assert_equal "$    65,6 €" , t(@arthur, @score.format_number("$ % 7.1f €","fr_FR"))
 		assert_equal "$  +65,62 €" , t(@arthur, @score.format_number("$ % +7.2f €","fr_FR"))		
-		assert_equal "$ +065,62 €" , t(@arthur, @score.format_number("$ %0+7.2f €","fr_FR"))	
-		assert_equal "$ 6,56e1 €" , t(@arthur, @score.format_number("$ %.2e €","fr_FR"))			
-		assert_equal "$ 6,56E1 €" , t(@arthur, @score.format_number("$ %.2E €","fr_FR"))	
+		assert_equal "$ +065,62 €" , t(@arthur, @score.format_number("$ %0+7.2f €","fr_FR"))
+		assert_includes ["$ 6,56e1 €","$ 6,56e+01 €"], t(@arthur, @score.format_number("$ %.2e €","fr_FR"))			
+		assert_includes ["$ 6,56E1 €","$ 6,56E+01 €"], t(@arthur, @score.format_number("$ %.2E €","fr_FR"))			
+		assert_includes ["$ 6,562E1 €","$ 6,562E+01 €"], t(@arthur, @score.format_number("$ %.3E €","fr_FR"))	
 		assert_equal "Wrong Format" , t(@arthur, @score.format_number("$ %...234.6F €","fr_FR"))
 	  end
 	  
@@ -554,6 +564,65 @@ module ArelExtensions
 		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("Arrete")).then("1").else("0"))
 		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("Arrêté")).then("1").else("0"))  
 	  end
+	  
+	  def test_subquery_with_order	  
+		assert_equal 8, User.where(:name => User.select(:name).order(:name)).count 
+		assert_equal 8, User.where(@ut[:name].in(@ut.project(@ut[:name]).order(@ut[:name]))).count 
+		if !['mysql'].include?(@env_db)	# MySql can't have limit in IN subquery	
+			assert_equal 2, User.where(:name => User.select(:name).order(:name).limit(2)).count 
+			#assert_equal 6, User.where(:name => User.select(:name).order(:name).offset(2)).count 
+		end
+	  end
+	  
+	  def test_in_with_nil
+		assert_equal true  , @myung.where(@age.in(1)).blank?		
+		assert_equal false , @myung.where(@age.in(23)).blank?
+		assert_equal true  , @myung.where(@age.in([1])).blank?
+		assert_equal true  , @myung.where(@age.in([1,2])).blank?
+		assert_equal false , @myung.where(@age.in([1,23])).blank?
+		assert_equal true  , @myung.where(@age.in(nil)).blank?
+		assert_equal true  , @myung.where(@age.in([nil])).blank?
+		assert_equal true  , @myung.where(@age.in([nil,1])).blank?
+		assert_equal false , @myung.where(@age.in([nil,23])).blank?
+		assert_equal true  , @myung.where(@age.in([nil,1,2])).blank?
+		assert_equal false , @myung.where(@age.in([nil,1,23])).blank?
+		assert_equal true  , @test.where(@age.in(1)).blank?
+		assert_equal true  , @test.where(@age.in([1])).blank?
+		assert_equal true  , @test.where(@age.in([1,2])).blank?
+		assert_equal false , @test.where(@age.in(nil)).blank?
+		assert_equal false , @test.where(@age.in([nil])).blank?
+		assert_equal false , @test.where(@age.in([nil,1])).blank?
+		assert_equal false , @test.where(@age.in([nil,1,2])).blank?
+	  end
+	  
+	  def test_is_not_null
+		assert_equal false , @myung.where(@age.is_not_null).blank?
+		assert_equal true  , @test.where(@age.is_not_null).blank?
+	  end
+	  
+	  def test_not_in_with_nil
+		assert_equal false , @myung.where(@age.not_in(1)).blank?		
+		assert_equal true  , @myung.where(@age.not_in(23)).blank?
+		assert_equal false , @myung.where(@age.not_in([1])).blank?
+		assert_equal false , @myung.where(@age.not_in([1,2])).blank?
+		assert_equal true  , @myung.where(@age.not_in([1,23])).blank?
+		assert_equal false , @myung.where(@age.not_in(nil)).blank?
+		assert_equal false , @myung.where(@age.not_in([nil])).blank?
+		assert_equal false , @myung.where(@age.not_in([nil,1])).blank?
+		assert_equal true  , @myung.where(@age.not_in([nil,23])).blank?
+		assert_equal false , @myung.where(@age.not_in([nil,1,2])).blank?
+		assert_equal true  , @myung.where(@age.not_in([nil,1,23])).blank?
+		
+		#if the column is null, the entry will never be selected with not in (like every DBMS does)
+		#assert_equal false , @test.where(@age.not_in(1)).blank?
+		#assert_equal false , @test.where(@age.not_in([1])).blank?
+		#assert_equal false , @test.where(@age.not_in([1,2])).blank?
+		#assert_equal true  , @test.where(@age.not_in(nil)).blank?
+		#assert_equal true  , @test.where(@age.not_in([nil])).blank?
+		#assert_equal true  , @test.where(@age.not_in([nil,1])).blank?
+		#assert_equal true  , @test.where(@age.not_in([nil,1,2])).blank?
+	  end
+	 
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel