arel_extensions 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8255cb9ebee4b9aded4f23486b0ef143651fecc
-  data.tar.gz: 5d45081246d1b3221d2e29c6f55b39ba886b20cd
+  metadata.gz: c913d6441a8028303914d933c15eb3d93d68bd91
+  data.tar.gz: 1825a0b009eb23791d475fc4394e4878fe7d7f7d
 SHA512:
-  metadata.gz: 81631cd7e514add0be52d774c9be37c22dfa8304d73eb9ba79fd4b5b034eb69e9c1f8c7e40a18ee34183a34c5b0d86bca118c34cc76bba2765bca2886cebc858
-  data.tar.gz: afa3c43c1ec75118dc8c2ee24973973872a7b291b938e6a8a4cd9554c099c4abe067eb9d59f9b1d79f16946548f6b25ac1e01ea540caf7008c90d7240a5da59f
+  metadata.gz: dc59a956052f6e95c7245fd1b7c127617c97314aff341a20785b5087a2ae5401df036d3a9ffa340beb8b061aed555d5bfddcfdbb1a35c8585f1ffdeb7905b901
+  data.tar.gz: e60ab20676125801cd4c5c8f2fe4f5f7cc9cf73f7134f9fdc71853a28b32c34a2dbb735926b524575d5226a4ec68ebadd46861a02723dc63087fdf97f09fae7e

data/init/mysql.sql

@@ -0,0 +1,45 @@
+DELIMITER $$
+
+DROP FUNCTION IF EXISTS levenshtein_distance; $$
+CREATE FUNCTION levenshtein_distance( s1 VARCHAR(255), s2 VARCHAR(255) ) 
+  RETURNS INT 
+  DETERMINISTIC 
+  BEGIN 
+    DECLARE s1_len, s2_len, i, j, c, c_temp, cost INT; 
+    DECLARE s1_char CHAR; 
+    -- max strlen=255 
+    DECLARE cv0, cv1 VARBINARY(256); 
+    SET s1 = IFNULL(s1,''), s2 = IFNULL(s2,'');
+    SET s1_len = CHAR_LENGTH(IFNULL(s1,'')), s2_len = CHAR_LENGTH(IFNULL(s2,'')), cv1 = 0x00, j = 1, i = 1, c = 0; 
+    IF s1_len = 0 THEN 
+      RETURN s2_len; 
+    ELSEIF s2_len = 0 THEN 
+      RETURN s1_len; 
+    ELSEIF s1 = s2 THEN 
+      RETURN 0;
+    ELSE 
+      WHILE j <= s2_len DO 
+        SET cv1 = CONCAT(cv1, UNHEX(HEX(j))), j = j + 1; 
+      END WHILE; 
+      WHILE i <= s1_len DO 
+        SET s1_char = SUBSTRING(s1, i, 1), c = i, cv0 = UNHEX(HEX(i)), j = 1; 
+        WHILE j <= s2_len DO 
+          SET c = c + 1; 
+          IF s1_char = SUBSTRING(s2, j, 1) THEN  
+            SET cost = 0; ELSE SET cost = 1; 
+          END IF; 
+          SET c_temp = CONV(HEX(SUBSTRING(cv1, j, 1)), 16, 10) + cost; 
+          IF c > c_temp THEN SET c = c_temp; END IF; 
+          SET c_temp = CONV(HEX(SUBSTRING(cv1, j+1, 1)), 16, 10) + 1; 
+          IF c > c_temp THEN  
+            SET c = c_temp;  
+          END IF; 
+          SET cv0 = CONCAT(cv0, UNHEX(HEX(c))), j = j + 1; 
+        END WHILE; 
+        SET cv1 = cv0, i = i + 1; 
+      END WHILE; 
+    END IF; 
+    RETURN c; 
+  END;$$
+  
+DELIMITER ;

data/init/postgresql.sql

@@ -14,6 +14,44 @@ AS $function$
 $function$
 ;
 
+CREATE OR REPLACE FUNCTION public.levenshtein_distance(s text, t text) 
+RETURNS integer AS $$
+DECLARE i integer;
+DECLARE j integer;
+DECLARE m integer;
+DECLARE n integer;
+DECLARE d integer[];
+DECLARE c integer;
+
+BEGIN
+	m := char_length(s);
+	n := char_length(t);
+
+	i := 0;
+	j := 0;
+
+	FOR i IN 0..m LOOP
+		d[i*(n+1)] = i;
+	END LOOP;
+
+	FOR j IN 0..n LOOP
+		d[j] = j;
+	END LOOP;
+
+	FOR i IN 1..m LOOP
+		FOR j IN 1..n LOOP
+			IF SUBSTRING(s,i,1) = SUBSTRING(t, j,1) THEN
+				c := 0;
+			ELSE
+				c := 1;
+			END IF;
+			d[i*(n+1)+j] := LEAST(d[(i-1)*(n+1)+j]+1, d[i*(n+1)+j-1]+1, d[(i-1)*(n+1)+j-1]+c);
+		END LOOP;
+	END LOOP;
+ 
+	return d[m*(n+1)+n];	
+END;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION public.DateDiff(units VARCHAR(30), start_t TIMESTAMP, end_t TIMESTAMP) 
      RETURNS INT AS $$

data/lib/arel_extensions/common_sql_functions.rb

@@ -52,6 +52,10 @@ module ArelExtensions
           sql.split(/^GO\s*$/).each {|str|
             @cnx.execute(str.strip) unless str.blank?
           }
+        elsif env_db == 'mysql' 
+			sql.split("$$")[1..-2].each { |str|
+				@cnx.execute(str.strip) unless str.strip.blank?
+			}
         else
           @cnx.execute(sql) unless sql.blank?
         end

data/lib/arel_extensions/string_functions.rb

@@ -13,6 +13,7 @@ require 'arel_extensions/nodes/format'
 require 'arel_extensions/nodes/repeat'
 require 'arel_extensions/nodes/cast'
 require 'arel_extensions/nodes/collate'
+require 'arel_extensions/nodes/levenshtein_distance'
       
 
 module ArelExtensions

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/mssql.rb

@@ -419,7 +419,7 @@ module ArelExtensions
 	  end
 	  
 		def visit_ArelExtensions_Nodes_FormattedNumber o, collector		
-			col = o.left
+			col = o.left.coalesce(0)
 			locale = Arel::Nodes.build_quoted(o.locale.tr('_','-'))			
 			param = Arel::Nodes.build_quoted("N#{o.precision}")
 			sign = ArelExtensions::Nodes::Case.new.when(col<0).
@@ -469,7 +469,7 @@ module ArelExtensions
 					number,
 					after
 				])		
-			collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
+			collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector	
 			collector		
 		end
 		

data/lib/arel_extensions/visitors/oracle12.rb

@@ -1,7 +1,6 @@
 module ArelExtensions
   module Visitors  
-	class Arel::Visitors::Oracle12 < Arel::Visitors::Oracle	  
-		
+	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
 		  if o.limit && o.lock
@@ -58,8 +57,7 @@ module ArelExtensions
 		  collector << "DECODE("
 		  collector = visit [o.left, o.right, 0, 1], collector
 		  collector << ")"
-		end	    
-			
-    end
+		end	 
+	end
   end
 end

data/test/with_ar/all_agnostic_test.rb

@@ -657,7 +657,7 @@ module ArelExtensions
 						User.select(at[:id]).from(at).to_sql.downcase
 		end
 	  end
-	  
+
 	  def test_stat_functions	
 	  	skip "SQLite doesn't work for most on this functions" if $sqlite 
 	  	#puts t(User.where(nil), @score.average)
@@ -674,9 +674,12 @@ module ArelExtensions
 
 	  end
 	  
-	  #def test_levenshtein_distance
-		#assert 2,  t(@arthur,@name.levenshtein_distance("Artour"))
-	  #end
+	  def test_levenshtein_distance	 
+		skip "Not Yet Implemented" if !(@env_db == 'mysql' || @env_db == 'postgresql')
+		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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Yann Azoury