Add read time and support adaptor options (timeout fix with httpx)

README.md

@@ -51,6 +51,7 @@ ClickHouse.config do |config|
   config.url = 'http://localhost:8123'
   config.timeout = 60
   config.open_timeout = 3
+  config.read_timeout = 50
   config.ssl_verify = false
   # set to true to symbolize keys for SELECT and INSERT statements (type casting)
   config.symbolize_keys = false
@@ -414,6 +415,7 @@ default: &default
   url: http://localhost:8123
   timeout: 60
   open_timeout: 3
+  read_timeout: 50
 
 development:
   database: ecliptic_development

lib/click_house/config.rb

@@ -4,6 +4,7 @@ module ClickHouse
   class Config
     DEFAULTS = {
       adapter: Faraday.default_adapter,
+      adapter_options: [],
       url: nil,
       scheme: 'http',
       host: 'localhost',
@@ -14,6 +15,7 @@ class Config
       password: nil,
       timeout: nil,
       open_timeout: nil,
+      read_timeout: nil,
       ssl_verify: false,
       headers: {},
       global_params: {},
@@ -36,6 +38,7 @@ class Config
     }.freeze
 
     attr_accessor :adapter
+    attr_accessor :adapter_options
     attr_accessor :logger
     attr_accessor :scheme
     attr_accessor :host
@@ -46,6 +49,7 @@ class Config
     attr_accessor :password
     attr_accessor :timeout
     attr_accessor :open_timeout
+    attr_accessor :read_timeout
     attr_accessor :ssl_verify
     attr_accessor :headers
     attr_accessor :global_params

lib/click_house/connection.rb

@@ -52,6 +52,7 @@ def transport
       @transport ||= Faraday.new(config.url!) do |conn|
         conn.options.timeout = config.timeout
         conn.options.open_timeout = config.open_timeout
+        conn.options.read_timeout = config.read_timeout
         conn.headers = config.headers
         conn.ssl.verify = config.ssl_verify
 
@@ -68,7 +69,7 @@ def transport
         conn.response Middleware::SummaryMiddleware, options: { config: config } # should be after logger
         conn.response config.json_parser, content_type: %r{application/json}, options: { config: config }
         conn.response Middleware::ParseCsv, content_type: %r{text/csv}, options: { config: config }
-        conn.adapter config.adapter
+        conn.adapter config.adapter, *config.adapter_options
       end
     end
     # rubocop:enable Metrics/AbcSize

lib/click_house/response/factory.rb

@@ -3,15 +3,25 @@
 module ClickHouse
   module Response
     class Factory
-      KEY_META = 'meta'
-      KEY_DATA = 'data'
+      KEY_META = "meta"
+      KEY_DATA = "data"
 
       # @return [ResultSet]
       # @params faraday [Faraday::Response]
       # @params config [Config]
       def self.response(faraday, config)
         body = faraday.body
 
+        # Clickhouse can return strings containing JSON sometimes, where the
+        # content-type is text/plain but the body is actually JSON
+        if faraday.headers["content-type"].start_with?("text/plain") && body.is_a?(String)
+          begin
+            parsed_body = JSON.parse(body)
+            body = parsed_body if parsed_body.is_a?(Hash)
+          rescue JSON::ParserError
+          end
+        end
+
         # wrap to be able to use connection#select_one, connection#select_value
         # with other formats like binary
         return raw(faraday, config) unless body.is_a?(Hash)