click_house-client 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55b79507a43d0c64c35ed2a024c4314e6d8d1f4daf227aee3db84947d34e2a2a
-  data.tar.gz: 6673504ba4ffe2b790064529600e3e66e5e7c4d687cc82f15fb9237cd5661c94
+  metadata.gz: c9934204626e5719062113ca9663b762a387b91112a39bfe78aa6ac92f5741d6
+  data.tar.gz: 574ea9046e7cd316802871c6dc86152022092b4d0bea14c1d10943dec3cf6748
 SHA512:
-  metadata.gz: 41b0de769672003cd9ab1e8d755419191ba53f47786f555f12c018c8a41cc101f0196f48ea7f2f7ad1f0f0390eb1be04e14bb7d0c0f5d351b8b712b1b7dcfae3
-  data.tar.gz: 3cd5e7948eb80aedf7f75b4470d067b4ef7e1a70b987b349786700d5aa07b981439d8baa75fc399def7a4f2ed80e8ba47f0c8779cf12fc06771626e2f0ebc605
+  metadata.gz: 8ace70ea9c9575040206ac917acb386b95bb206d79a4e270f558b2b189ed5a11add58fd79e8b821538d6042ebd9d189a7552472b1036bd4191705a5d8504788e
+  data.tar.gz: 2b962b32106e75a1ed3384703907558de78d97356a88d9903cc3b427a43c4158415a28810fd10d7d28ad0fa9c2999421c7a7b7d925e7b3cb5cc1a50e3ad418b9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    click_house-client (0.5.1)
+    click_house-client (0.7.0)
       activerecord (>= 7.0, < 9.0)
       activesupport (>= 7.0, < 9.0)
       addressable (~> 2.8)
@@ -136,7 +136,7 @@ CHECKSUMS
   benchmark (0.4.1) sha256=d4ef40037bba27f03b28013e219b950b82bace296549ec15a78016552f8d2cce
   bigdecimal (3.2.2) sha256=39085f76b495eb39a79ce07af716f3a6829bc35eb44f2195e2753749f2fa5adc
   byebug (12.0.0) sha256=d4a150d291cca40b66ec9ca31f754e93fed8aa266a17335f71bb0afa7fca1a1e
-  click_house-client (0.5.1)
+  click_house-client (0.7.0)
   concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6
   connection_pool (2.5.3) sha256=cfd74a82b9b094d1ce30c4f1a346da23ee19dc8a062a16a85f58eab1ced4305b
   diff-lcs (1.5.0) sha256=49b934001c8c6aedb37ba19daec5c634da27b318a7a3c654ae979d6ba1929b67

data/lib/click_house/client/arel_visitor.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module ClickHouse
+  module Client
+    class ArelVisitor < Arel::Visitors::ToSql
+      private
+
+      # rubocop:disable Naming/MethodName -- parent method calls in this format
+      def visit_Arel_Nodes_Matches(object, collector)
+        op = object.case_sensitive ? " LIKE " : " ILIKE "
+        collector = infix_value object, collector, op
+        if object.escape
+          collector << " ESCAPE "
+          visit object.escape, collector
+        else
+          collector
+        end
+      end
+
+      def visit_Arel_Nodes_DoesNotMatch(object, collector)
+        op = object.case_sensitive ? " NOT LIKE " : " NOT ILIKE "
+        collector = infix_value object, collector, op
+        if object.escape
+          collector << " ESCAPE "
+          visit object.escape, collector
+        else
+          collector
+        end
+      end
+
+      # rubocop:enable Naming/MethodName
+    end
+  end
+end

data/lib/click_house/client/query_builder.rb

@@ -21,7 +21,9 @@ module ClickHouse
         Arel::Nodes::Between,
         Arel::Nodes::And,
         Arel::Nodes::Or,
-        Arel::Nodes::Grouping
+        Arel::Nodes::Grouping,
+        Arel::Nodes::Matches,
+        Arel::Nodes::DoesNotMatch
       ].freeze
 
       def initialize(table_name)
@@ -54,7 +56,25 @@ module ClickHouse
         validate_constraint_type!(constraints)
 
         clone.tap do |new_instance|
-          add_constraints_to(new_instance, constraints)
+          apply_constraints(new_instance, constraints, :where)
+        end
+      end
+
+      # The `having` method applies constraints to the HAVING clause, similar to how
+      # `where` applies constraints to the WHERE clause. It supports the same constraint types.
+      # Correct usage:
+      #   query.group(:name).having(count: 5).to_sql
+      #   "SELECT * FROM \"table\" GROUP BY \"table\".\"name\" HAVING \"table\".\"count\" = 5"
+      #
+      #   query.group(:name).having(query.table[:count].gt(10)).to_sql
+      #   "SELECT * FROM \"table\" GROUP BY \"table\".\"name\" HAVING \"table\".\"count\" > 10"
+      #
+      # @return [ClickHouse::QueryBuilder] New instance of query builder.
+      def having(constraints)
+        validate_constraint_type!(constraints)
+
+        clone.tap do |new_instance|
+          apply_constraints(new_instance, constraints, :having)
         end
       end
 
@@ -159,7 +179,7 @@ module ClickHouse
       end
 
       def to_sql
-        visitor = Arel::Visitors::ToSql.new(ClickHouse::Client::ArelEngine.new)
+        visitor = ClickHouse::Client::ArelVisitor.new(ClickHouse::Client::ArelEngine.new)
         visitor.accept(manager.ast, Arel::Collectors::SQLString.new).value
       end
 
@@ -179,32 +199,45 @@ module ClickHouse
         raise ArgumentError, "Unsupported Arel node type for QueryBuilder: #{constraint.class.name}"
       end
 
-      def add_constraints_to(instance, constraints)
+      def apply_constraints(instance, constraints, clause_type)
         if constraints.is_a?(Arel::Nodes::Node)
-          instance.manager.where(constraints)
+          apply_constraint_node(instance, constraints, clause_type)
         else
           constraints.each do |key, value|
             if value.is_a?(Hash)
               # Handle nested hash for joined tables
               join_table = Arel::Table.new(key)
               value.each do |nested_key, nested_value|
-                build_arel_constraint(instance, join_table, nested_key, nested_value)
+                constraint = build_constraint(join_table, nested_key, nested_value)
+                apply_constraint_node(instance, constraint, clause_type)
               end
             else
-              build_arel_constraint(instance, instance.table, key, value)
+              constraint = build_constraint(instance.table, key, value)
+              apply_constraint_node(instance, constraint, clause_type)
             end
           end
         end
       end
 
-      def build_arel_constraint(instance, table, key, value)
-        constraint = if value.is_a?(Array)
-                       table[key].in(value)
-                     else
-                       table[key].eq(value)
-                     end
+      def apply_constraint_node(instance, constraint, clause_type)
+        case clause_type
+        when :where
+          instance.manager.where(constraint)
+        when :having
+          instance.manager.having(constraint)
+        else
+          raise ArgumentError, "Unsupported clause type: #{clause_type}"
+        end
+      end
 
-        instance.manager.where(constraint)
+      def build_constraint(table, key, value)
+        if value.is_a?(Array)
+          table[key].in(value)
+        elsif value.is_a?(ClickHouse::Client::QueryBuilder)
+          table[key].in(value.to_arel)
+        else
+          table[key].eq(value)
+        end
       end
 
       def validate_order_direction!(direction)

data/lib/click_house/client/version.rb

@@ -2,6 +2,6 @@
 
 module ClickHouse
   module Client
-    VERSION = "0.5.1"
+    VERSION = "0.7.0"
   end
 end

data/lib/click_house/client.rb

@@ -19,6 +19,7 @@ require_relative "client/redactor"
 require_relative "client/query_builder"
 require_relative "client/formatter"
 require_relative "client/response"
+require_relative "client/arel_visitor"
 
 module ClickHouse
   module Client

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house-client
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - group::optimize
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-25 00:00:00.000000000 Z
+date: 2025-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -184,6 +184,7 @@ files:
 - gemfiles/Gemfile-rails-8.0
 - lib/click_house/client.rb
 - lib/click_house/client/arel_engine.rb
+- lib/click_house/client/arel_visitor.rb
 - lib/click_house/client/bind_index_manager.rb
 - lib/click_house/client/configuration.rb
 - lib/click_house/client/database.rb