arel_extensions 2.0.1 → 2.0.11

data/appveyor.yml

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

data/arel_extensions.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency('activerecord', '>= 6.0.0')
+  s.add_dependency('activerecord', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
   s.add_development_dependency('rdoc', '~> 4.0')
-  s.add_development_dependency('rake', '~> 11')
+  s.add_development_dependency('rake', '~> 12.3.3')
 end

data/functions.html

@@ -55,7 +55,7 @@
     <td class="tg-yw4l">CEIL<br>column.ceil</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">CASE + ROUND</td>
+    <td class="tg-j6lv">CASE + CAST</td>
     <td class="ok">✔</td>
     <td class="tg-j6lv">CEILING()</td>
     <td class="tg-j6lv">CEILING()</td>
@@ -64,7 +64,7 @@
     <td class="tg-yw4l">FLOOR<br>column.floor</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">CASE + ROUND</td>
+    <td class="tg-j6lv">CASE + CAST</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
@@ -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/gemfiles/rails4.gemfile

@@ -18,7 +18,7 @@ group :development, :test do
   gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'activerecord-jdbc-adapter', :platforms => :jruby
+  gem 'activerecord-jdbc-adapter', '~> 1.3' ,:platforms => :jruby
   gem "jdbc-sqlite3", :platforms => :jruby
   gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
   gem "activerecord-jdbcmysql-adapter", :platforms => :jruby

data/gemfiles/rails6.gemfile

@@ -0,0 +1,30 @@
+source "https://rubygems.org"
+
+gem 'rails', '~> 6.0.0'
+
+
+group :development, :test do
+  gem 'activesupport', '~> 6.0.0'
+  gem 'activemodel', '~> 6.0.0'
+  gem 'activerecord', '~> 6.0.0'
+
+  gem "sqlite3", '~> 1.4', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.5.2', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
+
+  gem "tiny_tds", :platforms => [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
+  gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
+
+  # for JRuby
+  gem 'activerecord-jdbc-adapter', :platforms => :jruby
+  gem "jdbc-sqlite3", :platforms => :jruby
+  gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+  gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+  gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
+  gem "activerecord-jdbcmssql-adapter", :platforms => :jruby
+end
+
+gemspec :path => "../gemspec_v2/"

data/gemspec_v2/arel_extensions-v2.gemspec

@@ -0,0 +1,28 @@
+$:.push File.expand_path("../lib", __FILE__)
+require "arel_extensions/version"
+
+Gem::Specification.new do |s|
+  s.name        = "arel_extensions"
+  s.version     = ArelExtensions::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Yann Azoury", "Félix Bellanger", "Julien Delporte"]
+  s.email       = ["yann.azoury@faveod.com", "felix.bellanger@faveod.com", "julien.delporte@faveod.com"]
+  s.homepage    = "https://github.com/Faveod/arel-extensions"
+  s.description = "Adds new features to Arel"
+  s.summary     = "Extending Arel"
+  s.license     = 'MIT'
+
+  s.rdoc_options = ["--main", "README.md"]
+  s.extra_rdoc_files = ["MIT-LICENSE.txt", "README.md", 'functions.html']
+
+  # Manifest
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+
+  s.add_dependency('activerecord', '>= 6.0')
+
+  s.add_development_dependency('minitest', '~> 5.9')
+  s.add_development_dependency('rdoc', '~> 4.0')
+  s.add_development_dependency('rake', '~> 12.3.3')
+end

data/generate_gems.sh

@@ -0,0 +1,14 @@
+
+gem uninstall arel_extensions
+
+# VERSION ~> 1
+cp ./version_v1.rb lib/arel_extensions/version.rb
+gem build ./arel_extensions.gemspec
+
+# VERSION ~> 2
+cp ./version_v2.rb lib/arel_extensions/version.rb
+mv ./arel_extensions.gemspec ./arel_extensions.gemspec.bck
+cp ./gemspec_v2/arel_extensions-v2.gemspec ./arel_extensions.gemspec
+gem build ./arel_extensions.gemspec
+cp ./version_v1.rb lib/arel_extensions/version.rb
+cp ./arel_extensions.gemspec.bck ./arel_extensions.gemspec

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

@@ -7,35 +7,37 @@ require 'arel_extensions/railtie' if defined?(Rails::Railtie)
 # Count|NamedFunction < Function < Arel::Nodes::Node
 
 # pure Arel internals improvements
-Arel::Nodes::Binary.class_eval do
+class Arel::Nodes::Binary
   include Arel::AliasPredication
   include Arel::Expressions
 end
 
-Arel::Nodes::Casted.class_eval do
+class Arel::Nodes::Casted
   include Arel::AliasPredication
+
+  # They forget to define hash.
+  def hash
+    [self.class, self.val, self.attribute].hash
+  end
 end
 
-Arel::Nodes::Unary.class_eval do
+class Arel::Nodes::Unary
   include Arel::Math
   include Arel::AliasPredication
   include Arel::Expressions
 end
 
-Arel::Nodes::Grouping.class_eval do
-  include Arel::Math
-  include Arel::AliasPredication
+class Arel::Nodes::Grouping
   include Arel::OrderPredications
-  include Arel::Expressions
 end
 
-Arel::Nodes::Function.class_eval do
+class Arel::Nodes::Function
   include Arel::Math
   include Arel::Expressions
 end
 
-if Arel::VERSION >= "7.1.0"
-  Arel::Nodes::Case.class_eval do
+if Gem::Version.new(Arel::VERSION) >= Gem::Version.new("7.1.0")
+  class Arel::Nodes::Case
     include Arel::Math
     include Arel::Expressions
   end
@@ -93,14 +95,26 @@ 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
+
+  def self.tuple *v
+    tmp = Arel::Nodes::Grouping.new(nil)
+    Arel::Nodes::Grouping.new(v.map{|e| tmp.convert_to_node(e)})
+  end
 end
 
-Arel::Attributes::Attribute.class_eval do
+class Arel::Attributes::Attribute
   include Arel::Math
   include ArelExtensions::Attributes
 end
 
-Arel::Nodes::Function.class_eval do
+class Arel::Nodes::Function
   include ArelExtensions::Math
   include ArelExtensions::Comparators
   include ArelExtensions::DateDuration
@@ -109,9 +123,24 @@ Arel::Nodes::Function.class_eval do
   include ArelExtensions::BooleanFunctions
   include ArelExtensions::NullFunctions
   include ArelExtensions::Predications
+
+  alias_method :old_as, :as
+  def as other
+    Arel::Nodes::As.new(self, Arel.sql(other))
+  end
+end
+
+class Arel::Nodes::Grouping
+    include ArelExtensions::Math
+    include ArelExtensions::Comparators
+    include ArelExtensions::DateDuration
+    include ArelExtensions::MathFunctions
+    include ArelExtensions::NullFunctions
+    include ArelExtensions::StringFunctions
+    include ArelExtensions::Predications
 end
 
-Arel::Nodes::Unary.class_eval do
+class Arel::Nodes::Unary
   include ArelExtensions::Math
   include ArelExtensions::Attributes
   include ArelExtensions::MathFunctions
@@ -119,7 +148,7 @@ Arel::Nodes::Unary.class_eval do
   include ArelExtensions::Predications
 end
 
-Arel::Nodes::Binary.class_eval do
+class Arel::Nodes::Binary
   include ArelExtensions::Math
   include ArelExtensions::Attributes
   include ArelExtensions::MathFunctions
@@ -128,25 +157,40 @@ Arel::Nodes::Binary.class_eval do
   include ArelExtensions::Predications
 end
 
-Arel::Nodes::Equality.class_eval do
+class Arel::Nodes::Equality
   include ArelExtensions::Comparators
   include ArelExtensions::DateDuration
   include ArelExtensions::MathFunctions
   include ArelExtensions::StringFunctions
 end
 
-
-Arel::InsertManager.class_eval do
+class Arel::InsertManager
   include ArelExtensions::InsertManager
 end
 
-Arel::SelectManager.class_eval do
+class Arel::SelectManager
   include ArelExtensions::SetFunctions
   include ArelExtensions::Nodes
 end
 
-Arel::Nodes::As.class_eval do
+class Arel::Nodes::As
   include ArelExtensions::Nodes
 end
 
+class Arel::Table
+  alias_method :old_alias, :alias
+  def alias(name = "#{self.name}_2")
+    name.blank? ? self : Arel::Nodes::TableAlias.new(self,name)
+  end
+end
 
+class Arel::Nodes::TableAlias
+  def method_missing(*args)
+    met = args.shift.to_sym
+    if self.relation.respond_to?(met)
+      self.relation.send(met,args)
+    else
+      super(met,*args)
+    end
+  end
+end