arel_extensions 1.3.5 → 2.0.0.rc3

data/arel_extensions.gemspec

@@ -1,28 +1,28 @@
-$:.push File.expand_path('../lib', __FILE__)
-require 'arel_extensions/version'
+$:.push File.expand_path("../lib", __FILE__)
+require "arel_extensions/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'arel_extensions'
+  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.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']
+  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.require_paths = ["lib"]
 
-  s.add_dependency('arel', '>= 6.0')
+  s.add_dependency('activerecord', '>= 6.0.0.rc2')
 
   s.add_development_dependency('minitest', '~> 5.9')
-  s.add_development_dependency('rdoc', '>= 6.3.1')
-  s.add_development_dependency('rake', '~> 12.3.3')
+  s.add_development_dependency('rdoc', '~> 4.0')
+  s.add_development_dependency('rake', '~> 11')
 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 + CAST</td>
+    <td class="tg-j6lv">CASE + ROUND</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 + CAST</td>
+    <td class="tg-j6lv">CASE + ROUND</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/rails3.gemfile

@@ -1,20 +1,20 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gem 'arel', '~> 3.0' # too old...
 
 group :development, :test do
-  gem 'sqlite3', '<= 1.3.13', platform: %i[ruby mswin mingw]
-  gem 'mysql2', '0.4.10', platform: %i[ruby mswin mingw]
-  gem 'activerecord-mysql2-adapter', platform: %i[ruby mswin mingw]
-  gem 'pg', platform: %i[ruby mswin mingw]
+  gem "sqlite3", '<= 1.3.13', :platform => [:ruby, :mswin, :mingw]
+  gem "mysql2", '0.4.10', :platform => [:ruby, :mswin, :mingw]
+  gem "activerecord-mysql2-adapter", :platform => [:ruby, :mswin, :mingw]
+  gem "pg", :platform => [:ruby, :mswin, :mingw]
   # for JRuby
-  gem 'jdbc-sqlite3', platform: :jruby
-  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
-  gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+  gem "jdbc-sqlite3", :platform => :jruby
+  gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+  gem "activerecord-jdbcmysql-adapter", :platform => :jruby
+  gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
   gem 'activesupport', '~> 3.2'
   gem 'activemodel', '~> 3.2'
   gem 'activerecord', '~> 3.2'
 end
 
-gemspec path: Dir.pwd
+gemspec :path => "../"

data/gemfiles/rails4.gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gem 'arel', '~> 6.0'
 
@@ -7,23 +7,23 @@ group :development, :test do
   gem 'activemodel', '~> 4.0'
   gem 'activerecord', '~> 4.0'
 
-  gem 'sqlite3', '<= 1.3.13', platforms: %i[mri mswin mingw]
-  gem 'mysql2', '0.4.10', platforms: %i[mri mswin mingw]
-  gem 'pg', '< 1.0.0', platforms: %i[mri mingw]
+  gem "sqlite3", '<= 1.3.13', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
 
-  gem 'tiny_tds', platforms: %i[mri mingw mswin] if RUBY_PLATFORM.match?(/windows/)
-  gem 'activerecord-sqlserver-adapter', '~> 4.2.0', platforms: %i[mri mingw mswin] if RUBY_PLATFORM.match?(/windows/)
+  gem "tiny_tds", :platforms => [:mri, :mingw, :mswin] if RUBY_PLATFORM =~ /windows/
+  gem "activerecord-sqlserver-adapter", '~> 4.2.0', :platforms => [:mri, :mingw, :mswin] if RUBY_PLATFORM =~ /windows/
 
-  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for 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
-  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
-  gem 'activerecord-jdbcmssql-adapter', platforms: :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: Dir.pwd
+gemspec :path => "../"

data/gemfiles/rails5_0.gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gem 'arel', '~> 7.0'
 
@@ -7,23 +7,23 @@ group :development, :test do
   gem 'activemodel', '~> 5.0'
   gem 'activerecord', '5.0.6'
 
-  gem 'sqlite3', '<= 1.3.13', platforms: %i[mri mswin mingw]
-  gem 'mysql2', '0.4.10', platforms: %i[mri mswin mingw]
-  gem 'pg', '< 1.0.0', platforms: %i[mri mingw]
+  gem "sqlite3", '<= 1.3.13', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
 
-  gem 'tiny_tds', platforms: %i[mri mingw] if RUBY_PLATFORM.match?(/windows/)
-  # gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
+  gem "tiny_tds", :platforms => [:mri, :mingw] if RUBY_PLATFORM =~ /windows/
+  #gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
 
-  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 1.7' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter', tag: 'v50.0', 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
+  gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v50.0', :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: Dir.pwd
+gemspec :path => "../"

data/gemfiles/rails5_1_4.gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gem 'rails', '5.1.4'
 gem 'arel', '~> 8'
@@ -8,23 +8,23 @@ group :development, :test do
   gem 'activemodel', '5.1.4'
   gem 'activerecord', '5.1.4'
 
-  gem 'sqlite3', '<= 1.3.13', platforms: %i[mri mswin mingw]
-  gem 'mysql2', '0.4.10', platforms: %i[mri mswin mingw]
-  gem 'pg', '< 1.0.0', platforms: %i[mri mingw]
+  gem "sqlite3", '<= 1.3.13', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
 
-  gem 'tiny_tds', platforms: %i[mri mingw]  if RUBY_PLATFORM.match?(/windows/)
-  # gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
+  gem "tiny_tds", :platforms => [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
+  #gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
 
-  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 1.8' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter', tag: 'v51.0', 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
+  gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v51.0', :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: Dir.pwd
+gemspec :path => "../"

data/gemfiles/rails5_2.gemfile

@@ -1,32 +1,30 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gem 'rails', '~> 5.2.0'
 gem 'arel', '~> 9'
 
 group :development, :test do
-  gem 'bigdecimal', '1.3.5', platforms: %i[mri mingw x64_mingw mswin]
   gem 'activesupport', '~> 5.2.0'
   gem 'activemodel', '~> 5.2.0'
   gem 'activerecord', '~> 5.2.0'
 
-  gem 'sqlite3', '<= 1.3.13', platforms: [:mri]
-  gem 'mysql2', '0.4.10', platforms: [:mri]
-  gem 'pg', '< 1.0.0', platforms: [:mri]
+  gem "sqlite3", '<= 1.3.13', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
 
-  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
-  gem 'activerecord-sqlserver-adapter', '~> 5.2', platforms: %i[mri mingw x64_mingw mswin]
-  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
+  gem "tiny_tds", :platforms => [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
+  #gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
 
-  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 5.2.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter', tag: 'v52.7', 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-jdbcsqlserver-adapter', '~> 52.0', platforms: :jruby
+  gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v52.0', :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: Dir.pwd
+gemspec :path => "../"

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/attributes.rb

@@ -1,4 +1,3 @@
-require 'arel_extensions/aliases'
 require 'arel_extensions/math'
 require 'arel_extensions/comparators'
 require 'arel_extensions/date_duration'
@@ -9,7 +8,6 @@ require 'arel_extensions/predications'
 
 module ArelExtensions
   module Attributes
-    include ArelExtensions::Aliases
     include ArelExtensions::Math
     include ArelExtensions::Comparators
     include ArelExtensions::DateDuration
@@ -19,11 +17,12 @@ module ArelExtensions
     include ArelExtensions::Predications
 
     def ==(other)
-      Arel::Nodes::Equality.new self, Arel.quoted(other, self)
+      Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
     end
 
     def !=(other)
-      Arel::Nodes::NotEqual.new self, Arel.quoted(other, self)
+      Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
     end
+
   end
 end

data/lib/arel_extensions/boolean_functions.rb

@@ -2,12 +2,13 @@ require 'arel_extensions/nodes/then'
 
 module ArelExtensions
   module BooleanFunctions
+
     def ⋀(other)
       self.and(other)
     end
 
     def and *others
-      Arel::Nodes::And.new self, others
+      Arel::Nodes::And.new([self]+ others.flatten)
     end
 
     def ⋁(other)
@@ -15,7 +16,12 @@ module ArelExtensions
     end
 
     def or *others
-      Arel::Nodes::Or.new self, others
+      args = others.flatten
+      if args.length == 1
+        Arel::Nodes::Or.new(self, args.first)
+      else
+        ArelExtensions::Nodes::Or.new([self]+ args)
+      end
     end
 
     def then(t, f = nil)
@@ -24,61 +30,16 @@ module ArelExtensions
   end
 end
 
-class Arel::Nodes::And
+Arel::Nodes::And.class_eval do
   include ArelExtensions::BooleanFunctions
-
-  def self.new *children
-    children =
-      children.flatten.map { |c|
-        c.is_a?(self) ? c.children : c
-      }.flatten
-    super(children)
-  end
 end
 
-# For some reason, Arel's And is properly defined as variadic (it
-# stores @children, and hashes it all).  However Arel's Or is defined
-# as binary, with only @left and @right, and hashing only @left and @right.
-#
-# So reimplement its ctor and accessors.
-
-class Arel::Nodes::Or
+Arel::Nodes::Or.class_eval do
   include ArelExtensions::BooleanFunctions
+end
 
-  attr_reader :children
-
-  def self.new *children
-    children =
-      children.flatten.map { |c|
-        c.is_a?(self) ? c.children : c
-      }.flatten
-    super(*children)
-  end
-
-  def initialize *children
-    @children = children
-  end
-
-  def initialize_copy(other)
-    super
-    @children = other.children.copy if other.children
-  end
-
-  def left
-    children.first
-  end
-
-  def right
-    children[1]
-  end
+ArelExtensions::Nodes.const_set('Or',Class.new(Arel::Nodes::And)).class_eval do
+  include ArelExtensions::BooleanFunctions
+end
 
-  def hash
-    children.hash
-  end
 
-  def eql?(other)
-    self.class == other.class &&
-      children == other.children
-  end
-  alias :== :eql?
-end