arel_extensions 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fb8d8ac5e42220d4b332dc7cee83a9c433990a8
-  data.tar.gz: 415ccf89692668308acf7a126388fff77dd8b559
+  metadata.gz: 6b227ca895990c123d78d688d01f00a27a563b70
+  data.tar.gz: 21bc450f1776d263294b6d56523adb59843825bb
 SHA512:
-  metadata.gz: 5ecb5d555985e025765b3287c5a5aaefe28f5bb6ebce3e04d719aef43b232f51f821308181a360857768f963bd323daf5407c8720fdf09f9157e2bc56cbd1f4c
-  data.tar.gz: 15db9820090448c55de632f7bc524aa86e3954efe8d904e03f2fcf3291d962d4f3705d52b896a7b0fe85459602b432a1db334e7d1ec7fe09fefac375106f424e
+  metadata.gz: 42e41791d3c25cb5c3a5900b992ee7e22e813bdb278406b3dc3eeaa02ec2477d76696c4abb50a93956f1b9bf55be5ef8234e96720bbcfc47de53afb8b5fb3ab3
+  data.tar.gz: 07fd67e1b8fe666bdff49c2baeae98d828cacfc0ae6a6b049e98850df6db4c0b24c370350feb973fb0b9f04e633955fb4375f33e020910a0b896f9629bfde300

data/.travis.yml

@@ -3,24 +3,25 @@ sudo: required
 cache:
   bundler: true
   directories:
-  - $ORACLE_DOWNLOAD_DIR
+  - $ORACLE_HOME
 before_install:
-- chmod +x .travis/sqlite3/extension-functions.sh
-- chmod +x .travis/oracle/download.sh
-- chmod +x .travis/oracle/install.sh
-- chmod +x .travis/setup_accounts.sh
+  - chmod +x .travis/sqlite3/extension-functions.sh
+  - chmod +x .travis/oracle/download.sh
+  - chmod +x .travis/oracle/install.sh
+  - chmod +x .travis/setup_accounts.sh
+  - sudo apt-get install -y sqlite3-pcre curl
+  - .travis/sqlite3/extension-functions.sh
+  - .travis/oracle/download.sh
+  - .travis/oracle/install.sh
+  - .travis/setup_accounts.sh
 install:
-- sudo apt-get install -y sqlite3-pcre curl
-- .travis/sqlite3/extension-functions.sh
-- .travis/oracle/download.sh
-- .travis/oracle/install.sh
-- .travis/setup_accounts.sh
-- gem install bundler
-- bundle install
+  - gem install bundler
+  - bundle install
 gemfile:
 - gemfiles/rails4.gemfile
 - gemfiles/rails5_0.gemfile
-- gemfiles/rails5.gemfile
+- gemfiles/rails5_1_4.gemfile
+- gemfiles/rails5_2_beta.gemfile
 services:
 - mysql
 - postgresql
@@ -78,8 +79,6 @@ matrix:
     jdk: openjdk7
   - rvm: ruby-head
     jdk: openjdk7  
-  - rvm: jruby-head
-    jdk: openjdk7
   - rvm: rbx-2
     jdk: oraclejdk8
   - rvm: 2.0.0
@@ -93,39 +92,49 @@ matrix:
   - rvm: 2.4.0
     jdk: oraclejdk8
   - rvm: ruby-head
-    jdk: oraclejdk8
+    jdk: oraclejdk8    
+  - rvm: jruby-head
+    jdk: openjdk7
   - rvm: 2.0.0
-    gemfile: gemfiles/rails5.gemfile
+    gemfile: gemfiles/rails5_1_4.gemfile
   - rvm: 2.1
-    gemfile: gemfiles/rails5.gemfile
-  - rvm: rbx-2
-    gemfile: gemfiles/rails5.gemfile
+    gemfile: gemfiles/rails5_1_4.gemfile
   - rvm: ruby-head
     gemfile: gemfiles/rails4.gemfile
   - rvm: 2.0.0
     gemfile: gemfiles/rails5_0.gemfile
   - rvm: 2.1
-    gemfile: gemfiles/rails5_0.gemfile
-  - rvm: rbx-2
-    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
+    gemfile: gemfiles/rails5_2_beta.gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/rails5_2_beta.gemfile
+  - rvm: jruby-9.0.5.0 
+    gemfile: gemfiles/rails5_2_beta.gemfile
+  - rvm: jruby-head 
+    gemfile: gemfiles/rails5_2_beta.gemfile
   allow_failures:
   - rvm: rbx-2
