Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add group_by_grouping_sets query method #161

Merged
merged 1 commit into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/active_record/connection_adapters/clickhouse_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

require 'arel/visitors/clickhouse'
require 'arel/nodes/final'
require 'arel/nodes/grouping_sets'
require 'arel/nodes/settings'
require 'arel/nodes/using'
require 'active_record/connection_adapters/clickhouse/oid/array'
Expand Down Expand Up @@ -47,7 +48,11 @@ def is_view

module ModelSchema
module ClassMethods
delegate :final, :final!, :settings, :settings!, :window, :window!, to: :all
delegate :final, :final!,
:group_by_grouping_sets, :group_by_grouping_sets!,
:settings, :settings!,
:window, :window!,
to: :all

def is_view
@is_view || false
Expand Down
32 changes: 32 additions & 0 deletions lib/arel/nodes/grouping_sets.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# frozen_string_literal: true

module Arel # :nodoc: all
module Nodes
class GroupingSets < Arel::Nodes::Unary

def initialize(expr)
super
@expr = wrap_grouping_sets(expr)
end

private

def wrap_grouping_sets(sets)
sets.map do |element|
# See Arel::SelectManager#group
case element
when Array
wrap_grouping_sets(element)
when String
::Arel::Nodes::SqlLiteral.new(element)
when Symbol
::Arel::Nodes::SqlLiteral.new(element.to_s)
else
element
end
end
end

end
end
end
24 changes: 24 additions & 0 deletions lib/arel/visitors/clickhouse.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ def visit_Arel_Nodes_Final(o, collector)
collector
end

def visit_Arel_Nodes_GroupingSets(o, collector)
collector << 'GROUPING SETS '
grouping_array_or_grouping_element(o.expr, collector)
end

def visit_Arel_Nodes_Settings(o, collector)
return collector if o.expr.empty?

Expand Down Expand Up @@ -95,6 +100,25 @@ def sanitize_as_setting_name(value)
@connection.sanitize_as_setting_name(value)
end

private

# Utilized by GroupingSet, Cube & RollUp visitors to
# handle grouping aggregation semantics
def grouping_array_or_grouping_element(o, collector)
if o.is_a? Array
collector << '( '
o.each_with_index do |el, i|
collector << ', ' if i > 0
grouping_array_or_grouping_element el, collector
end
collector << ' )'
elsif o.respond_to? :expr
visit o.expr, collector
else
visit o, collector
end
end

end
end
end
27 changes: 27 additions & 0 deletions lib/core_extensions/active_record/relation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,33 @@ def final!
self
end

# GROUPING SETS allows you to specify multiple groupings in the GROUP BY clause.
# Whereas GROUP BY CUBE generates all possible groupings, GROUP BY GROUPING SETS generates only the specified groupings.
# For example:
#
# users = User.group_by_grouping_sets([], [:name], [:name, :age]).select(:name, :age, 'count(*)')
# # SELECT name, age, count(*) FROM users GROUP BY GROUPING SETS ( (), (name), (name, age) )
#
# which is generally equivalent to:
# # SELECT NULL, NULL, count(*) FROM users
# # UNION ALL
# # SELECT name, NULL, count(*) FROM users GROUP BY name
# # UNION ALL
# # SELECT name, age, count(*) FROM users GROUP BY name, age
#
# Raises <tt>ArgumentError</tt> if no grouping sets are specified are provided.
def group_by_grouping_sets(*grouping_sets)
raise ArgumentError, 'The method .group_by_grouping_sets() must contain arguments.' if grouping_sets.blank?

spawn.group_by_grouping_sets!(*grouping_sets)
end

def group_by_grouping_sets!(*grouping_sets) # :nodoc:
grouping_sets = grouping_sets.map { |set| arel_columns(set) }
self.group_values += [::Arel::Nodes::GroupingSets.new(grouping_sets)]
self
end

# The USING clause specifies one or more columns to join, which establishes the equality of these columns. For example:
#
# users = User.joins(:joins).using(:event_name, :date)
Expand Down
32 changes: 32 additions & 0 deletions spec/single/model_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,38 @@ class ModelPk < ActiveRecord::Base
expect(Model.final.where(date: '2023-07-21').to_sql).to eq('SELECT sample.* FROM sample FINAL WHERE sample.date = \'2023-07-21\'')
end
end


describe '#group_by_grouping_sets' do
it 'raises an error with no arguments' do
expect { Model.group_by_grouping_sets }.to raise_error(ArgumentError, 'The method .group_by_grouping_sets() must contain arguments.')
end

it 'works with the empty grouping set' do
sql = Model.group_by_grouping_sets([]).to_sql
expect(sql).to eq('SELECT sample.* FROM sample GROUP BY GROUPING SETS ( ( ) )')
end

it 'accepts strings' do
sql = Model.group_by_grouping_sets(%w[foo bar], %w[baz]).to_sql
expect(sql).to eq('SELECT sample.* FROM sample GROUP BY GROUPING SETS ( ( foo, bar ), ( baz ) )')
end

it 'accepts symbols' do
sql = Model.group_by_grouping_sets(%i[foo bar], %i[baz]).to_sql
expect(sql).to eq('SELECT sample.* FROM sample GROUP BY GROUPING SETS ( ( foo, bar ), ( baz ) )')
end

it 'accepts Arel nodes' do
sql = Model.group_by_grouping_sets([Model.arel_table[:foo], Model.arel_table[:bar]], [Model.arel_table[:baz]]).to_sql
expect(sql).to eq('SELECT sample.* FROM sample GROUP BY GROUPING SETS ( ( sample.foo, sample.bar ), ( sample.baz ) )')
end

it 'accepts mixed arguments' do
sql = Model.group_by_grouping_sets(['foo', :bar], [Model.arel_table[:baz]]).to_sql
expect(sql).to eq('SELECT sample.* FROM sample GROUP BY GROUPING SETS ( ( foo, bar ), ( sample.baz ) )')
end
end
end

context 'sample with id column' do
Expand Down
Loading