clickhouse-activerecord 1.3.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8710787ab541533a020ea884090c897bd47a7bfefb0cd93bf552e6776ae2583
-  data.tar.gz: 104eb3ec2a235899004ecc1c0ff01432da4b1fccfdfa5144e041351aaedc9dfd
+  metadata.gz: b8c5d0d360ba85375ca8f11600f5a6c3e37cd24504ede6255dbced8e3652319b
+  data.tar.gz: d2491e138a661eeb1c9952064e55125eed84f61fdebab88279e3ba73d881d19f
 SHA512:
-  metadata.gz: 8346c11c2f912c78f82129f66f0fcc09e4c6689fe64a3d31cbb951c4046ae7102e7e33cd05258eb8b8136c4aa41a0f0297562b2228b8540480a8a6d6d4554edf
-  data.tar.gz: bae4f5c8a7b2ceb3eb9341f0b64cd1c57694791db3aecbdb3b92b4ed98ac4b76246ca0941e19f1f66ca28c96b51b82dbbde98d7552e7c856978de7abf3667db6
+  metadata.gz: 3904eff8d2ff017cdb2572483baa5e201e8280799a4ab8753e5545ac27795365bec5174b183b2128cdbe7c8cf075c935f9d9f0b83045c5569db397a22ece8ad7
+  data.tar.gz: 80aed33044ca6ebf12280f352e41584a7c9582f7e934f44370a49148ad292a3af499f2d5132621142756fd384cea51111c59bed8f4a188539ed80b552befba7e

data/.docker/clickhouse/cluster/server1_config.xml

@@ -15,15 +15,16 @@
   <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
   <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
   <access_control_path>/var/lib/clickhouse/access/</access_control_path>
+  <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
   <keep_alive_timeout>3</keep_alive_timeout>
 
   <logger>
-    <level>debug</level>
+    <level>error</level>
     <log>/var/log/clickhouse-server/clickhouse-server.log</log>
     <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
     <size>1000M</size>
     <count>10</count>
-    <console>1</console>
+    <console>0</console>
   </logger>
 
   <remote_servers>
@@ -114,4 +115,11 @@
       <value>86400</value>
     </header>
   </http_options_response>
+
+  <user_directories>
+    <users_xml>
+      <path>users.xml</path>
+    </users_xml>
+  </user_directories>
+
 </clickhouse>

data/.docker/clickhouse/cluster/server2_config.xml

@@ -15,15 +15,16 @@
   <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
   <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
   <access_control_path>/var/lib/clickhouse/access/</access_control_path>
+  <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
   <keep_alive_timeout>3</keep_alive_timeout>
 
   <logger>
-    <level>debug</level>
+    <level>error</level>
     <log>/var/log/clickhouse-server/clickhouse-server.log</log>
     <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
     <size>1000M</size>
     <count>10</count>
-    <console>1</console>
+    <console>0</console>
   </logger>
 
   <remote_servers>
@@ -114,4 +115,11 @@
       <value>86400</value>
     </header>
   </http_options_response>
+
+  <user_directories>
+    <users_xml>
+      <path>users.xml</path>
+    </users_xml>
+  </user_directories>
+
 </clickhouse>

data/.docker/clickhouse/single/config.xml

@@ -14,15 +14,16 @@
   <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
   <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
   <access_control_path>/var/lib/clickhouse/access/</access_control_path>
+  <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
   <keep_alive_timeout>3</keep_alive_timeout>
 
   <logger>
-    <level>debug</level>
+    <level>error</level>
     <log>/var/log/clickhouse-server/clickhouse-server.log</log>
     <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
     <size>1000M</size>
     <count>10</count>
-    <console>1</console>
+    <console>0</console>
   </logger>
 
   <query_log>
@@ -51,4 +52,10 @@
     </header>
   </http_options_response>
 
+  <user_directories>
+    <users_xml>
+      <path>users.xml</path>
+    </users_xml>
+  </user_directories>
+
 </clickhouse>

data/.docker/clickhouse/users.xml

@@ -8,8 +8,17 @@
   </profiles>
 
   <users>
+    <test>
+      <password>test</password>
+      <networks>
+        <ip>::/0</ip>
+      </networks>
+      <profile>default</profile>
+      <quota>default</quota>
+      <access_management>1</access_management>
+    </test>
     <default>
-      <password></password>
+      <password />
       <networks>
         <ip>::/0</ip>
       </networks>

data/.docker/docker-compose.cluster.yml

@@ -1,6 +1,6 @@
 services:
   clickhouse1:
-    image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-23.11-alpine}'
+    image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}'
     ulimits:
       nofile:
         soft: 262144
@@ -18,7 +18,7 @@ services:
       interval: 5s
 
   clickhouse2:
-    image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-23.11-alpine}'
+    image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}'
     ulimits:
       nofile:
         soft: 262144

data/.docker/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   clickhouse:
-    image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-23.11-alpine}'
+    image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}'
     container_name: 'clickhouse-activerecord-clickhouse-server'
     ports:
       - '18123:8123'

data/.github/workflows/testing.yml

@@ -14,6 +14,8 @@ jobs:
     env:
       CLICKHOUSE_PORT: 18123
       CLICKHOUSE_DATABASE: default
+      CLICKHOUSE_USER: test
+      CLICKHOUSE_PASSWORD: test
 
     strategy:
       fail-fast: true
@@ -22,21 +24,21 @@ jobs:
         version:
           - ruby: 2.7
             rails: 7.1.3
-          - ruby: 3.0
-            rails: 7.1.3
           - ruby: 3.2
             rails: 7.1.3
           - ruby: 3.2
             rails: 7.2.1
           - ruby: 3.2
             rails: 8.0.1
-        clickhouse: [ '22.1', '24.9' ]
+          - ruby: 3.2
+            rails: 8.1
+        clickhouse: [ '24.9', '25.10' ]
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Start ClickHouse ${{ matrix.clickhouse }}
-        uses: hoverkraft-tech/compose-action@v2.1.0
+        uses: hoverkraft-tech/compose-action@v2.4.1
         env:
           CLICKHOUSE_VERSION: ${{ matrix.clickhouse }}
         with:
@@ -61,6 +63,8 @@ jobs:
       CLICKHOUSE_PORT: 28123
       CLICKHOUSE_DATABASE: default
       CLICKHOUSE_CLUSTER: test_cluster
+      CLICKHOUSE_USER: test
+      CLICKHOUSE_PASSWORD: test
 
     strategy:
       fail-fast: true
@@ -69,21 +73,21 @@ jobs:
         version:
           - ruby: 2.7
             rails: 7.1.3
-          - ruby: 3.0
-            rails: 7.1.3
           - ruby: 3.2
             rails: 7.1.3
           - ruby: 3.2
             rails: 7.2.1
           - ruby: 3.2
             rails: 8.0.1
-        clickhouse: [ '22.1', '24.9' ]
+          - ruby: 3.2
+            rails: 8.1
+        clickhouse: [ '24.9', '25.10' ]
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Start ClickHouse Cluster ${{ matrix.clickhouse }}
-        uses: hoverkraft-tech/compose-action@v2.1.0
+        uses: hoverkraft-tech/compose-action@v2.4.1
         env:
           CLICKHOUSE_VERSION: ${{ matrix.clickhouse }}
         with:

data/CHANGELOG.md

@@ -1,4 +1,54 @@
-### Version 1.1.2 (Aug 27, 2024)
+### Version 1.5.0 (Nov 5, 2025)
+
+* 🎉 Support for Rails 8.1
+* Fix sql structure dump with `schema_migrations` #138
+* Remove old tasks
+
+### Version 1.4.0 (Sep 18, 2025)
+
+* `CREATE OR REPLACE FUNCTION` in SQL schema dumps in #198
+* Added shard config to handle replica path with shard in #201
+* Add support for simple schema dumping in #203
+* Unscope :final and :settings in #208
+* Encapsulate format logic within Statement and helper classes in #162
+
+### Version 1.3.1 (Feb 12, 2025)
+
+ * Restore replace database from dump schema table creation
+
+ ### Version 1.3.0 (Jan 24, 2025)
+
+ * 🎉 Support for Rails 8.0 #189
+ * Restore multi-line table definitions in structure dumps #187
+ * Use a flag to track updates/deletes in SQL visitor #188
+
+ ### Version 1.2.1 (Nov 18, 2024)
+
+ * Maintain primary key type specificity in #183
+ * Reliably sort functions, views, and materialized views in schema in #181
+ * Improve function dumps in #179
+ * Add support for integer limits in map type in #178
+ * Add support for `request_settings` in create_table
+
+ ### Version 1.2.0 (Oct 23, 2024)
+
+ * Fix for function creation in `structure.sql` #166
+ * Add `group_by_grouping_sets` query method #161
+ * Add support for `CREATE FUNCTION` and `CREATE OR REPLACE FUNCTION`; the later in schema loading #146
+ * Add support for `LIMIT BY` clause #169
+ * Include column definitions in schema dump if the column name is not `id` #173
+ * Add blank line after create_function in schema #170
+ * Improve DB::Exception error handling #164
+ * SchemaDumper adds materialized view destination #159
+ * Add Array support to Map #158
+ * Add support codec compression parameter #135
+
+ ### Version 1.1.3 (Sep 27, 2024)
+
+ * Fix schema dumper #163
+
+ ### Version 1.1.2 (Aug 27, 2024)
+
 * 🎉 Support for rails 7.2 #156
 * Add method `views` for getting table `View` list in #152
 * Add support for Map datatype in #144

data/README.md

@@ -33,6 +33,9 @@ default: &default
   migrations_paths: db/clickhouse # optional, default: db/migrate_clickhouse
   cluster_name: 'cluster_name' # optional for creating tables in cluster 
   replica_name: '{replica}' # replica macros name, optional for creating replicated tables
+  read_timeout: 300 # change network timeouts, by default 60 seconds
+  write_timeout: 300
+  keep_alive_timeout: 300
 ```
 
 Alternatively if you wish to pass a custom `Net::HTTP` transport (or any other
@@ -282,10 +285,10 @@ Engines `MergeTree` and all support replication engines will be replaced to `Rep
 
 Donations to this project are going directly to [PNixx](https://github.com/PNixx), the original author of this project:
 
-* BTC address: `1H3rhpf7WEF5JmMZ3PVFMQc7Hm29THgUfN`
+* BTC address: `bc1qr73vls0kv2ujk4ugqmpqj6j0qtqvdr3nx25xdl`
 * ETH address: `0x6F094365A70fe7836A633d2eE80A1FA9758234d5`
 * XMR address: `42gP71qLB5M43RuDnrQ3vSJFFxis9Kw9VMURhpx9NLQRRwNvaZRjm2TFojAMC8Fk1BQhZNKyWhoyJSn5Ak9kppgZPjE17Zh`
-* TON address: `UQBt0-s1igIpJoEup0B1yAUkZ56rzbpruuAjNhQ26MVCaNlC`
+* TON address: `UQBCnxOfBsHPZ3PesGgMedVMEf5UHnm0jrSq-042pMWw08Ux`
 
 ## Development
 

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

@@ -5,7 +5,7 @@ module ActiveRecord
 
         attr_reader :codec
 
-        def initialize(name, default, sql_type_metadata = nil, null = true, default_function = nil, codec: nil, **args)
+        def initialize(*, codec: nil, **)
           super
           @codec = codec
         end

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

@@ -43,7 +43,12 @@ module ActiveRecord
             sql.gsub!(/\s+(.*)/, " \\1 CODEC(#{options[:codec]})")
           end
           sql.gsub!(/(\sString)\(\d+\)/, '\1')
-          sql << " DEFAULT #{quote_default_expression(options[:default], options[:column])}" if options_include_default?(options)
+
+          if ::ActiveRecord::version >= Gem::Version.new('8.1')
+            sql << " DEFAULT #{quote_default_expression_for_column_definition(options[:default], options[:column])}" if options_include_default?(options)
+          else
+            sql << " DEFAULT #{quote_default_expression(options[:default], options[:column])}" if options_include_default?(options)
+          end
           sql
         end
 

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

@@ -6,22 +6,55 @@ module ActiveRecord
   module ConnectionAdapters
     module Clickhouse
       module SchemaStatements
-        DEFAULT_RESPONSE_FORMAT = 'JSONCompactEachRowWithNamesAndTypes'.freeze
 
-        DB_EXCEPTION_REGEXP = /\ACode:\s+\d+\.\s+DB::Exception:/.freeze
+        def with_settings(**settings)
+          @block_settings ||= {}
+          prev_settings = @block_settings
+          @block_settings = @block_settings.merge(settings)
+          yield
+        ensure
+          @block_settings = prev_settings
+        end
 
-        def execute(sql, name = nil, settings: {})
-          do_execute(sql, name, settings: settings)
+        # Request a specific format for the duration of the provided block.
+        # Pass `nil` to explicitly send the SQL statement without a `FORMAT` clause.
+        # @param [String, nil] format
+        #
+        # @example Specify CSVWithNamesAndTypes format
+        #   with_response_format('CSVWithNamesAndTypes') do
+        #     Table.connection.execute('SELECT * FROM table')
+        #   end
+        #   # sends and executes "SELECT * FROM table FORMAT CSVWithNamesAndTypes"
+        #
+        # @example Specify no format
+        #  with_response_format(nil) do
+        #    Table.connection.execute('SELECT * FROM table')
+        #   end
+        #   # sends and executes "SELECT * FROM table"
+        def with_response_format(format)
+          prev_format = @response_format
+          @response_format = format
+          yield
+        ensure
+          @response_format = prev_format
+        end
+
+        def execute(sql, name = nil, format: @response_format, settings: {})
+          with_response_format(format) do
+            log(sql, [adapter_name, name].compact.join(' ')) do
+              raw_execute(sql, settings: settings)
+            end
+          end
         end
 
-        def exec_insert(sql, name, _binds, _pk = nil, _sequence_name = nil, returning: nil)
-          new_sql = sql.dup.sub(/ (DEFAULT )?VALUES/, " VALUES")
-          do_execute(new_sql, name, format: nil)
+        def exec_insert(sql, name = nil, _binds = [], _pk = nil, _sequence_name = nil, returning: nil)
+          new_sql = sql.sub(/ (DEFAULT )?VALUES/, " VALUES")
+          with_response_format(nil) { execute(new_sql, name) }
           true
         end
 
         def internal_exec_query(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false)
-          result = do_execute(sql, name)
+          result = execute(sql, name)
           columns = result['meta'].map { |m| m['name'] }
           types = {}
           result['meta'].each_with_index do |m, i|
@@ -37,24 +70,25 @@ module ActiveRecord
         end
 
         def exec_insert_all(sql, name)
-          do_execute(sql, name, format: nil)
+          with_response_format(nil) { execute(sql, name) }
           true
         end
 
         # @link https://clickhouse.com/docs/en/sql-reference/statements/alter/update
-        def exec_update(_sql, _name = nil, _binds = [])
-          do_execute(_sql, _name, format: nil)
+        def exec_update(sql, name = nil, _binds = [])
+          execute(sql, name)
           0
         end
 
         # @link https://clickhouse.com/docs/en/sql-reference/statements/delete
-        def exec_delete(_sql, _name = nil, _binds = [])
-          log(_sql, "#{adapter_name} #{_name}") do
-            res = request(_sql)
+        def exec_delete(sql, name = nil, _binds = [])
+          log(sql, "#{adapter_name} #{name}") do
+            statement = Statement.new(sql, format: @response_format)
+            res = request(statement)
             begin
               data = JSON.parse(res.header['x-clickhouse-summary'])
               data['result_rows'].to_i
-            rescue JSONError
+            rescue JSON::ParserError
               0
             end
           end
@@ -85,7 +119,10 @@ module ActiveRecord
         end
 
         def show_create_function(function)
-          do_execute("SELECT create_query FROM system.functions WHERE origin = 'SQLUserDefined' AND name = '#{function}'", format: nil)
+          result = do_system_execute("SELECT create_query FROM system.functions WHERE origin = 'SQLUserDefined' AND name = '#{function}'")
+          return if result.nil?
+
+          result['data'].flatten.first.sub(/\ACREATE FUNCTION/, 'CREATE OR REPLACE FUNCTION')
         end
 
         def table_options(table)
@@ -110,18 +147,18 @@ module ActiveRecord
           tables
         end
 
-        def do_system_execute(sql, name = nil)
-          log_with_debug(sql, "#{adapter_name} #{name}") do
-            res = request(sql, DEFAULT_RESPONSE_FORMAT)
-            process_response(res, DEFAULT_RESPONSE_FORMAT, sql)
+        def do_system_execute(sql, name = nil, except_params: [])
+          log_with_debug(sql, [adapter_name, name].compact.join(' ')) do
+            raw_execute(sql, except_params: except_params)
           end
         end
 
         def do_execute(sql, name = nil, format: DEFAULT_RESPONSE_FORMAT, settings: {})
-          log(sql, "#{adapter_name} #{name}") do
-            res = request(sql, format, settings)
-            process_response(res, format, sql)
-          end
+          ActiveRecord.deprecator.warn(<<~MSG.squish)
+            `do_execute` is deprecated and will be removed in an upcoming release.
+            Please use `execute` instead.
+          MSG
+          execute(sql, name, format: format, settings: settings)
         end
 
         if ::ActiveRecord::version >= Gem::Version.new('7.2')
@@ -154,7 +191,7 @@ module ActiveRecord
             if (duplicate = inserting.detect { |v| inserting.count(v) > 1 })
               raise "Duplicate migration #{duplicate}. Please renumber your migrations to resolve the conflict."
             end
-            do_execute(insert_versions_sql(inserting), nil, format: nil, settings: {max_partitions_per_insert_block: [100, inserting.size].max})
+            execute(insert_versions_sql(inserting), nil, settings: {max_partitions_per_insert_block: [100, inserting.size].max})
           end
         end
 
@@ -168,56 +205,19 @@ module ActiveRecord
           end
         end
 
-        private
-
-        # Make HTTP request to ClickHouse server
-        # @param [String] sql
-        # @param [String, nil] format
-        # @param [Hash] settings
-        # @return [Net::HTTPResponse]
-        def request(sql, format = nil, settings = {})
-          formatted_sql = apply_format(sql, format)
-          request_params = @connection_config || {}
-          @lock.synchronize do
-            @connection.post("/?#{request_params.merge(settings).to_param}", formatted_sql, {
-              'User-Agent' => "Clickhouse ActiveRecord #{ClickhouseActiverecord::VERSION}",
-              'Content-Type' => 'application/x-www-form-urlencoded',
-            })
-          end
-        end
+        protected
 
-        def apply_format(sql, format)
-          format ? "#{sql} FORMAT #{format}" : sql
-        end
+        def table_structure(table_name)
+          result = do_system_execute("DESCRIBE TABLE `#{table_name}`", table_name)
+          data = result['data']
 
-        def process_response(res, format, sql = nil)
-          case res.code.to_i
-          when 200
-            body = res.body
+          return data unless data.empty?
 
-            if body.include?("DB::Exception") && body.match?(DB_EXCEPTION_REGEXP)
-              raise ActiveRecord::ActiveRecordError, "Response code: #{res.code}:\n#{res.body}#{sql ? "\nQuery: #{sql}" : ''}"
-            else
-              format_body_response(res.body, format)
-            end
-          else
-            case res.body
-              when /DB::Exception:.*\(UNKNOWN_DATABASE\)/
-                raise ActiveRecord::NoDatabaseError
-              when /DB::Exception:.*\(DATABASE_ALREADY_EXISTS\)/
-                raise ActiveRecord::DatabaseAlreadyExists
-              else
-                raise ActiveRecord::ActiveRecordError, "Response code: #{res.code}:\n#{res.body}"
-            end
-          end
-        rescue JSON::ParserError
-          res.body
+          raise ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'"
         end
+        alias column_definitions table_structure
 
-        def log_with_debug(sql, name = nil)
-          return yield unless @debug
-          log(sql, "#{name} (system)") { yield }
-        end
+        private
 
         def schema_creation
           Clickhouse::SchemaCreation.new(self)
@@ -228,29 +228,20 @@ module ActiveRecord
         end
 
         def new_column_from_field(table_name, field, _definitions)
-          sql_type = field[1]
+          column_name, sql_type, default_type, default_expression = field
           type_metadata = fetch_type_metadata(sql_type)
-          default_value = extract_value_from_default(field[3], field[2])
-          default_function = extract_default_function(field[3])
-          default_value = lookup_cast_type(sql_type).cast(default_value)
-          Clickhouse::Column.new(field[0], default_value, type_metadata, field[1].include?('Nullable'), default_function, codec: field[5].presence)
-        end
-
-        protected
-
-        def table_structure(table_name)
-          result = do_system_execute("DESCRIBE TABLE `#{table_name}`", table_name)
-          data = result['data']
+          default_value = extract_value_from_default(default_expression, default_type)
+          default_function = extract_default_function(default_expression)
+          cast_type = lookup_cast_type(sql_type)
+          default_value = cast_type.cast(default_value)
 
-          return data unless data.empty?
+          args = [column_name]
+          args << cast_type if ::ActiveRecord::version >= Gem::Version.new('8.1')
+          args += [default_value, type_metadata, field[1].include?('Nullable'), default_function]
 
-          raise ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'"
+          Clickhouse::Column.new(*args, codec: field[5].presence)
         end
-        alias column_definitions table_structure
-
-        private
 
-        # Extracts the value from a PostgreSQL column default definition.
         def extract_value_from_default(default_expression, default_type)
           return nil if default_type != 'DEFAULT' || default_expression.blank?
           return nil if has_default_function?(default_expression)
@@ -269,42 +260,38 @@ module ActiveRecord
           (%r{\w+\(.*\)} === default)
         end
 
-        def format_body_response(body, format)
-          return body if body.blank?
-
-          case format
-          when 'JSONCompact'
-            format_from_json_compact(body)
-          when 'JSONCompactEachRowWithNamesAndTypes'
-            format_from_json_compact_each_row_with_names_and_types(body)
-          else
-            body
-          end
-        end
-
-        def format_from_json_compact(body)
-          parse_json_payload(body)
+        def raw_execute(sql, settings: {}, except_params: [])
+          statement = Statement.new(sql, format: @response_format)
+          statement.response = request(statement, settings: settings, except_params: except_params)
+          statement.processed_response
         end
 
-        def format_from_json_compact_each_row_with_names_and_types(body)
-          rows = body.split("\n").map { |row| parse_json_payload(row) }
-          names, types, *data = rows
-
-          meta = names.zip(types).map do |name, type|
-            {
-              'name' => name,
-              'type' => type
-            }
+        # Make HTTP request to ClickHouse server
+        # @param [ActiveRecord::ConnectionAdapters::Clickhouse::Statement] statement
+        # @param [Hash] settings
+        # @param [Array] except_params
+        # @return [Net::HTTPResponse]
+        def request(statement, settings: {}, except_params: [])
+          @lock.synchronize do
+            @connection.post("/?#{settings_params(settings, except: except_params)}",
+                             statement.formatted_sql,
+                             'Content-Type' => 'application/x-www-form-urlencoded',
+                             'User-Agent' => ClickhouseAdapter::USER_AGENT)
           end
+        end
 
-          {
-            'meta' => meta,
-            'data' => data
-          }
+        def log_with_debug(sql, name = nil)
+          return yield unless @debug
+          log(sql, "#{name} (system)") { yield }
         end
 
-        def parse_json_payload(payload)
-          JSON.parse(payload, decimal_class: BigDecimal)
+        def settings_params(settings = {}, except: [])
+          request_params = @connection_config || {}
+          block_settings = @block_settings || {}
+          request_params.merge(block_settings)
+                        .merge(settings)
+                        .except(*except)
+                        .to_param
         end
       end
     end