arel_extensions 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c913d6441a8028303914d933c15eb3d93d68bd91
-  data.tar.gz: 1825a0b009eb23791d475fc4394e4878fe7d7f7d
+  metadata.gz: 54b97943cc09647feb4ad636b82a817180f8ad36
+  data.tar.gz: eab4a80c6a281d9650667ab513a8b4b6d2848d9b
 SHA512:
-  metadata.gz: dc59a956052f6e95c7245fd1b7c127617c97314aff341a20785b5087a2ae5401df036d3a9ffa340beb8b061aed555d5bfddcfdbb1a35c8585f1ffdeb7905b901
-  data.tar.gz: e60ab20676125801cd4c5c8f2fe4f5f7cc9cf73f7134f9fdc71853a28b32c34a2dbb735926b524575d5226a4ec68ebadd46861a02723dc63087fdf97f09fae7e
+  metadata.gz: ef0d6d47007a551939c09290d5650c464c877bb4f8975ec8dc66e1ddd8c608444653160c926d6d5a80751addf87606280f08a8b93527c9dba33ccb34992ab8c7
+  data.tar.gz: add7b753a66251314396e06444d9a5e2ab90983a93a5bc2e8f5d7167b8f0cae146eb4694228d518245c935f9936dfaa611e38d21c8b34a8e6ee026cdf8427290

data/init/mssql.sql

@@ -56,6 +56,37 @@ BEGIN
 END
 GO
 
+IF OBJECT_ID (N'dbo.LEVENSHTEIN_DISTANCE', N'FN') IS NOT NULL
+    DROP FUNCTION dbo.LEVENSHTEIN_DISTANCE;
+GO
+CREATE FUNCTION dbo.LEVENSHTEIN_DISTANCE(@s nvarchar(4000), @t nvarchar(4000))
+RETURNS int
+AS
+BEGIN
+  DECLARE @sl int, @tl int, @i int, @j int, @sc nchar, @c int, @c1 int,
+    @cv0 nvarchar(4000), @cv1 nvarchar(4000), @cmin int
+  SELECT @sl = LEN(@s), @tl = LEN(@t), @cv1 = '', @j = 1, @i = 1, @c = 0
+  WHILE @j <= @tl
+    SELECT @cv1 = @cv1 + NCHAR(@j), @j = @j + 1
+  WHILE @i <= @sl
+  BEGIN
+    SELECT @sc = SUBSTRING(@s, @i, 1), @c1 = @i, @c = @i, @cv0 = '', @j = 1, @cmin = 4000
+    WHILE @j <= @tl
+    BEGIN
+      SET @c = @c + 1
+      SET @c1 = @c1 - CASE WHEN @sc = SUBSTRING(@t, @j, 1) THEN 1 ELSE 0 END
+      IF @c > @c1 SET @c = @c1
+      SET @c1 = UNICODE(SUBSTRING(@cv1, @j, 1)) + 1
+      IF @c > @c1 SET @c = @c1
+      IF @c < @cmin SET @cmin = @c
+      SELECT @cv0 = @cv0 + NCHAR(@c), @j = @j + 1
+    END
+    SELECT @cv1 = @cv0, @i = @i + 1
+  END
+  RETURN @c 
+END
+GO
+
 --IF OBJECT_ID (N'dbo.SplitString', N'FN') IS NOT NULL
 --    DROP FUNCTION dbo.SplitString;
 --GO

data/lib/arel_extensions/nodes/as.rb

@@ -2,9 +2,9 @@ module ArelExtensions
   module Nodes
     class As < Arel::Nodes::As
     
-	  def initialize left,right
+      def initialize left,right
         return super(left,right)
-	  end
+      end
     end
   end
 end

data/lib/arel_extensions/nodes/case.rb

@@ -1,16 +1,7 @@
 module ArelExtensions
 	module Nodes    
-		if Arel::VERSION.to_i < 7 
+		if Arel::VERSION < "7.1.0"
 			class Case < Arel::Nodes::Node
-				include Arel::Expressions
-				include Arel::OrderPredications
-				include ArelExtensions::Math
-				include ArelExtensions::Comparators
-				include ArelExtensions::Predications
-				include ArelExtensions::MathFunctions
-				include ArelExtensions::StringFunctions
-				include ArelExtensions::NullFunctions
-
 				attr_accessor :case, :conditions, :default
 
 				def initialize expression = nil, default = nil
