arel_extensions 2.1.5 → 2.1.6

data/README.md

@@ -1,16 +1,15 @@
 # Arel Extensions
 
 ![GitHub workflow](https://github.com/Faveod/arel-extensions/actions/workflows/ruby.yml/badge.svg)
-[![AppVeyor Build Status](https://img.shields.io/appveyor/ci/yazfav/arel-extensions.svg?label=AppVeyor%20build)](https://ci.appveyor.com/project/yazfav/arel-extensions)
-[![Security](https://hakiri.io/github/Faveod/arel-extensions/master.svg)](https://hakiri.io/github/Faveod/arel-extensions/master)
+[![AppVeyor Build Status](https://img.shields.io/appveyor/ci/jdelporte/arel-extensions.svg?label=AppVeyor%20build)](https://ci.appveyor.com/project/jdelporte/arel-extensions)
 ![](http://img.shields.io/badge/license-MIT-brightgreen.svg)
 
 Gem: [![Latest Release](https://img.shields.io/gem/v/arel_extensions.svg)](https://rubygems.org/gems/arel_extensions)
 [![Gem](https://ruby-gem-downloads-badge.herokuapp.com/arel_extensions?type=total)](https://rubygems.org/gems/arel_extensions)
 [![Gem](https://ruby-gem-downloads-badge.herokuapp.com/arel_extensions?label=downloads-current-version)](https://rubygems.org/gems/arel_extensions)
 
-Arel Extensions adds shortcuts, fixes and new ORM mappings (ruby to SQL) to Arel.
-It aims to ensure pure ruby syntax for the biggest number of usual cases.
+Arel Extensions adds shortcuts, fixes and new ORM mappings (Ruby to SQL) to Arel.
+It aims to ensure pure Ruby syntax for most usual cases.
 It allows to use more advanced SQL functions for any supported RDBMS.
 
 
@@ -293,6 +292,15 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="ok">✔</td>
   </tr>
+  <tr>
+    <td class="tg-yw4l">POSIX FORMATTING<br>column.format_number("$ %7.2f","en_US")</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ko">not implemented</td>
+  </tr>
   <tr>
     <td class="tg-yw4l">RAND<br>Arel.rand</td>
     <td class="ok">✔</td>
@@ -321,24 +329,33 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">POSIX FORMATTING<br>column.format_number("$ %7.2f","en_US")</td>
-    <td class="ok">✔</td>
+    <th class="tg-ffjm" rowspan="17"><div>String functions</div></th>
+    <td class="tg-yw4l">CONCAT<br>column + "string"</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv"> ||</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">+</td>
     <td class="ok">✔</td>
-    <td class="ko">not implemented</td>
   </tr>
   <tr>
-    <th class="tg-ffjm" rowspan="17"><div>String functions</div></th>
-    <td class="tg-yw4l">CONCAT<br>column + "string"</td>
+    <td class="tg-yw4l">FIND_IN_SET<br>column &amp; ("l")</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv"> ||</td>
+    <td class="tg-orpl">Ruby function</td>
+    <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">+</td>
     <td class="ok">✔</td>
   </tr>
+  <tr>
+    <td class="tg-yw4l">ILIKE (in Arel6)<br/>column.imatches('%pattern')</td>
+    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
+    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
+    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
+  </tr>
   <tr>
     <td class="tg-yw4l">LENGTH<br>column.length</td>
     <td class="ok">✔</td>
@@ -358,30 +375,57 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">SUBSTRING<br/>column[1..2]<br/>column.substring(1)<br/>column.substring(1, 1)</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">SUBSTR()</td>
-    <td class="tg-j6lv">SUBSTR()</td>
-    <td class="tg-j6lv">SUBSTR()</td>
+    <td class="tg-yw4l">Matching Accent/Case Insensitive<br>column.ai_imatches('blah')</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">unaccent required</td>
+    <td class="tg-j6lv">not supported</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">?</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">FIND_IN_SET<br>column &amp; ("l")</td>
-    <td class="ok">✔</td>
-    <td class="ok">✔</td>
-    <td class="tg-orpl">Ruby function</td>
+    <td class="tg-yw4l">Matching Accent Insensitive<br>column.ai_matches('blah')</td>
+    <td class="ok">not supported</td>
+    <td class="tg-j6lv">not supported</td>
+    <td class="tg-j6lv">not supported</td>
+    <td class="ok">not supported</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">?</td>
+  </tr>
+  <tr>
+    <td class="tg-yw4l">Matching Case Insensitive<br>column.imatches('blah')</td>
+    <td class="ok">not supported</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">✔</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">?</td>
+  </tr>
+  <tr>
+    <td class="tg-yw4l">Matching Accent/Case Sensitive<br>column.smatches('blah')</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">not supported</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">?</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">SOUNDEX<br>column.soundex</td>
+    <td class="tg-yw4l">NOT_REGEXP<br>column != "pattern"</td>
     <td class="ok">✔</td>
-    <td class="tg-3oug">require fuzzystrmatch</td>
+    <td class="ok">✔<br></td>
+    <td class="tg-3oug">require pcre.so</td>
+    <td class="tg-j6lv">NOT REGEXP_LIKE </td>
+    <td class="tg-j6lv">NOT LIKE</td>
     <td class="ok">✔</td>
+  </tr>
+  <tr>
+    <td class="tg-yw4l">REGEXP<br>column =~ "pattern"<br></td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
+    <td class="tg-3oug">require pcre.so</td>
+    <td class="tg-j6lv">REGEXP_LIKE</td>
+    <td class="tg-j6lv">LIKE</td>
     <td class="ok">✔</td>
   </tr>
   <tr>
@@ -394,31 +438,22 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">REGEXP<br>column =~ "pattern"<br></td>
+    <td class="tg-yw4l">SOUNDEX<br>column.soundex</td>
     <td class="ok">✔</td>
+    <td class="tg-3oug">require fuzzystrmatch</td>
     <td class="ok">✔</td>
-    <td class="tg-3oug">require pcre.so</td>
-    <td class="tg-j6lv">REGEXP_LIKE</td>
-    <td class="tg-j6lv">LIKE</td>
     <td class="ok">✔</td>
-  </tr>
-  <tr>
-    <td class="tg-yw4l">NOT_REGEXP<br>column != "pattern"</td>
     <td class="ok">✔</td>
-    <td class="ok">✔<br></td>
-    <td class="tg-3oug">require pcre.so</td>
-    <td class="tg-j6lv">NOT REGEXP_LIKE </td>
-    <td class="tg-j6lv">NOT LIKE</td>
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">ILIKE (in Arel6)<br/>column.imatches('%pattern')</td>
-    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
+    <td class="tg-yw4l">SUBSTRING<br/>column[1..2]<br/>column.substring(1)<br/>column.substring(1, 1)</td>
+    <td class="ok">✔</td>
+    <td class="tg-j6lv">SUBSTR()</td>
+    <td class="tg-j6lv">SUBSTR()</td>
+    <td class="tg-j6lv">SUBSTR()</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
-    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
-    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
   </tr>
   <tr>
     <td class="tg-yw4l">TRIM (leading)<br>column.trim("LEADING","M")</td>
@@ -447,43 +482,6 @@ User.connection.execute(insert_manager.to_sql)
     <td class="tg-j6lv">LTRIM(RTRIM())</td>
     <td class="tg-j6lv">TRIM()</td>
   </tr>
-  <tr>
-    <td class="tg-yw4l">Matching Accent/Case Insensitive<br>column.ai_imatches('blah')</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">unaccent required</td>
-    <td class="tg-j6lv">not supported</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">?</td>
-  </tr>
-  <tr>
-    <td class="tg-yw4l">Matching Accent Insensitive<br>column.ai_matches('blah')</td>
-    <td class="ok">not supported</td>
-    <td class="tg-j6lv">not supported</td>
-    <td class="tg-j6lv">not supported</td>
-    <td class="ok">not supported</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">?</td>
-  </tr>
-  <tr>
-    <td class="tg-yw4l">Matching Case Insensitive<br>column.imatches('blah')</td>
-    <td class="ok">not supported</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">?</td>
-  </tr>
-  <tr>
-    <td class="tg-yw4l">Matching Accent/Case Sensitive<br>column.smatches('blah')</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">not supported</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">?</td>
-  </tr>
-
   <tr>
     <th class="tg-4rp9" rowspan="6"><div>Date functions</div></th>
     <td class="tg-yw4l">DATEADD<br>column + 2.year<br></td>
@@ -540,7 +538,16 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <th class="tg-72dn" rowspan="8"><div>Comparators functions</div></th>
+    <th class="tg-72dn" rowspan="13"><div>Comparators functions</div></th>
+    <td class="tg-yw4l">BLANK<br>column.blank<br></td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+  </tr>
+  <tr>
     <td class="tg-yw4l">COALESCE<br>column.coalesce(var)</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
@@ -549,6 +556,24 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="ok">✔</td>
   </tr>
+  <tr>
+    <td class="tg-yw4l">COALESCE_BLANK<br>column.coalesce_blank(var)</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+  </tr>
+  <tr>
+    <td class="tg-yw4l">IF_PRESENT</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+  </tr>
   <tr>
     <td class="tg-yw4l">ISNULL<br>column.isnull()</td>
     <td class="tg-j6lv">IFNULL()</td>
@@ -558,6 +583,24 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="ok">✔</td>
   </tr>
+  <tr>
+    <td class="tg-yw4l">NOT_BLANK<br>column.not_blank<br></td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+  </tr>
+  <tr>
+    <td class="tg-yw4l">PRESENT<br>column.present<br>alias to NOT_BLANK<br></td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+  </tr>
   <tr>
     <td class="tg-yw4l">==<br>column == integer</td>
     <td class="ok">✔</td>

data/appveyor.yml

@@ -7,6 +7,15 @@ cache:
 
 environment:
   matrix:
+    - RUBY_VERSION: 25-x64
+      RAILS: 4_2
+      SQL: MSSQL$SQL2012SP1
+    - RUBY_VERSION: 25-x64
+      RAILS: 4_2
+      SQL: MSSQL$SQL2014
+    - RUBY_VERSION: 25-x64
+      RAILS: 4_2
+      SQL: MSSQL$SQL2016
     - RUBY_VERSION: 25-x64
       RAILS: 5_2
       SQL: MSSQL$SQL2012SP1

data/arel_extensions.gemspec

@@ -23,6 +23,5 @@ Gem::Specification.new do |s|
   s.add_dependency('activerecord', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
-  s.add_development_dependency('rdoc', '>= 6.3.1')
   s.add_development_dependency('rake', '~> 12.3.3')
 end

data/gemfiles/{rails4.gemfile → rails4_2.gemfile}

@@ -3,6 +3,13 @@ source 'https://rubygems.org'
 gem 'arel', '~> 6.0'
 
 group :development, :test do
+  # We need to explicitly include bigdecimal for ruby 2.7 .
+  # See https://github.com/ruby/bigdecimal for details.
+  rb_version = Gem::Version.new(RUBY_VERSION)
+  if Gem::Version.new('2.7') <= rb_version && rb_version < Gem::Version.new('2.8')
+     gem 'bigdecimal', '~> 1.3.5', platforms: %i[mri mingw x64_mingw mswin]
+  end
+
   gem 'activesupport', '~> 4.0'
   gem 'activemodel', '~> 4.0'
   gem 'activerecord', '~> 4.0'
@@ -11,15 +18,17 @@ group :development, :test do
   gem 'mysql2', '0.4.10', platforms: %i[mri mswin mingw]
   gem 'pg', '< 1.0.0', platforms: %i[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: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 4.2.0', platforms: %i[mri mingw x64_mingw mswin]
 
   gem 'ruby-oci8', platforms: %i[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 'jdbc-sqlite3', '~> 3.28', platforms: :jruby
+  gem 'jdbc-postgres', '~> 42.2', platforms: :jruby
+  gem 'jdbc-mysql', '~> 5.1', platforms: :jruby
   gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
   gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
   gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby

data/gemspecs/arel_extensions-v1.gemspec

@@ -23,6 +23,5 @@ Gem::Specification.new do |s|
   s.add_dependency('arel', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
-  s.add_development_dependency('rdoc', '>= 6.3.1')
   s.add_development_dependency('rake', '~> 12.3.3')
 end

data/gemspecs/arel_extensions-v2.gemspec

@@ -23,6 +23,5 @@ Gem::Specification.new do |s|
   s.add_dependency('activerecord', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
-  s.add_development_dependency('rdoc', '>= 6.3.1')
   s.add_development_dependency('rake', '~> 12.3.3')
 end

data/lib/arel_extensions/nodes/case.rb

@@ -35,12 +35,13 @@ module ArelExtensions
       include Arel::Predications
       include Arel::OrderPredications
       include ArelExtensions::Aliases
-      include ArelExtensions::Math
       include ArelExtensions::Comparators
-      include ArelExtensions::Predications
+      include ArelExtensions::DateDuration
+      include ArelExtensions::Math
       include ArelExtensions::MathFunctions
-      include ArelExtensions::StringFunctions
       include ArelExtensions::NullFunctions
+      include ArelExtensions::Predications
+      include ArelExtensions::StringFunctions
 
       def return_type
         obj = if @conditions.length > 0

data/lib/arel_extensions/nodes/rollup.rb

@@ -0,0 +1,36 @@
+# The following is a patch to activerecord when it doesn't
+# have RollUp defined, i.e. for rails < 5.2
+
+begin
+  Arel::Nodes.const_get('RollUp')
+rescue NameError => e
+  module Arel
+    module Nodes
+      class RollUp < Arel::Nodes::Unary
+      end
+    end
+  end
+
+  module Arel
+    module Visitors
+      class PostgreSQL
+        # Utilized by GroupingSet, Cube & RollUp visitors to
+        # handle grouping aggregation semantics
+        def grouping_array_or_grouping_element(o, collector)
+          if o.expr.is_a? Array
+            collector << "( "
+            visit o.expr, collector
+            collector << " )"
+          else
+            visit o.expr, collector
+          end
+        end
+
+        def visit_Arel_Nodes_RollUp(o, collector)
+          collector << "ROLLUP"
+          grouping_array_or_grouping_element o, collector
+        end
+      end
+    end
+  end
+end

data/lib/arel_extensions/nodes/select.rb

@@ -0,0 +1,10 @@
+module Arel
+  module Nodes
+    class SelectCore
+      # havings did not exist in rails < 5.2
+      if !method_defined?(:havings)
+        alias :havings :having
+      end
+    end
+  end
+end

data/lib/arel_extensions/null_functions.rb

@@ -3,6 +3,12 @@ require 'arel_extensions/nodes/is_null'
 
 module ArelExtensions
   module NullFunctions
+
+    # if_present returns nil if the the value is nil or blank
+    def if_present
+      Arel.when(self.cast(:string).present).then(self)
+    end
+
     # ISNULL function lets you return an alternative value when an expression is NULL.
     def is_null
       ArelExtensions::Nodes::IsNull.new [self]
@@ -19,5 +25,15 @@ module ArelExtensions
       args.unshift(self)
       ArelExtensions::Nodes::Coalesce.new args
     end
+
+    def coalesce_blank *args
+      res = Arel.when(self.cast(:string).present).then(self)
+      args[0...-1].each do |a|
+        val = a.is_a?(Arel::Nodes::Node) ? a : Arel.quoted(a)
+        res = res.when(val.present).then(a)
+      end
+      res = res.else(args[-1])
+      res
+    end
   end
 end

data/lib/arel_extensions/string_functions.rb

@@ -184,6 +184,7 @@ module ArelExtensions
     def not_blank
       ArelExtensions::Nodes::NotBlank.new [self]
     end
+    alias present not_blank
 
     def repeat other = 1
       ArelExtensions::Nodes::Repeat.new [self, other]

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '2.1.5'.freeze
+  VERSION = '2.1.6'.freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -49,6 +49,82 @@ module ArelExtensions
         'YYYY-MM-DDTHH:MM:SS:MMM' => 126
       }.freeze
 
+      # Quoting in JRuby + AR < 5 requires special handling for MSSQL.
+      #
+      # It relied on @connection.quote, which in turn relied on column type for
+      # quoting. We need only to rely on the value type.
+      #
+      # It didn't handle numbers correctly: `quote(1, nil)` translated into
+      # `N'1'` which we don't want.
+      #
+      # The following is adapted from activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+      #
+      if RUBY_PLATFORM == 'java' && ActiveRecord::VERSION::MAJOR < 5
+        def quote_string(s)
+          s.gsub('\\', '\&\&').gsub("'", "''") # ' (for ruby-mode)
+        end
+
+        def quoted_binary(value) # :nodoc:
+          "'#{quote_string(value.to_s)}'"
+        end
+
+        def quoted_date(value)
+          if value.acts_like?(:time)
+            if ActiveRecord::Base.default_timezone == :utc
+              value = value.getutc if value.respond_to?(:getutc) && !value.utc?
+            else
+              value = value.getlocal if value.respond_to?(:getlocal)
+            end
+          end
+
+          result = value.to_s(:db)
+          if value.respond_to?(:usec) && value.usec > 0
+            result << '.' << sprintf('%06d', value.usec)
+          else
+            result
+          end
+        end
+
+        def quoted_true
+          'TRUE'
+        end
+
+        def quoted_false
+          'FALSE'
+        end
+
+        def quoted_time(value) # :nodoc:
+          value = value.change(year: 2000, month: 1, day: 1)
+          quoted_date(value).sub(/\A\d{4}-\d{2}-\d{2} /, "")
+        end
+
+        def quote value, column = nil
+          case value
+          when Arel::Nodes::SqlLiteral
+            value
+          when String, Symbol, ActiveSupport::Multibyte::Chars
+            "'#{quote_string(value.to_s)}'"
+          when true      
+            quoted_true
+          when false     
+            quoted_false
+          when nil       
+            'NULL'
+          # BigDecimals need to be put in a non-normalized form and quoted.
+          when BigDecimal
+            value.to_s('F')
+          when Numeric, ActiveSupport::Duration
+            value.to_s
+          when Date, Time
+            "'#{quoted_date(value)}'"
+          when Class
+            "'#{value}'"
+          else
+            raise TypeError, "can't quote #{value.class.name}"
+          end
+        end
+      end
+
       # Math Functions
       def visit_ArelExtensions_Nodes_Ceil o, collector
         collector << 'CEILING('
@@ -487,6 +563,11 @@ module ArelExtensions
         collector
       end
 
+      def visit_Arel_Nodes_RollUp(o, collector)
+        collector << "ROLLUP"
+        grouping_array_or_grouping_element o, collector
+      end
+
       # TODO;
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << '(STRING_AGG('
@@ -647,6 +728,18 @@ module ArelExtensions
         collector << ')'
         collector
       end
+
+      # Utilized by GroupingSet, Cube & RollUp visitors to
+      # handle grouping aggregation semantics
+      def grouping_array_or_grouping_element(o, collector)
+        if o.expr.is_a? Array
+          collector << "( "
+          visit o.expr, collector
+          collector << " )"
+        else
+          visit o.expr, collector
+        end
+      end
     end
   end
 end