-    gemfile: gemfiles/rails4.gemfile
+    gemfile: gemfiles/rails4.gemfile    
   - rvm: rbx-2
-    gemfile: gemfiles/rails5_0.gemfile
-  - rvm: jruby-9.0.5.0
-    gemfile: gemfiles/rails5_0.gemfile
-  - rvm: jruby-head
-    gemfile: gemfiles/rails5_0.gemfile
+    gemfile: gemfiles/rails5_0.gemfile    
   - rvm: rbx-2
-    gemfile: gemfiles/rails5.gemfile
-  - rvm: jruby-9.0.5.0
-    gemfile: gemfiles/rails5.gemfile
-  - rvm: jruby-head
-    gemfile: gemfiles/rails5.gemfile
+    gemfile: gemfiles/rails5_1_4.gemfile    
+  - rvm: rbx-2
+    gemfile: gemfiles/rails5_2_beta.gemfile
   - rvm: jruby-head 
     gemfile: gemfiles/rails4.gemfile
     jdk: oraclejdk9
+  - rvm: jruby-head
+    gemfile: gemfiles/rails5_0.gemfile    
+    jdk: oraclejdk9
+  - rvm: rbx-2
+    gemfile: gemfiles/rails5_1_4.gemfile
+  - rvm: jruby-head
+    gemfile: gemfiles/rails5_1_4.gemfile
+    jdk: oraclejdk9  
 bundler_args: "--jobs 3 --retry 2"
 notifications:
   email: 

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 group :development, :test do
   gem "sqlite3", :platforms => [:mri, :mswin, :x64_mingw, :mingw]
   gem "mysql2", :platforms => [:mri, :mswin, :x64_mingw, :mingw]
-  gem "pg", :platforms => [:mri, :mingw, :x64_mingw, :mswin]
+  gem "pg", '< 1.0.0', :platforms => [:mri, :mingw, :x64_mingw, :mswin]
 
   gem "jdbc-sqlite3", :platforms => :jruby
   gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby

data/README.md

@@ -133,6 +133,16 @@ t[:birthdate].format('%Y-%m-%d').to_sql
 # => (SELECT * FROM my_table WHERE name='str') UNION (SELECT * FROM my_table WHERE name='test')
 ```
 
+## Case clause
+
+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) 
+```
+
+
 ## Stored Procedures and User-defined functions
 
 To optimize queries, some classical functions are defined in databases missing any alternative native functions.

data/gemfiles/rails4.gemfile

@@ -9,7 +9,7 @@ group :development, :test do
 
 	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
 	gem "mysql2", :platforms => [:mri, :mswin, :mingw]
-    gem "pg", :platforms => [:mri, :mingw]
+    gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
 
     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/
@@ -26,4 +26,4 @@ group :development, :test do
 	gem "activerecord-jdbcmssql-adapter", :platforms => :jruby
 end
 
-gemspec :path => "../"
+gemspec :path => "../"

data/gemfiles/rails5_0.gemfile

@@ -9,7 +9,7 @@ group :development, :test do
 
 	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
 	gem "mysql2", :platforms => [:mri, :mswin, :mingw]
-    gem "pg", :platforms => [:mri, :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]

data/gemfiles/{rails5.gemfile → rails5_1_4.gemfile}

@@ -1,15 +1,16 @@
 source "https://rubygems.org"
 
+gem 'rails', '~> 5.1.4'
 gem 'arel', '~> 8'
 
 group :development, :test do
-	gem 'activesupport', '~> 5'
-	gem 'activemodel', '~> 5'
-	gem 'activerecord', '~> 5'
+	gem 'activesupport', '~> 5.1.4'
+	gem 'activemodel', '~> 5.1.4'
+	gem 'activerecord', '~> 5.1.4'
 
 	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
 	gem "mysql2", :platforms => [:mri, :mswin, :mingw]
-    gem "pg", :platforms => [:mri, :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]

data/gemfiles/rails5_2_beta.gemfile

@@ -0,0 +1,30 @@
+source "https://rubygems.org"
+
+gem 'rails', '~> 5.2.0.beta2'
+gem 'arel', '~> 9'
+
+group :development, :test do
+	gem 'activesupport', '~> 5.2.0.beta2'
+	gem 'activemodel', '~> 5.2.0.beta2'
+	gem 'activerecord', '~> 5.2.0.beta2'
+
+	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
+	gem "mysql2", :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', '~> 5.2.0.beta1' 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
+end
+
+gemspec :path => "../"

data/lib/arel_extensions.rb

@@ -9,6 +9,7 @@ require 'arel_extensions/railtie' if defined?(Rails::Railtie)
 # pure Arel internals improvements
 Arel::Nodes::Binary.class_eval do
   include Arel::AliasPredication
+  include Arel::Expressions
 end
 
 Arel::Nodes::Unary.class_eval do
@@ -28,6 +29,13 @@ 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
+end
+
 require 'arel_extensions/version'
 require 'arel_extensions/attributes'
 require 'arel_extensions/visitors'
@@ -48,6 +56,8 @@ require 'arel_extensions/common_sql_functions'
 require 'arel_extensions/nodes/union'
 require 'arel_extensions/nodes/union_all'
 require 'arel_extensions/nodes/as'
+require 'arel_extensions/nodes/case'
+require 'arel_extensions/predications'
 
 
 
@@ -69,6 +79,7 @@ Arel::Nodes::Function.class_eval do
   include ArelExtensions::StringFunctions
   include ArelExtensions::BooleanFunctions
   include ArelExtensions::NullFunctions
+  include ArelExtensions::Predications
 end
 
 Arel::Nodes::Unary.class_eval do
@@ -76,6 +87,7 @@ Arel::Nodes::Unary.class_eval do
   include ArelExtensions::Attributes
   include ArelExtensions::MathFunctions
   include ArelExtensions::Comparators
+  include ArelExtensions::Predications
 end
 
 Arel::Nodes::Binary.class_eval do
@@ -84,6 +96,7 @@ Arel::Nodes::Binary.class_eval do
   include ArelExtensions::MathFunctions
   include ArelExtensions::Comparators
   include ArelExtensions::BooleanFunctions
+  include ArelExtensions::Predications
 end
 
 Arel::Nodes::Equality.class_eval do

data/lib/arel_extensions/attributes.rb

@@ -4,6 +4,7 @@ require 'arel_extensions/math'
 require 'arel_extensions/math_functions'
 require 'arel_extensions/null_functions'
 require 'arel_extensions/string_functions'
+require 'arel_extensions/predications'
 
 module ArelExtensions
   module Attributes
@@ -13,6 +14,7 @@ module ArelExtensions
   	include ArelExtensions::MathFunctions
   	include ArelExtensions::NullFunctions
   	include ArelExtensions::StringFunctions
+  	include ArelExtensions::Predications
 
   	def ==(other)
       Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)

data/lib/arel_extensions/nodes.rb

@@ -1 +1,2 @@
 require 'arel_extensions/nodes/function'
+

data/lib/arel_extensions/nodes/as.rb

@@ -4,7 +4,7 @@ module ArelExtensions
     
 	  def initialize left,right
         return super(left,right)
-      end
+	  end
     end
   end
 end

data/lib/arel_extensions/nodes/case.rb

@@ -0,0 +1,69 @@
+module ArelExtensions
+	module Nodes    
+		if Arel::VERSION.to_i < 7 
+			class Case < Arel::Nodes::Node
+				include ArelExtensions::Predications	
+				include Arel::Expressions
+
+				attr_accessor :case, :conditions, :default
+
+				def initialize expression = nil, default = nil
+					@case = expression
+					@conditions = []
+					@default = default
+				end
+
+				def when condition, expression = nil
+					@conditions << When.new(Arel::Nodes.build_quoted(condition), expression)
+					self
+				end
+
+				def then expression
+					@conditions.last.right = Arel::Nodes.build_quoted(expression)
+					self
+				end
+
+				def else expression
+					@default = Else.new Arel::Nodes.build_quoted(expression)
+					self
+				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	
+			
+			class When < Arel::Nodes::Binary # :nodoc:
+			end
+
+			class Else < Arel::Nodes::Unary # :nodoc:
+			end	
+			
+		else
+		
+			class Case < Arel::Nodes::Case		
+			end
+			
+		end		
+
+	end
+end

data/lib/arel_extensions/nodes/date_diff.rb

@@ -62,10 +62,8 @@ module ArelExtensions
       def mysql_value(v = nil)
         v ||= self.expressions.last
         if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
-          if @date_type == :date
-            Arel.sql((v.value >= 0 ? 'INTERVAL ' : 'INTERVAL -') + v.inspect.sub(/s\Z/, ''))
-          elsif @date_type == :datetime
-            Arel.sql((v.value >= 0 ? 'INTERVAL ' : 'INTERVAL -') + v.inspect.sub(/s\Z/, ''))
+          if @date_type == :date || @date_type == :datetime
+            Arel.sql('INTERVAL %s' % v.inspect.sub(/s\Z/, ''))
           end
         else
           v

data/lib/arel_extensions/nodes/function.rb

@@ -127,7 +127,7 @@ module ArelExtensions
           raise(ArgumentError, "#{object.class} can not be converted to NUMBER arg")
         end
       end
-
+      
     end
   end
 end

data/lib/arel_extensions/nodes/soundex.rb

@@ -1,6 +1,6 @@
 module ArelExtensions
   module Nodes
-    class Soundex < Function
+    class Soundex < Function	
     	@@return_type = :string
     end
   end

data/lib/arel_extensions/predications.rb

@@ -0,0 +1,9 @@
+module ArelExtensions
+	module Predications				
+		if Arel::VERSION.to_i < 7 
+			def when right
+				ArelExtensions::Nodes::Case.new(self).when(right)
+			end
+		end
+	end
+end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -307,7 +307,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "(LISTAGG("
         collector = visit o.left, collector
-        if o.right
+        if o.right  && o.right != 'NULL'
           collector << Arel::Visitors::Oracle::COMMA
           collector = visit o.right, collector
         end

data/lib/arel_extensions/visitors/mysql.rb

@@ -47,7 +47,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "GROUP_CONCAT("
         collector = visit o.left, collector
-        if o.right
+        if o.right && o.right != 'NULL'
           collector << ' SEPARATOR '
           collector = visit o.right, collector
         end

data/lib/arel_extensions/visitors/oracle.rb

@@ -47,7 +47,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "(LISTAGG("
         collector = visit o.left, collector
-        if o.right
+        if o.right  && o.right != 'NULL'
           collector << Arel::Visitors::Oracle::COMMA
           collector = visit o.right, collector
         end

data/lib/arel_extensions/visitors/postgresql.rb

@@ -35,12 +35,22 @@ module ArelExtensions
         collector = visit o.right, collector
         collector
       end
+      
+      def visit_ArelExtensions_Nodes_Concat o, collector
+        collector << '('
+        o.expressions.each_with_index { |arg, i|
+          collector = visit arg, collector
+          collector << ' || ' unless i == o.expressions.length - 1
+        }
+        collector << ")"
+        collector
+      end
 
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "array_to_string(array_agg("
         collector = visit o.left, collector
         collector << ")"
-        if o.right
+        if o.right  && o.right != 'NULL'
           collector << Arel::Visitors::PostgreSQL::COMMA
           collector = visit o.right, collector
         else

data/lib/arel_extensions/visitors/sqlite.rb

@@ -77,6 +77,16 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Concat o, collector
+        collector << '('
+        o.expressions.each_with_index { |arg, i|
+          collector = visit arg, collector
+          collector << ' || ' unless i == o.expressions.length - 1
+        }
+        collector << ")"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_Substring o, collector
         collector << "SUBSTR("
         o.expressions.each_with_index { |arg, i|

data/lib/arel_extensions/visitors/to_sql.rb

@@ -55,10 +55,10 @@ module ArelExtensions
 
       # String functions
       def visit_ArelExtensions_Nodes_Concat o, collector
-        collector << '('
-        o.expressions.each_with_index { |arg, i|
+        collector << "CONCAT("
+	    o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
           collector = visit arg, collector
-          collector << ' || ' unless i == o.expressions.length - 1
         }
         collector << ")"
         collector
@@ -67,7 +67,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "GROUP_CONCAT("
         collector = visit o.left, collector
-        if o.right
+        if o.right && o.right != 'NULL'
           collector << Arel::Visitors::ToSql::COMMA
           collector = visit o.right, collector
         end
@@ -406,7 +406,35 @@ module ArelExtensions
 		end
 	end
 	
-  	end
+	def visit_ArelExtensions_Nodes_Case o, collector
+        collector << "CASE "
+        if o.case
+          visit o.case, collector
+          collector << " "
+        end
+        o.conditions.each do |condition|
+          visit condition, collector
+          collector << " "
+        end
+        if o.default
+          visit o.default, collector
+          collector << " "
+        end
+        collector << "END"
+	end
+
+    def visit_ArelExtensions_Nodes_When o, collector
+        collector << "WHEN "
+        visit o.left, collector
+        collector << " THEN "
+        visit o.right, collector
+    end
 
+    def visit_ArelExtensions_Nodes_Else o, collector
+        collector << "ELSE "
+        visit o.expr, collector
+    end
+	
+  	end
   end
 end

data/test/visitors/test_to_sql.rb

@@ -58,8 +58,8 @@ module ArelExtensions
       # String Functions
       it "should accept functions on strings" do
         c = @table[:name]
-        compile(c + 'test').must_be_like %{("users"."name" || 'test')}
-        compile(c + 'test' + ' chain').must_be_like %{("users"."name" || 'test' || ' chain')}
+        compile(c + 'test').must_be_like %{CONCAT(\"users\".\"name\", 'test')}
+        compile(c + 'test' + ' chain').must_be_like %{CONCAT(\"users\".\"name\", 'test', ' chain')}
         compile(c.length).must_be_like %{LENGTH("users"."name")}
         compile(c.length.round + 42).must_be_like %{(ROUND(LENGTH("users"."name")) + 42)}
         compile(c.locate('test')).must_be_like %{LOCATE('test', "users"."name")}
@@ -110,6 +110,10 @@ module ArelExtensions
         compile(c.idoes_not_match('%test%')).must_be_like %{"users"."name" NOT ILIKE '%test%'}
       end
 
+	  it "should accept comparators on functions" do
+		  c = @table[:name]
+		  #compile(c.soundex == 'test').must_be_like %{SOUNDEX("users"."name") = 'test'}
+	  end
 
       # Maths
       # DateDiff
@@ -138,6 +142,15 @@ module ArelExtensions
         sql = compile(ArelExtensions::Nodes::DateDiff.new([d1, @table[:updated_at]]))
         sql.must_match %{DATEDIFF('2015-06-02', "users"."updated_at")}
       end
+      
+      it "should diff between date col and duration" do
+		d1 = 10
+		d2 = -10
+        compile(@table[:created_at] - d1).
+			must_match %{DATE_SUB("users"."created_at", 10)}
+        compile(@table[:created_at] - d2).
+			must_match %{DATE_SUB("users"."created_at", -10)}
+      end
 
       it "should accept operators on dates with numbers" do
         c = @table[:created_at]
@@ -165,6 +178,13 @@ module ArelExtensions
         ).must_be_like %{FLOOR(ROUND(LENGTH("users"."name") / 42, 2)) > CEIL(ABS(TIMEDIFF("users"."updated_at", '2000-03-31 00:00:00 UTC')))}
       end
       
+      it "should accept aggregator like GROUP CONCAT" do
+		@table.project(@table[:first_name].group_concat).group(@table[:last_name]).to_sql
+			.must_be_like %{SELECT GROUP_CONCAT("users"."first_name") FROM "users" GROUP BY "users"."last_name"}			
+		@table.project(@table[:first_name].group_concat('++')).group(@table[:last_name]).to_sql
+			.must_be_like %{SELECT GROUP_CONCAT("users"."first_name", '++') FROM "users" GROUP BY "users"."last_name"}
+      end
+      
       # Unions       
       it "should accept union operators on queries and union nodes" do
 		c = @table.project(@table[:name])
@@ -199,6 +219,23 @@ module ArelExtensions
 			
 	 end
 	 
+	 
+	 puts "AREL VERSION : " + Arel::VERSION.to_s
+	 
+	 # Case
+     it "should accept case clause" do		
+		@table[:name].when("smith").then("cool").when("doe").then("fine").else("uncool").to_sql
+			.must_be_like %{CASE "users"."name" WHEN 'smith' THEN 'cool' WHEN 'doe' THEN 'fine' ELSE 'uncool' END}  			     
+		@table[:name].when("smith").then(1).when("doe").then(2).else(0).to_sql
+			.must_be_like %{CASE "users"."name" WHEN 'smith' THEN 1 WHEN 'doe' THEN 2 ELSE 0 END}   
+		ArelExtensions::Nodes::Case.new.when(@table[:name] == "smith").then(1).when(@table[:name] == "doe").then(2).else(0).to_sql
+			.must_be_like %{CASE WHEN "users"."name" = 'smith' THEN 1 WHEN "users"."name" = 'doe' THEN 2 ELSE 0 END}  
+		ArelExtensions::Nodes::Case.new(@table[:name]).when("smith").then(1).when("doe").then(2).else(0).to_sql
+			.must_be_like %{CASE "users"."name" WHEN 'smith' THEN 1 WHEN 'doe' THEN 2 ELSE 0 END}  
+		@table[:name].when("smith").then(1).when("doe").then(2).else(0).sum.to_sql
+			.must_be_like %{SUM(CASE "users"."name" WHEN 'smith' THEN 1 WHEN 'doe' THEN 2 ELSE 0 END)}  			
+     end
+	 
     end
   end
 end 

data/test/with_ar/all_agnostic_test.rb

@@ -147,15 +147,23 @@ module ArelExtensions
 
       # String Functions
       def test_concat
-        assert_equal 'Camille Camille', t(@camille, @name + ' ' + @name)
-        assert_equal 'Laure 2', t(@laure, @name + ' ' + 2)
-        assert_equal 'Test Laure', t(@laure, Arel::Nodes.build_quoted('Test ') + @name)
-        skip "TODO: find a way... to do group_concat/listagg in SQL Server" if @env_db == 'mssql'
-        if @env_db == 'postgresql'
-          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(' '))
-        end
+		assert_equal 'Camille Camille', t(@camille, @name + ' ' + @name)
+		assert_equal 'Laure 2', t(@laure, @name + ' ' + 2)
+		assert_equal 'Test Laure', t(@laure, Arel::Nodes.build_quoted('Test ') + @name)
+		skip "TODO: find a way... to do group_concat/listagg in SQL Server" if @env_db == 'mssql'
+		if @env_db == 'postgresql'
+			assert_equal "Lucas Sophie", t(User.reorder(nil).from(User.select(:name).where(:name => ['Lucas', 'Sophie']).reorder(:name).as('user_tests')), @name.group_concat(' '))                    
+			assert_equal "Lucas,Sophie", t(User.reorder(nil).from(User.select(:name).where(:name => ['Lucas', 'Sophie']).reorder(:name).as('user_tests')), @name.group_concat(','))          
+			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(','))          
+			if @env_db == 'oracle'
+				assert_equal "LucasSophie", t(User.where(:name => ['Lucas', 'Sophie']).reorder(:name), @name.group_concat)
+			else
+				assert_equal "Lucas,Sophie", t(User.where(:name => ['Lucas', 'Sophie']).reorder(:name), @name.group_concat)
+			end
+		end
       end
 
       def test_length
@@ -361,6 +369,17 @@ module ArelExtensions
           else
             assert_includes [nil, 0, 'f', false], t(@lucas, (@updated_at - Time.utc(2014, 3, 3, 12, 41, 18)) < -1)
           end
+          if @env_db == 'mysql'
+			date1 = Date.new(2016, 5, 23)
+			durPos = 10.years
+			durNeg = -10.years
+			date2 = date1 + durPos
+			date3 = date1 - durPos
+			# Pull Request #5 tests
+			assert_includes [date2,"2026-05-23"], t(@test,(@created_at + durPos))
+			assert_includes [date3,"2006-05-23"], t(@test,(@created_at + durNeg))
+			# we test with the ruby object or the string because some adapters don't return an object Date
+          end
         end
       end
 
@@ -435,6 +454,10 @@ module ArelExtensions
         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
       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)
+	  end
 
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -101,8 +101,9 @@ files:
 - functions.html
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
-- gemfiles/rails5.gemfile
 - gemfiles/rails5_0.gemfile
+- gemfiles/rails5_1_4.gemfile
+- gemfiles/rails5_2_beta.gemfile
 - init/mssql.sql
 - init/mysql.sql
 - init/oracle.sql
@@ -121,6 +122,7 @@ files:
 - lib/arel_extensions/nodes/abs.rb
 - lib/arel_extensions/nodes/as.rb
 - lib/arel_extensions/nodes/blank.rb
+- lib/arel_extensions/nodes/case.rb
 - lib/arel_extensions/nodes/ceil.rb
 - lib/arel_extensions/nodes/change_case.rb
 - lib/arel_extensions/nodes/coalesce.rb
@@ -146,6 +148,7 @@ files:
 - lib/arel_extensions/nodes/union_all.rb
 - lib/arel_extensions/nodes/wday.rb
 - lib/arel_extensions/null_functions.rb
+- lib/arel_extensions/predications.rb
 - lib/arel_extensions/railtie.rb
 - lib/arel_extensions/set_functions.rb
 - lib/arel_extensions/string_functions.rb