@@ -18,95 +9,98 @@ module ArelExtensions
 					@conditions = []
 					@default = default
 				end
-				
-				def return_type
-					obj = if @conditions.length > 0
-							@conditions.last.right
-						elsif @default
-							@default.expr
-						else
-							nil
-						end
-					if obj.respond_to?(:return_type)
-						obj.return_type
-					else
-						case obj
-						when Integer, Float
-							:number
-						when Date, DateTime,Time
-							:datetime
-						when Arel::Attributes::Attribute
-							begin 							
-								Arel::Table.engine.connection.schema_cache.columns_hash(obj.relation.table_name)[obj.name.to_s].cast_type.type
-							rescue Exception
-								:string
-							end
-						else
-							:string
-						end
-					end	
-				end
 
-				def when condition, expression = nil
-					@conditions << When.new(condition, expression)
-					self
+				class When < Arel::Nodes::Binary # :nodoc:
 				end
 
-				def then expression
-					@conditions.last.right = expression
-					self
+				class Else < Arel::Nodes::Unary # :nodoc:
 				end
 
-				def else expression
-					@default = Else.new expression
-					self
+			end
+		else
+			class Case < Arel::Nodes::Case
+				class When < Arel::Nodes::When # :nodoc:
 				end
-
-				def initialize_copy other
-					super
-					@case = @case.clone if @case
-					@conditions = @conditions.map { |x| x.clone }
-					@default = @default.clone if @default
+				class Else < Arel::Nodes::Else # :nodoc:
 				end
+			end
+		end
 
-				def hash
-					[@case, @conditions, @default].hash
-				end
+		ArelExtensions::Nodes::Case.class_eval do
+			include Arel::Expressions
+			include Arel::OrderPredications
+			include ArelExtensions::Math
+			include ArelExtensions::Comparators
+			include ArelExtensions::Predications
+			include ArelExtensions::MathFunctions
+			include ArelExtensions::StringFunctions
+			include ArelExtensions::NullFunctions
 
-				def eql? other
-					self.class == other.class &&
-					self.case == other.case &&
-					self.conditions == other.conditions &&
-					self.default == other.default
-				end
-				alias :== :eql?
-				
-				def as other
-					ArelExtensions::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
+			def return_type
+				obj = if @conditions.length > 0
+						@conditions.last.right
+					elsif @default
+						@default.expr
+					else
+						nil
+					end
+				if obj.respond_to?(:return_type)
+					obj.return_type
+				else
+					case obj
+					when Integer, Float
+						:number
+					when Date, DateTime,Time
+						:datetime
+					when Arel::Attributes::Attribute
+						begin
+							Arel::Table.engine.connection.schema_cache.columns_hash(obj.relation.table_name)[obj.name.to_s].type
+						rescue Exception
+							:string
+						end
+					else
+						:string
+					end
 				end
-			end	
-			
-			class When < Arel::Nodes::Binary # :nodoc:
 			end
 
-			class Else < Arel::Nodes::Unary # :nodoc:
-			end		
-			
-		else
-		
-			class Case < Arel::Nodes::Case	
-				include Arel::Expressions
-				include Arel::OrderPredications
-				include ArelExtensions::Math
-				include ArelExtensions::Comparators
-				include ArelExtensions::Predications
-				include ArelExtensions::MathFunctions
-				include ArelExtensions::StringFunctions
-				include ArelExtensions::NullFunctions
-				
+			def when condition, expression = nil
+				@conditions << Case::When.new(condition, expression)
+				self
+			end
+
+			def then expression
+				@conditions.last.right = expression
+				self
+			end
+
+			def else expression
+				@default = Case::Else.new expression
+				self
 			end
-			
-		end		
 
+			def initialize_copy other
+				super
+				@case = @case.clone if @case
+				@conditions = @conditions.map { |x| x.clone }
+				@default = @default.clone if @default
+			end
+
+			def hash
+				[@case, @conditions, @default].hash
+			end
+
+			def eql? other
+				self.class == other.class &&
+				self.case == other.case &&
+				self.conditions == other.conditions &&
+				self.default == other.default
+			end
+			alias :== :eql?
+
+			def as other
+				ArelExtensions::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
+			end
+		end
 	end
 end

data/lib/arel_extensions/nodes/cast.rb

@@ -12,10 +12,10 @@ module ArelExtensions
 					@return_type= :int
 				when 'decimal', 'numeric', 'money', 'smallmoney', 'float', 'real'
 					@return_type= :decimal
-				when 'char', 'varchar', 'text', 'nchar', 'nvarchar', 'ntext'			
-					@return_type= :string		
+				when 'char', 'varchar', 'text', 'nchar', 'nvarchar', 'ntext'
+					@return_type= :string
 				when :int 
-					@return_type= :number			
+					@return_type= :number
 				when :float, :decimal
 					@return_type= :decimal
 				when :datetime, 'datetime','smalldatetime'
@@ -25,7 +25,7 @@ module ArelExtensions
 				when :date,'date'
 					@return_type= :date
 				when :binary, 'binary', 'varbinary', 'image'
-					@return_type= :binary	
+					@return_type= :binary
 				else
 					@return_type= :string
 					@as_attr = :string
@@ -44,10 +44,10 @@ module ArelExtensions
 					Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
 				end
 			end
-			
+
 			def return_type
 				@return_type
-			end			
+			end
 			
 		end
 	end

data/lib/arel_extensions/nodes/coalesce.rb

@@ -1,10 +1,14 @@
 module ArelExtensions
   module Nodes
     class Coalesce < Function
-	  RETURN_TYPE = :string
+      RETURN_TYPE = :string
       
       attr_accessor :left_node_type
 
+      def return_type
+        @left_node_type || self.class.const_get(:RETURN_TYPE)
+      end
+
       def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)

data/lib/arel_extensions/nodes/union.rb

@@ -9,16 +9,16 @@ module ArelExtensions
       def +(other)
         return ArelExtensions::Nodes::Union.new(self,other) 
       end
-      
+
       def union(other)
         return ArelExtensions::Nodes::UnionAll.new(self,other) 
       end
-      
+
       def as other
-        ArelExtensions::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other.to_s)
+        Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
-    
+
   end
 end
 

data/lib/arel_extensions/nodes/union_all.rb

@@ -9,12 +9,12 @@ module ArelExtensions
       def union_all(other)
         return ArelExtensions::Nodes::UnionAll.new(self,other) 
       end
-         
+
       def as other
-        ArelExtensions::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other.to_s)
+        Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
-    
+
   end
 end
 

data/lib/arel_extensions/predications.rb

@@ -1,11 +1,9 @@
 module ArelExtensions
-	module Predications				
-		if Arel::VERSION.to_i < 7 
-			def when right, expression=nil
-				ArelExtensions::Nodes::Case.new(self).when(right,expression)
-			end
+	module Predications
+		def when right, expression=nil
+			ArelExtensions::Nodes::Case.new(self).when(right,expression)
 		end
-		
+
 		def matches(other, escape=nil,case_sensitive= nil)
 			if Arel::VERSION.to_i < 7
 				Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape)

data/lib/arel_extensions/string_functions.rb

@@ -153,5 +153,9 @@ module ArelExtensions
 	  ArelExtensions::Nodes::LevenshteinDistance.new [self, other]
     end
 
+	def edit_distance other
+	  ArelExtensions::Nodes::LevenshteinDistance.new [self, other]
+	end
+
   end
 end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.1.6".freeze
+  VERSION = "1.1.7".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -486,7 +486,16 @@ module ArelExtensions
 			collector << ")"
 			collector
 		end
-
+		
+		
+		def visit_ArelExtensions_Nodes_LevenshteinDistance o, collector
+			collector << "dbo.LEVENSHTEIN_DISTANCE("
+			collector = visit o.left, collector
+			collector << Arel::Visitors::ToSql::COMMA
+			collector = visit o.right, collector
+			collector << ')'
+			collector
+		end
 
     end
   end

data/lib/arel_extensions/visitors/mysql.rb

@@ -95,7 +95,7 @@ module ArelExtensions
           collector
         end
       end
-      
+
 	  def visit_ArelExtensions_Nodes_Collate o, collector
 		case o.expressions.first
 		when Arel::Attributes::Attribute
@@ -108,7 +108,7 @@ module ArelExtensions
 		else
 			charset = (o.option == 'latin1') ? 'latin1' : 'utf8'
 		end	
-        collector = visit o.expressions.first, collector
+		collector = visit o.expressions.first, collector
 		if o.ai  
 			collector << " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
 			#doesn't work in latin1
@@ -116,11 +116,11 @@ module ArelExtensions
 			collector << " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
 		else
 			collector << " COLLATE #{charset}_bin"
-		end       
-        collector
+		end
+		collector
 	  end
 
-      def visit_ArelExtensions_Nodes_Concat o, collector
+	  def visit_ArelExtensions_Nodes_Concat o, collector
 		collector << "CONCAT("
 		o.expressions.each_with_index { |arg, i|
 		collector << Arel::Visitors::MySQL::COMMA unless i == 0
@@ -131,10 +131,10 @@ module ArelExtensions
 		  else
 			collector = visit arg, collector
 		  end
-        }
-        collector << ")"
-        collector
-      end
+		}
+		collector << ")"
+		collector
+	  end
 
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "GROUP_CONCAT("

data/lib/arel_extensions/visitors/oracle.rb

@@ -589,6 +589,15 @@ module ArelExtensions
 			collector << ")"
 			collector
 		end
+		
+		def visit_ArelExtensions_Nodes_LevenshteinDistance o, collector
+			collector << "UTL_MATCH.edit_distance("
+			collector = visit o.left, collector
+			collector << Arel::Visitors::ToSql::COMMA
+			collector = visit o.right, collector
+			collector << ')'
+			collector
+		end
 
 
     end

data/lib/arel_extensions/visitors/oracle12.rb

@@ -1,5 +1,7 @@
 module ArelExtensions
-  module Visitors  
+  module Visitors
+
+  Arel::Visitors.send(:remove_const,'Oracle12') if Arel::Visitors.const_defined?('Oracle12')
 	Arel::Visitors.const_set('Oracle12',Class.new(Arel::Visitors::Oracle)).class_eval do
 		def visit_Arel_Nodes_SelectStatement(o, collector)
 		  # Oracle does not allow LIMIT clause with select for update

data/lib/arel_extensions/visitors/to_sql.rb

@@ -1,7 +1,6 @@
 module ArelExtensions
   module Visitors
-  	Arel::Visitors::ToSql.class_eval do  
-
+	Arel::Visitors::ToSql.class_eval do
 
       # Math Functions
       def visit_ArelExtensions_Nodes_Abs o, collector
@@ -459,7 +458,7 @@ module ArelExtensions
 			if o.left.is_a?(ArelExtensions::Nodes::Union) || o.left.is_a?(ArelExtensions::Nodes::UnionAll)
 				collector << "("
 				collector = visit o.left, collector
-				collector << ") "			
+				collector << ") "
 				visit o.right, collector
 			else
 				collector = visit o.left, collector
@@ -481,24 +480,22 @@ module ArelExtensions
 			if o.default
 			  visit o.default, collector
 			  collector << " "
-			end			
+			end
 			collector << "END"
 		end
 
-		def visit_ArelExtensions_Nodes_When o, collector
+		def visit_ArelExtensions_Nodes_Case_When o, collector
 			collector << "WHEN "
 			visit Arel::Nodes.build_quoted(o.left), collector
 			collector << " THEN "
 			visit Arel::Nodes.build_quoted(o.right), collector
 		end
 
-		def visit_ArelExtensions_Nodes_Else o, collector
+		def visit_ArelExtensions_Nodes_Case_Else o, collector
 			collector << "ELSE "
 			visit Arel::Nodes.build_quoted(o.expr), collector
 		end
-		
-		
-		
+
 		def visit_ArelExtensions_Nodes_FormattedNumber o, collector		
 			visit o.left, collector
 		end
@@ -533,6 +530,6 @@ module ArelExtensions
 			collector
 		end
 		
-  	end
+	end
   end
 end

data/lib/arel_extensions/visitors.rb

@@ -24,16 +24,24 @@ begin
 	if Arel::VERSION.to_i == 6
 		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
+        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
+
+        alias_method :old_primary_Key_From_Table, :primary_Key_From_Table
+				def primary_Key_From_Table t
+					return unless t
+					column_name = @connection.schema_cache.primary_keys(t.name) ||
+					  @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
+					column_name ? t[column_name] : nil
+				end
 			end 
 		end
 	end

data/lib/arel_extensions.rb

@@ -34,11 +34,11 @@ Arel::Nodes::Function.class_eval do
   include Arel::Expressions
 end
 
-if Arel::VERSION.to_i >= 7 
-	Arel::Nodes::Case.class_eval do
-	  include Arel::Math
-	  include Arel::Expressions
-	end
+if Arel::VERSION >= "7.1.0"
+  Arel::Nodes::Case.class_eval do
+    include Arel::Math
+    include Arel::Expressions
+  end
 end
 
 require 'arel_extensions/version'
@@ -133,10 +133,3 @@ Arel::Nodes::As.class_eval do
 end
 
 
-if Arel::VERSION.to_i >= 7 
-	Arel::Nodes::Case.class_eval do
-	  include ArelExtensions::Predications
-	end
-end
-
-

data/test/visitors/test_to_sql.rb

@@ -224,7 +224,7 @@ module ArelExtensions
 			.must_be_like %{(SELECT "users"."name" FROM "users") UNION (SELECT "users"."name" FROM "users") UNION (SELECT "users"."name" FROM "users")}      
 		
 		(c + c).as('union_table').to_sql
-			.must_be_like %{((SELECT "users"."name" FROM "users") UNION (SELECT "users"."name" FROM "users")) union_table}  			     
+			.must_be_like %{((SELECT "users"."name" FROM "users") UNION (SELECT "users"."name" FROM "users")) union_table}
 			
 			
 		c = @table.project(@table[:name])
@@ -239,10 +239,10 @@ module ArelExtensions
 		(c.union_all(c).union_all(c)).to_sql
 			.must_be_like %{(SELECT "users"."name" FROM "users") UNION ALL (SELECT "users"."name" FROM "users") UNION ALL (SELECT "users"."name" FROM "users")}      
 		(c.union_all(c)).as('union_table').to_sql
-			.must_be_like %{((SELECT "users"."name" FROM "users") UNION ALL (SELECT "users"."name" FROM "users")) union_table}  			     
-			
+			.must_be_like %{((SELECT "users"."name" FROM "users") UNION ALL (SELECT "users"."name" FROM "users")) union_table}
+
 	 end
-	 
+
 	 # Case
      it "should accept case clause" do		
 		@table[:name].when("smith").then("cool").when("doe").then("fine").else("uncool").to_sql

data/test/with_ar/all_agnostic_test.rb

@@ -160,7 +160,7 @@ module ArelExtensions
 			assert_equal "Lucas Sophie", t(User.reorder(nil).from(User.select(:name).where(:name => ['Lucas', 'Sophie']).reorder(:name).as('user_tests')), @name.group_concat)
 		else
 			assert_equal "Lucas Sophie", t(User.where(:name => ['Lucas', 'Sophie']).reorder(:name), @name.group_concat(' '))
-			assert_equal "Lucas,Sophie", t(User.where(:name => ['Lucas', 'Sophie']).reorder(:name), @name.group_concat(','))          
+			assert_equal "Lucas,Sophie", t(User.where(:name => ['Lucas', 'Sophie']).reorder(:name), @name.group_concat(','))
 			if @env_db == 'oracle'
 				assert_equal "LucasSophie", t(User.where(:name => ['Lucas', 'Sophie']).reorder(:name), @name.group_concat)
 			else
@@ -343,14 +343,15 @@ module ArelExtensions
           assert_equal('', t(@laure, @comments.coalesce("")))
         end
 
-        if @env_db == 'postgresql'
-          assert_equal 100, t(@test, @age.coalesce(100))
-          assert_equal "Camille", t(@camille, @name.coalesce(nil, "default"))
-          assert_equal 20, t(@test, @age.coalesce(nil, 20))
-        else
-          assert_equal "Camille", t(@camille, @name.coalesce(nil, '20'))
-          assert_equal 20, t(@test, @age.coalesce(nil, 20))
-        end
+
+        assert_equal 100, t(@test, @age.coalesce(100))
+        assert_equal "Camille", t(@camille, @name.coalesce(nil, "default"))
+        assert_equal 20, t(@test, @age.coalesce(nil, 20))
+
+        assert_equal 20, t(@test, @age.coalesce(10)+10)
+        assert_equal 'Laure10', t(@laure, @comments.coalesce("Laure") + 10)
+
+
       end
 
       # Comparators
@@ -497,22 +498,24 @@ module ArelExtensions
         assert_equal 3, User.select('*').from((@ut.project(@age).where(@age.gt(22)).union_all(@ut.project(@age).where(@age.lt(0)))).as('my_union')).length
         assert_equal 3, User.select('*').from((@ut.project(@age).where(@age.eq(20)).union_all(@ut.project(@age).where(@age.eq(23))).union_all(@ut.project(@age).where(@age.eq(21)))).as('my_union')).length
         assert_equal 3, User.select('*').from((@ut.project(@age).where(@age.eq(20)).union_all(@ut.project(@age).where(@age.eq(20))).union_all(@ut.project(@age).where(@age.eq(21)))).as('my_union')).length
+
+        assert (@ut.project(@age) + @ut.project(@age)).as('toto').table_name # as on union should answer to table_name (TableAlias)
       end
 
 	  # Case clause
 	  def test_case
-	    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)	    
-	    assert_equal 2, t(@arthur, @score.when(65.62,1).else(0)+1)    
+	    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)
+	    assert_equal 2, t(@arthur, @score.when(65.62,1).else(0)+1)
 	    assert_equal 0, t(@arthur, @score.when(65.62,1).else(0)-1)
-	    assert_equal "11", t(@arthur, @score.when(65.62).then("1").else("0")+"1") 
-	    assert_equal 66.62, t(@arthur, @score.when(65.62,@score).else(@score)+1) 
-	    assert_equal "65.621", t(@arthur, @score.when(65.62,@score.cast(:string)).else(@score.cast(:string))+1).tr('0','') #tr is here because of precision on cast for some DBMS
+	    assert_equal "11", t(@arthur, @score.when(65.62).then("1").else("0")+"1")
+	    assert_equal 66.62, t(@arthur, @score.when(65.62).then(@score).else(@score)+1)
+	    assert_equal "65.621", t(@arthur, @score.when(65.62).then(@score.cast(:string)).else(@score.cast(:string))+1).tr('0','') #tr is here because of precision on cast for some DBMS
 	  end
 	  
 	  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 "Wrong Format" , t(@arthur, @score.format_number("$ %...234.6F €","fr_FR"))
 		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"))
@@ -523,7 +526,7 @@ module ArelExtensions
 		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 "$  +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_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"))
@@ -535,48 +538,47 @@ module ArelExtensions
 		assert_equal "$ 0,00 €" , t(@arthur, @score.when(65.62).then(Arel.sql("null")).else(1).format_number("$ %.2f €","fr_FR"))
 		assert_equal "$ 0,00 €" , t(@arthur, (@score-65.62).format_number("$ %.2f €","fr_FR"))
 	  end
-	  
+
 	  def test_accent_insensitive
 		skip "SQLite is natively Case Insensitive and Accent Sensitive" if $sqlite
 		skip "Not finished" if @env_db == 'mysql'
-		# actual comments value: "arrêté"		
-		#AI & CI	
+		# actual comments value: "arrêté"
+		#AI & CI
 		if !['postgresql'].include?(@env_db) # Extension unaccent required on PG
 			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("arrêté")).then("1").else("0"))
-			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("arrete")).then("1").else("0"))		  		  
-			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("àrrétè")).then("1").else("0"))		  		  
-			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("arretez")).then("1").else("0"))		  
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("arrete")).then("1").else("0"))
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("àrrétè")).then("1").else("0"))
+			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("arretez")).then("1").else("0"))
 			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("Arrete")).then("1").else("0"))
 			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("Arrêté")).then("1").else("0"))
 			#AI & CS
 			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("arrêté")).then("1").else("0"))
-			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("arrete")).then("1").else("0"))		  		  
-			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("àrrétè")).then("1").else("0"))		  		  
-			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("arretez")).then("1").else("0"))		  
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("arrete")).then("1").else("0"))
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("àrrétè")).then("1").else("0"))
+			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("arretez")).then("1").else("0"))
 			if !['oracle','postgresql','mysql'].include?(@env_db) # AI => CI
 				assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("Arrete")).then("1").else("0"))
 				assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("Arrêté")).then("1").else("0"))
-			end			
+			end
 		end
 		#AS & CI
 		assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("arrêté")).then("1").else("0"))
 		if !['mysql'].include?(@env_db) # CI => AI in utf8 (AI not possible in latin1)
-			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("arrete")).then("1").else("0"))		  		  
-			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("àrrétè")).then("1").else("0"))		  		  
+			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("arrete")).then("1").else("0"))
+			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("àrrétè")).then("1").else("0"))
 		end		  
-		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("arretez")).then("1").else("0"))		  
+		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("arretez")).then("1").else("0"))
 		if !['mysql'].include?(@env_db) # CI => AI in utf8 (AI not possible in latin1)
 			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("Arrete")).then("1").else("0"))
 		end
 		assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("Arrêté")).then("1").else("0"))
 		#AS & CS
 		assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("arrêté")).then("1").else("0"))
-		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("àrrétè")).then("1").else("0"))		  		  
-		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("arretez")).then("1").else("0"))		  
+		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("àrrétè")).then("1").else("0"))
+		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("arretez")).then("1").else("0"))
 		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"))  
-		 	
+		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("Arrêté")).then("1").else("0"))
 	  end
 	  
 	  def test_subquery_with_order	  
@@ -587,9 +589,9 @@ module ArelExtensions
 			#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 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?
@@ -608,24 +610,24 @@ module ArelExtensions
 		assert_equal false , @test.where(@age.in([nil,1])).blank?
 		assert_equal false , @test.where(@age.in([nil,1,2])).blank?
 	  end
-	  
+
 	  def test_scope_with_in_plus_new
 		begin
-			@test.where(@age.in([1,2])).new		
+			@test.where(@age.in([1,2])).new
 			@test.where(@age.not_in([1,2])).new
 			assert true
 		rescue
 			assert false
 		end
 	  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 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?
@@ -636,7 +638,7 @@ module ArelExtensions
 		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?
@@ -646,7 +648,7 @@ module ArelExtensions
 		#assert_equal true  , @test.where(@age.not_in([nil,1])).blank?
 		#assert_equal true  , @test.where(@age.not_in([nil,1,2])).blank?
 	  end
-	 
+
 	  def test_alias_shortened
 		if ['postgresql','oracle'].include?(@env_db)
 			new_alias = Arel.shorten('azerty' * 15)
@@ -658,29 +660,27 @@ module ArelExtensions
 		end
 	  end
 
-	  def test_stat_functions	
+	  def test_stat_functions
 	  	skip "SQLite doesn't work for most on this functions" if $sqlite 
 	  	#puts t(User.where(nil), @score.average)
 	  	#puts t(User.where(nil), @score.variance(true))
 	  	#puts t(User.where(nil), @score.variance(false))
 	  	#puts t(User.where(nil), @score.std(true))
 	  	#puts t(User.where(nil), @score.std(false))
-	  	
+
 		assert ( 15.98625 - t(User.where(nil), @score.average)).abs < 0.01 
 		assert (613.75488 - t(User.where(nil), @score.variance)).abs < 0.01
 		assert ( 537.0355 - t(User.where(nil), @score.variance(false))).abs < 0.01
-		assert ( 24.77408 - t(User.where(nil), @score.std)).abs < 0.01		
-		assert ( 23.17403 - t(User.where(nil), @score.std(false))).abs < 0.01	  
-
+		assert ( 24.77408 - t(User.where(nil), @score.std)).abs < 0.01
+		assert ( 23.17403 - t(User.where(nil), @score.std(false))).abs < 0.01
 	  end
-	  
+
 	  def test_levenshtein_distance	 
-		skip "Not Yet Implemented" if !(@env_db == 'mysql' || @env_db == 'postgresql')
+		skip "Not Yet Implemented" if $sqlite
 		assert_equal 0,  t(@arthur,@name.levenshtein_distance("Arthur"))
 		assert_equal 2,  t(@arthur,@name.levenshtein_distance("Artoor"))
 		assert_equal 1,  t(@arthur,@name.levenshtein_distance("Artehur"))
 	  end
-	  
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel