click_house 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67e6a326b4ad9972ca7713c935a6b4b1d03da9b3a1e4150119a6bd88cd63481e
-  data.tar.gz: 5face2f1ed1c776b822e023fe862525b94cd3349055ce1a7135a0d184d493196
+  metadata.gz: c2d62b43147b81ad3551c48c79388a949307d03491c1d87965d25ae9818e0a86
+  data.tar.gz: ad6e79c3a974e4e39889d93dcabd94d3dc8f2bced9b739449f741bd1c8c83038
 SHA512:
-  metadata.gz: c3f9f7f4962e323684324fd863a487a46440aec742c06e8e406abe88c56f5457795e5b03d1367a206da45b3f912fb237428c1bc9251120e0f28272517d283a5a
-  data.tar.gz: 70795ae32a9e0c555de49034fa19f3863459ea267b3e29aa85ff185f675dfacd15633d8c345f31d90ae2e6e95721187afc700fb40e891a6b5129ecc92ef87f6f
+  metadata.gz: 9035db18ecc851ab6de8f9ae88d434dfff07f2da5e23eac4cf3c091fe699871c64f0c9c05a1637730f44dfd5fef4eca60f6cd94f613360113152461f7e4dabe8
+  data.tar.gz: bb93033b9ffc82a7003af0affea015ad2a84292a86a50c46ea6cecfa232b22d172708dc1633f896fd29eea373270eb464baa70e02df8d036195d0aeb2f88f29c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    click_house (2.0.1)
+    click_house (2.0.2)
       activesupport
       faraday (>= 1.7, < 3)
 

data/Gemfile_faraday1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    click_house (1.7.0)
+    click_house (2.0.1)
       activesupport
       faraday (>= 1.7, < 3)
 

data/lib/click_house/connection.rb

@@ -47,13 +47,22 @@ module ClickHouse
     end
 
     # transport should work the same both with Faraday v1 and Faraday v2
+    # rubocop:disable Metrics/AbcSize
     def transport
       @transport ||= Faraday.new(config.url!) do |conn|
         conn.options.timeout = config.timeout
         conn.options.open_timeout = config.open_timeout
         conn.headers = config.headers
         conn.ssl.verify = config.ssl_verify
-        conn.request(:basic_auth, config.username, config.password) if config.auth?
+
+        if config.auth?
+          if faraday_v1?
+            conn.request :basic_auth, config.username, config.password
+          else
+            conn.request :authorization, :basic, config.username, config.password
+          end
+        end
+
         conn.response Middleware::RaiseError
         conn.response Middleware::Logging, logger: config.logger!
         conn.response config.json_parser, content_type: %r{application/json}, parser_options: { config: config }
@@ -61,10 +70,16 @@ module ClickHouse
         conn.adapter config.adapter
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     def compose(path, query = {})
       # without <query.compact> "DB::Exception: Empty query" error will occur
       "#{path}?#{URI.encode_www_form({ send_progress_in_http_headers: 1 }.merge(query).compact)}"
     end
+
+    # @return [Boolean]
+    def faraday_v1?
+      Faraday::VERSION.start_with?('1')
+    end
   end
 end

data/lib/click_house/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClickHouse
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: click_house
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Aliaksandr Shylau