clickhouse-activerecord 1.6.2 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c1e3e82dce96b76db15803ccee1b33d8808d0c4eb542115a080d8aa3854859a
-  data.tar.gz: 1ed698d16beeb439179b7d57139328ab47ffd25598ad5a98b314e0612166b1c2
+  metadata.gz: a31a5e1d3ea2e5d069ce7167a472e1eb001e9a9dbae0245a3adbc82a1155436d
+  data.tar.gz: 6e690df8b5088073777b46098ff77659da3c7b1fa7c9593305a07e7f61df2d31
 SHA512:
-  metadata.gz: fc3f56f9f381a583a66ed57db6a8a1457868ce29db354302991920721118415b9850ac02ae4fe7f86dccb618971b87a310c50befb8ba84ca0528b463f9e2d736
-  data.tar.gz: c1427aa749177c0f6f97ad34db9508dadbef1f22448d83d1466e61428f8f438aab2fe90851d7f95874399d9019f19ed1dfb74bb05a4a86e183f2ad1467b32763
+  metadata.gz: 89075c98153b99021ba858ae4de186beff0ab537780f141d974480f8ac1d44a71dd751d15693c6b605a4fc956a537cb8026ddf5d5bd1d4eaaedd8d7863369ec3
+  data.tar.gz: c498273b5fd00c0acdd174315783d62220b52e4aa99ffb08f491c61fe5f7a76b3c0fd63bc5ea78c385f53c2947fee4c87f37317c868e0b9d38ece66eb6d92c5a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### Version 1.6.4 (Feb 13, 2026)
+
+* Fix error: EOFError (end of file reached)
+
+### Version 1.6.3 (Feb 04, 2026)
+
+* Rename method `execute_streaming` to `execute_to_file`
+
 ### Version 1.6.2 (Jan 30, 2026)
 
 * Add streaming request and save response to tmp file

data/README.md

@@ -238,7 +238,7 @@ Action.with(ActionView.select(Arel.sql('min(date)')) => :min_date).where(Arel.sq
 ### Streaming request
 
 ```ruby
-path = Action.connection.execute_streaming(Action.where(date: Date.current), format: 'CSVWithNames')
+path = Action.connection.execute_to_file(Action.where(date: Date.current), format: 'CSVWithNames')
 # Clickhouse Stream (10.3ms)  SELECT actions.* FROM actions WHERE actions.date = '2017-11-29'
 file = File.open(path)
 ```

data/lib/active_record/connection_adapters/clickhouse/schema_statements.rb

@@ -53,14 +53,12 @@ module ActiveRecord
           end
         end
 
-        # @return [ClickhouseActiverecord::StreamResponse]
-        def execute_streaming(sql, name = nil, format: @response_format, settings: {})
+        # Execute an SQL query and save the result to a file in stream mode
+        # @return [String]
+        def execute_to_file(sql, name = nil, format: @response_format, settings: {})
           with_response_format(format) do
             log(sql, [adapter_name, 'Stream', name].compact.join(' ')) do
-              statement = Statement.new(sql, format: @response_format)
-              request(statement, settings: settings) do |response|
-                return statement.streaming_response(response)
-              end
+              request(sql, settings: settings, streaming: true)
             end
           end
         end
@@ -101,8 +99,7 @@ module ActiveRecord
         # @link https://clickhouse.com/docs/en/sql-reference/statements/delete
         def exec_delete(sql, name = nil, _binds = [])
           log(sql, "#{adapter_name} #{name}") do
-            statement = Statement.new(sql, format: @response_format)
-            res = request(statement)
+            res = request(sql, raw_response: true)
             begin
               data = JSON.parse(res.header['x-clickhouse-summary'])
               data['result_rows'].to_i
@@ -279,23 +276,30 @@ module ActiveRecord
         end
 
         def raw_execute(sql, settings: {}, except_params: [])
-          statement = Statement.new(sql, format: @response_format)
-          response = request(statement, settings: settings, except_params: except_params)
-          statement.processed_response(response)
+          request(sql, settings: settings, except_params: except_params)
         end
 
         # Make HTTP request to ClickHouse server
-        # @param [ActiveRecord::ConnectionAdapters::Clickhouse::Statement] statement
+        # @param [String] sql
         # @param [Hash] settings
         # @param [Array] except_params
         # @return [Net::HTTPResponse]
-        def request(statement, settings: {}, except_params: [], &block)
+        def request(sql, settings: {}, except_params: [], raw_response: false, streaming: false)
           @lock.synchronize do
             req = Net::HTTP::Post.new("/?#{settings_params(settings, except: except_params)}", {
               'Content-Type' => 'application/x-www-form-urlencoded',
               'User-Agent' => ClickhouseAdapter::USER_AGENT,
             })
-            @connection.request(req, statement.formatted_sql, &block)
+            statement = Statement.new(sql, format: @response_format)
+            if streaming
+              @connection.request(req, statement.formatted_sql) do |response|
+                return statement.streaming_response(response)
+              end
+            else
+              response = @connection.request(req, statement.formatted_sql)
+              return response if raw_response
+              statement.processed_response(response)
+            end
           end
         end
 

data/lib/clickhouse-activerecord/schema_dumper.rb

@@ -85,10 +85,16 @@ module ClickhouseActiverecord
             columns.each do |column|
               raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" unless @connection.valid_type?(column.type)
               next if column.name == pk && column.name == "id"
-              type, colspec = column_spec(column)
               name = column.name =~ (/\./) ? "\"`#{column.name}`\"" : column.name.inspect
-              tbl.print "    t.#{type} #{name}"
-              tbl.print ", #{format_colspec(colspec)}" if colspec.present?
+              if column.sql_type.match?(/^(Simple)?AggregateFunction/)
+                tbl.print "    t.column #{name}, #{column.sql_type.inspect}"
+                colspec = prepare_column_options(column)
+                tbl.print ", #{format_colspec(colspec)}" if colspec.present?
+              else
+                type, colspec = column_spec(column)
+                tbl.print "    t.#{type} #{name}"
+                tbl.print ", #{format_colspec(colspec)}" if colspec.present?
+              end
               tbl.puts
             end
           end

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '1.6.2'
+  VERSION = '1.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.4
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-30 00:00:00.000000000 Z
+date: 2026-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler