arel_extensions 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 19306a80e5058901e7d9db6da1e05cea53e54f3c
-  data.tar.gz: e79f09a5b088c2d571079b796cb819ddec25ebd3
+SHA256:
+  metadata.gz: eac00bb2f717979e8af539923ba6ebca5ed3ef500d5df1499be613b83cd912eb
+  data.tar.gz: f6ec1b377391db2da2510eec4bf967a945be8b5327e8f4a176756a6aab3147bf
 SHA512:
-  metadata.gz: 29df0447069762b05d5daaa2e53884a3cfa68fef1a67fe9df34ef09923c2ef152da138694a564e59b7302317895b150272f8ef9da5ef2eca20bcde54384068c1
-  data.tar.gz: b9102e07381a96d449c9257467e7437f5c4746c6a9f047172f72daf3d5cf0d1fa9c49d5bc6fcc61119032695ee58e84e4db0fdff068d5d820288a591631a9e1b
+  metadata.gz: ee2f1a2884d3c4f3618ee2a83a887cb9d8d59dae790d216c27a8a1c75b79a9d2b777467a730d2723addb5593d31a23d8673affa5190487a341cd0bfd5509d91d
+  data.tar.gz: 92f615201dfd33112b4ddbc4ede753c946163b591233b6da7525af97940c951944094d19743f3fa151c563086a752bc92d38649686ef2dcafafb58f766fc0041

data/.travis.yml

@@ -86,7 +86,7 @@ matrix:
   - rvm: 2.5.0
     jdk: openjdk7
   - rvm: ruby-head
-    jdk: openjdk7  
+    jdk: openjdk7
   - rvm: rbx-2
     jdk: oraclejdk8
   - rvm: 2.0.0
@@ -150,7 +150,7 @@ matrix:
   - rvm: 2.5.0
     jdk: oraclejdk11
   - rvm: ruby-head
-    jdk: oraclejdk11    
+    jdk: oraclejdk11
   - rvm: rbx-2
     jdk: openjdk11
   - rvm: 2.0.0
@@ -166,7 +166,7 @@ matrix:
   - rvm: 2.5.0
     jdk: openjdk11
   - rvm: ruby-head
-    jdk: openjdk11   
+    jdk: openjdk11
   - rvm: jruby-9.2.0.0
     jdk: openjdk7
   - rvm: jruby-head
@@ -182,7 +182,7 @@ matrix:
   - rvm: 2.0.0
     gemfile: gemfiles/rails5_0.gemfile
   - rvm: 2.1
-    gemfile: gemfiles/rails5_0.gemfile  
+    gemfile: gemfiles/rails5_0.gemfile
   - rvm: jruby-9.0.5.0
     gemfile: gemfiles/rails5_1_4.gemfile
   - rvm: 2.0.0
@@ -191,17 +191,17 @@ matrix:
     gemfile: gemfiles/rails5_2.gemfile
   allow_failures:
   - rvm: rbx-2
-    gemfile: gemfiles/rails4.gemfile    
+    gemfile: gemfiles/rails4.gemfile
   - rvm: rbx-2
-    gemfile: gemfiles/rails5_0.gemfile    
+    gemfile: gemfiles/rails5_0.gemfile
   - rvm: rbx-2
-    gemfile: gemfiles/rails5_1_4.gemfile    
+    gemfile: gemfiles/rails5_1_4.gemfile
   - rvm: rbx-2
     gemfile: gemfiles/rails5_2.gemfile
   - rvm: rbx-2
     gemfile: gemfiles/rails5_1_4.gemfile
-  - rvm: jruby-9.0.5.0 
-    gemfile: gemfiles/rails5_2.gemfile 
+  - rvm: jruby-9.0.5.0
+    gemfile: gemfiles/rails5_2.gemfile
   - rvm: jruby-9.2.0.0
     jdk: oraclejdk9
     gemfile: gemfiles/rails5_2.gemfile
@@ -217,7 +217,7 @@ matrix:
     jdk: oraclejdk9
 bundler_args: "--jobs 3 --retry 2"
 notifications:
-  email: 
+  email:
     notifications:
       - julien.delporte@faveod.com
       - yann.azoury@faveod.com

data/Gemfile

@@ -14,8 +14,8 @@ group :development, :test do
 
   gem "tiny_tds", '~> 1.3.0' ,:require => false, :platforms => [:mri,:mingw, :x64_mingw, :mswin]
   gem "activerecord-sqlserver-adapter", '~> 4.2.0', :platforms => [:mri, :mingw, :x64_mingw, :mswin]
-  
-  gem 'ruby-oci8', :platforms => [:mri, :mswin, :x64_mingw, :mingw] 
+
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :x64_mingw, :mingw]
   gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0'
 
   gem 'activesupport', '~> 4.0'

data/README.md

@@ -72,9 +72,9 @@ With Arel Extensions:
 Other functions : ABS, RAND, ROUND, FLOOR, CEIL, FORMAT
 
 For Example:
-```ruby 
+```ruby
 t[:price].format_number("%07.2f €","fr_FR")
-# equivalent to 'sprintf("%07.2f €",price)' plus locale management 
+# equivalent to 'sprintf("%07.2f €",price)' plus locale management
 ```
 
 ## String operations
@@ -130,7 +130,7 @@ t[:birthdate].format('%Y-%m-%d').to_sql
 # => DATE_FORMAT(my_table.birthdate, '%Y-%m-%d')
 ```
 
-## Unions 
+## Unions
 
 ```ruby
 (t.where(t[:name].eq('str')) + t.where(t[:name].eq('test'))).to_sql
@@ -143,7 +143,7 @@ Arel-extensions allows to use functions on case clause
 
 ```ruby
 t[:name].when("smith").then(1).when("doe").then(2).else(0).sum.to_sql
-# => SUM(CASE "my_table"."name" WHEN 'smith' THEN 1 WHEN 'doe' THEN 2 ELSE 0 END) 
+# => SUM(CASE "my_table"."name" WHEN 'smith' THEN 1 WHEN 'doe' THEN 2 ELSE 0 END)
 ```
 
 ## Cast Function
@@ -160,7 +160,7 @@ t[:id].cast('char').to_sql
 
 To optimize queries, some classical functions are defined in databases missing any alternative native functions.
 Examples :
-- FIND_IN_SET 
+- FIND_IN_SET
 
 ## BULK INSERT / UPSERT
 
@@ -385,7 +385,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="tg-j6lv">✔</td>
     <td class="tg-j6lv">?</td>
-  </tr>  
+  </tr>
   <tr>
     <td class="tg-yw4l">Matching Accent Insensitive<br>column.ai_matches('blah')</td>
     <td class="ok">not supported</td>
@@ -394,7 +394,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">not supported</td>
     <td class="tg-j6lv">✔</td>
     <td class="tg-j6lv">?</td>
-  </tr>  
+  </tr>
   <tr>
     <td class="tg-yw4l">Matching Case Insensitive<br>column.imatches('blah')</td>
     <td class="ok">not supported</td>
@@ -403,7 +403,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="tg-j6lv">✔</td>
     <td class="tg-j6lv">?</td>
-  </tr>  
+  </tr>
   <tr>
     <td class="tg-yw4l">Matching Accent/Case Sensitive<br>column.smatches('blah')</td>
     <td class="ok">✔</td>
@@ -412,8 +412,8 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="tg-j6lv">✔</td>
     <td class="tg-j6lv">?</td>
-  </tr>  
-    
+  </tr>
+
   <tr>
     <th class="tg-4rp9" rowspan="6"><div>Date functions</div></th>
     <td class="tg-yw4l">DATEADD<br>column + 2.year<br></td>

data/appveyor.yml

@@ -41,4 +41,4 @@ environment:
     - RUBY_VERSION: 22
     - RUBY_VERSION: 23
     - RUBY_VERSION: 23-x64
-    
+

data/functions.html

@@ -379,7 +379,7 @@
     <td class="ok">✔</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-  </tr> 
+  </tr>
   <tr>
     <th class="bulk_insert" rowspan="1"><div>Set<br/> Operators</div></th>
     <td class="tg-yw4l">UNION ( + )<br/>query + query</td>

data/init/mssql.sql

@@ -83,7 +83,7 @@ BEGIN
     END
     SELECT @cv1 = @cv0, @i = @i + 1
   END
-  RETURN @c 
+  RETURN @c
 END
 GO
 
@@ -94,9 +94,9 @@ GO
 --RETURNS TABLE
 --AS
 --BEGIN
---    RETURN ( SELECT [Value] FROM 
---      ( 
---        SELECT 
+--    RETURN ( SELECT [Value] FROM
+--      (
+--        SELECT
 --          [Value] = LTRIM(RTRIM(SUBSTRING(@List, [Number],
 --          CHARINDEX(@Delim, @List + @Delim, [Number]) - [Number])))
 --        FROM (SELECT Number = ROW_NUMBER() OVER (ORDER BY name)

data/init/mysql.sql

@@ -1,45 +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); 
+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 
+    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; 
+    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

@@ -4,17 +4,17 @@ CREATE OR REPLACE FUNCTION public.find_in_set(n INTEGER, s TEXT)
 AS $function$
     SELECT * FROM (
       select int4(z.row_number) from (
-        select row_number() over(), y.x 
+        select row_number() over(), y.x
         from (select unnest(('{' || $2 || '}')::int[]) as x) as y
       ) as z
       where z.x = $1
-    UNION ALL 
+    UNION ALL
       SELECT 0) z
     LIMIT 1
 $function$
 ;
 
-CREATE OR REPLACE FUNCTION public.levenshtein_distance(s text, t text) 
+CREATE OR REPLACE FUNCTION public.levenshtein_distance(s text, t text)
 RETURNS integer AS $$
 DECLARE i integer;
 DECLARE j integer;
@@ -48,58 +48,58 @@ BEGIN
 			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];	
+
+	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) 
+CREATE OR REPLACE FUNCTION public.DateDiff(units VARCHAR(30), start_t TIMESTAMP, end_t TIMESTAMP)
      RETURNS INT AS $$
    DECLARE
-     diff_interval INTERVAL; 
+     diff_interval INTERVAL;
      diff INT = 0;
      years_diff INT = 0;
    BEGIN
      IF units IN ('yy', 'yyyy', 'year', 'mm', 'm', 'month') THEN
        years_diff = DATE_PART('year', end_t) - DATE_PART('year', start_t);
- 
+
        IF units IN ('yy', 'yyyy', 'year') THEN
          -- SQL Server does not count full years passed (only difference between year parts)
          RETURN years_diff;
        ELSE
          -- If end month is less than start month it will subtracted
-         RETURN years_diff * 12 + (DATE_PART('month', end_t) - DATE_PART('month', start_t)); 
+         RETURN years_diff * 12 + (DATE_PART('month', end_t) - DATE_PART('month', start_t));
        END IF;
      END IF;
- 
-     -- Minus operator returns interval 'DDD days HH:MI:SS'  
+
+     -- Minus operator returns interval 'DDD days HH:MI:SS'
      diff_interval = end_t - start_t;
- 
+
      diff = diff + DATE_PART('day', diff_interval);
- 
+
      IF units IN ('wk', 'ww', 'week') THEN
        diff = diff/7;
        RETURN diff;
      END IF;
- 
+
      IF units IN ('dd', 'd', 'day') THEN
        RETURN diff;
      END IF;
- 
-     diff = diff * 24 + DATE_PART('hour', diff_interval); 
- 
+
+     diff = diff * 24 + DATE_PART('hour', diff_interval);
+
      IF units IN ('hh', 'hour') THEN
         RETURN diff;
      END IF;
- 
+
      diff = diff * 60 + DATE_PART('minute', diff_interval);
- 
+
      IF units IN ('mi', 'n', 'minute') THEN
         RETURN diff;
      END IF;
- 
+
      diff = diff * 60 + DATE_PART('second', diff_interval);
- 
+
      RETURN diff;
    END;
 $$ LANGUAGE plpgsql;

data/lib/arel_extensions.rb

@@ -93,6 +93,14 @@ module Arel
     ArelExtensions::Nodes::Duration.new(s.to_s+'i',expr)
   end
 
+  def self.true
+    Arel::Nodes::Equality.new(1,1)
+  end
+
+  def self.false
+    Arel::Nodes::Equality.new(1,0)
+  end
+
 end
 
 Arel::Attributes::Attribute.class_eval do
@@ -109,6 +117,10 @@ Arel::Nodes::Function.class_eval do
   include ArelExtensions::BooleanFunctions
   include ArelExtensions::NullFunctions
   include ArelExtensions::Predications
+
+  def as other
+    Arel::Nodes::As.new(self, Arel.sql(other))
+  end
 end
 
 Arel::Nodes::Unary.class_eval do
@@ -149,4 +161,8 @@ Arel::Nodes::As.class_eval do
   include ArelExtensions::Nodes
 end
 
-
+Arel::Table.class_eval do
+  def alias(name = "#{self.name}_2")
+    name.blank? ? self :  Arel::Nodes::TableAlias.new(self,name)
+  end
+end

data/lib/arel_extensions/common_sql_functions.rb

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

data/lib/arel_extensions/comparators.rb

@@ -1,6 +1,7 @@
 module ArelExtensions
   module Comparators
 
+
     def >(other)
       Arel::Nodes::GreaterThan.new self, Arel::Nodes.build_quoted(other, self)
     end
@@ -37,13 +38,14 @@ module ArelExtensions
     end
 
     private
-    #Function use for not_regexp
+    # Function used for not_regexp.
     def convert_regexp(other)
       case other
       when String
-        #Do nothing
+        # Do nothing.
       when Regexp
         other = other.source.gsub('\A','^')
+        other.gsub!('\z','$')
         other.gsub!('\Z','$')
         other.gsub!('\d','[0-9]')
         other.gsub!('\D','[^0-9]')