click_house-client 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb73c384094387fbb53365e18a5378aca87148e07e501b25e03f9371cead01e
-  data.tar.gz: f5a179a229a5c9fe115ce03d84d22d14b01c56dfa99694cea5f75d9f9c034f37
+  metadata.gz: 97b70adb1e2d3d10d16d81ff3510446d9811680c2f19ecc7183fd97d337ef667
+  data.tar.gz: bc846f969732dc3db9b74d202d2616e4fe185857f5aa8180e6bb94888563b874
 SHA512:
-  metadata.gz: 1b3055e3104e139834ac5e3538ac3d0e402c16b8f1456861ed0bca269c03870038c9aadc97ebb1c74e1486a273c6a44867f20a07f423075ab8e8b90f972c2acd
-  data.tar.gz: 9f1e7160de8c0d4ead180e10dfc40b36db5e155d08a1d7d2c62c6225636dc72751c7b1ee68d583ff8653409b8fdddb8e9ce0cd2ff920bd38995e5eab8408e04e
+  metadata.gz: 1db29052a7ea692177553eeede929f566966af28a1d10873e98edea6d96176ce72a1004669f4e079c169a33df071ae93e20bb438f6a074c3ddad4b915b3c44ac
+  data.tar.gz: 3c89c6ea62bb20bdcf6ec74df0ffd57a677f38b85a72ecf9d430c8f7a1a049f5fc726cabac275bccfa362c83879c76de54065eaa7f3388e308a65286cc776333

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    click_house-client (0.5.0)
+    click_house-client (0.6.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.0)
+  click_house-client (0.6.0)
   concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6
   connection_pool (2.5.3) sha256=cfd74a82b9b094d1ce30c4f1a346da23ee19dc8a062a16a85f58eab1ced4305b
   diff-lcs (1.5.0) sha256=49b934001c8c6aedb37ba19daec5c634da27b318a7a3c654ae979d6ba1929b67

data/README.md

@@ -22,10 +22,13 @@ ClickHouse::Client.configure do |config|
 
   # Use any HTTP client to build the POST request, here we use Net::HTTP
   config.http_post_proc = ->(url, headers, body) do
-    # Query placeholders go to the URI
-    params = URI.encode_www_form(body.except("query"))
+    uri = URI.parse(url)
+
+    unless body.is_a?(IO)
+      # Append placeholders to URI's query
+      uri.query = [uri.query, URI.encode_www_form(body.except("query"))].compact.join('&')
+    end
 
-    uri = URI.parse("#{url}&#{params}")
     request = Net::HTTP::Post.new(uri)
 
     headers.each do |header, value|
@@ -33,9 +36,14 @@ ClickHouse::Client.configure do |config|
     end
 
     request['Content-type'] = 'application/x-www-form-urlencoded'
-    request.body = body["query"]
 
-    response = Net::HTTP.start(uri.hostname, uri.port) do |http|
+    if body.is_a?(IO)
+      request.body_stream = body
+    else
+      request.body = body['query']
+    end
+
+    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
       http.request(request)
     end
 

data/lib/click_house/client/formatter.rb

@@ -6,6 +6,9 @@ module ClickHouse
       DEFAULT = ->(value) { value }
 
       BASIC_TYPE_CASTERS = {
+        'Int32' => ->(value) { Integer(value) },
+        'UInt32' => ->(value) { Integer(value) },
+        'Int64' => ->(value) { Integer(value) },
         'UInt64' => ->(value) { Integer(value) },
         "DateTime64(6, 'UTC')" => ->(value) { ActiveSupport::TimeZone['UTC'].parse(value) },
         "IntervalSecond" => ->(value) { ActiveSupport::Duration.build(value.to_i) },

data/lib/click_house/client/query_builder.rb

@@ -54,7 +54,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
 
@@ -179,32 +197,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.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house-client
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - group::optimize
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-22 00:00:00.000000000 Z
+date: 2025-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord