click_house 1.4.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '095426f805a20574d725842799b3e09368ef4239bf8a262d4ca061ef7689cedd'
-  data.tar.gz: 77098569ba1c05b236bc6b68118116c63985c1cc91bc49cdc5ae49c2550459f6
+  metadata.gz: 85fbf603cf09ee0a076a3ca0fa0add17c167919c458008a5616a4a7b064b0790
+  data.tar.gz: 95cf0f595c70a2943bba62a0d8568b4f432b3fdf27365b036377a66960733efe
 SHA512:
-  metadata.gz: a71819d5ea5c61bf85907501e9b80ca713dc3e78e97a066a9f3e8fb1713dfc0a81b91aef0b12c51389afad53c518ccca913544be0f44d60182d02ecb722e0e1c
-  data.tar.gz: 95fb2a123492cb6f816ed4c8b1984ec1ba21b1784eceb489543081616ad5d0a5947d56623be63c7e8d5f4586977f4c2999a0bb8c229d20519e8d1f8fc2365749
+  metadata.gz: 8a31451c3ed68aa5ff213cabaa51578723212fe43d0e63a1b58a1d68b135facece27f2d52025512d41862ba7495dcd05972f3a9cd8a4d01cc25916e2e502f42b
+  data.tar.gz: 0d78cbad863fcb89e8d58da4c10eeec60013877c5097480c0e6bc190c9698641f5ac95c116bd3b938f7ce927aa58ad10abae73729ce579149d40a51e529320c7

data/.github/workflows/main.yml

@@ -8,13 +8,13 @@ jobs:
 
     services:
       clickhouse:
-        image: yandex/clickhouse-server:21.1.4
+        image: yandex/clickhouse-server:22.1
         ports: 
           - 8123:8123
 
     strategy:
       matrix:
-        ruby-version: [3.0, 2.7, 2.6, 2.5, 2.4]
+        ruby-version: [3.1, '3.0', 2.7, 2.6]
 
     steps:
       - uses: actions/checkout@v2
@@ -23,19 +23,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
-
-      - name: Cache gems
-        uses: actions/cache@v1
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-${{ matrix.ruby-version }}-bundler-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.ruby-version }}-bundler-
-
-      - name: Install gems
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true # 'bundle install' and cache
 
       - name: Run tests
         run: bundle exec rspec
@@ -50,19 +38,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-
-      - name: Cache gems
-        uses: actions/cache@v1
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-bundler-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-bundler-
-
-      - name: Install gems
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true # 'bundle install' and cache
 
       - name: Run Rubocop
         run: bundle exec rubocop

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.idea/
 /_yardoc/
 /coverage/
 /pkg/

data/.rubocop.yml

@@ -13,9 +13,9 @@ AllCops:
 Bundler/OrderedGems:
   Enabled: false
 
-# ============================== Documentation ======================
-Style/Documentation:
-  Enabled: false
+# ============================== Gemspec ======================
+Gemspec/DateAssignment:
+  Enabled: true
 
 # =============================== Performance =======================
 Performance/AncestorsInclude:
@@ -46,6 +46,12 @@ Performance/ConstantRegexp:
   Enabled: true
 Performance/MethodObjectAsBlock:
   Enabled: false
+Performance/RedundantEqualityComparisonBlock:
+  Enabled: true
+Performance/RedundantSplitRegexpArgument:
+  Enabled: true
+Performance/MapCompact:
+  Enabled: true
 
 # ============================== Metrics ============================
 Metrics/ClassLength:
@@ -69,6 +75,8 @@ Naming/MethodParameterName:
   Enabled: false
 Naming/AccessorMethodName:
   Enabled: false
+Naming/InclusiveLanguage:
+  Enabled: true
 
 # ============================== Layout =============================
 Layout/LineLength:
@@ -107,7 +115,7 @@ Layout/SpaceAroundMethodCallOperator:
   Enabled: true
 Layout/SpaceBeforeBrackets:
   Enabled: true
-Lint/AmbiguousAssignment:
+Layout/LineEndStringConcatenationIndentation:
   Enabled: true
 
 # ============================== Style ==============================
@@ -227,6 +235,18 @@ Style/EndlessMethod:
   Enabled: true
 Style/IfWithBooleanLiteralBranches:
   Enabled: true
+Style/HashConversion:
+  Enabled: true
+Style/Documentation:
+  Enabled: false
+Style/InPatternThen:
+  Enabled: true
+Style/MultilineInPatternThen:
+  Enabled: true
+Style/QuotedSymbols:
+  Enabled: true
+Style/StringChars:
+  Enabled: true
 
 # ============================== Lint ==============================
 Lint/DuplicateMethods:
@@ -311,3 +331,7 @@ Lint/SymbolConversion:
   Enabled: true
 Lint/TripleQuotes:
   Enabled: true
+Lint/AmbiguousAssignment:
+  Enabled: true
+Lint/EmptyInPattern:
+  Enabled: true

data/CHANGELOG.md

@@ -1,5 +1,17 @@
+# 1.6.1
+* [PR](https://github.com/shlima/click_house/pull/26) call logging middleware when an error is raised
+
+# 1.6.0
+* [PR](https://github.com/shlima/click_house/pull/19) handle value returned as nil in float and integer types (case of Aggregate Function Combinators) 
+* [PR](https://github.com/shlima/click_house/pull/18) Fix Faraday deprecation
+
+# 1.5.0
+* add support for 'WITH TOTALS' modifier in response
+* send SQL in GET request's body [#12](https://github.com/shlima/click_house/pull/12)
+* add support of 'WITH TOTALS' on a resulting set
+
 # 1.4.0
-* fizx decimal type casting [#11](https://github.com/shlima/click_house/issues/11)
+* fix decimal type casting [#11](https://github.com/shlima/click_house/issues/11)
 
 # 1.3.9
 * add `ClickHouse.connection.add_index`, `ClickHouse.connection.drop_index`

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    click_house (1.4.0)
-      faraday
+    click_house (1.6.1)
+      faraday (>= 1.7)
       faraday_middleware
 
 GEM
@@ -10,56 +10,74 @@ GEM
   specs:
     ast (2.4.2)
     coderay (1.1.3)
-    diff-lcs (1.4.4)
-    faraday (1.3.0)
+    diff-lcs (1.5.0)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
     faraday-net_http (1.0.1)
-    faraday_middleware (1.0.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
     method_source (1.0.0)
     multipart-post (2.1.1)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.22.1)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.9.2)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.13.3)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    unicode-display_width (2.0.0)
+    ruby2_keywords (0.0.5)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -74,4 +92,4 @@ DEPENDENCIES
   rubocop-performance
 
 BUNDLED WITH
-   2.2.3
+   2.3.3

data/README.md

@@ -10,8 +10,8 @@
 gem install click_house
 ```
 
-A modern Ruby database driver for ClickHouse. [ClickHouse](https://clickhouse.yandex) 
-is a high-performance column-oriented database management system developed by 
+A modern Ruby database driver for ClickHouse. [ClickHouse](https://clickhouse.yandex)
+is a high-performance column-oriented database management system developed by
 [Yandex](https://yandex.com/company) which operates Russia's most popular search engine.
 
 > This development was inspired by currently [unmaintainable alternative](https://github.com/archan937/clickhouse)
@@ -24,7 +24,7 @@ Well, the developers of ClickHouse themselves [discourage](https://github.com/ya
 > TCP transport is more specific, we don't want to expose details.
 Despite we have full compatibility of protocol of different versions of client and server, we want to keep the ability to "break" it for very old clients. And that protocol is not too clean to make a specification.
 
-Yandex uses HTTP interface for working from Java and Perl, Python and Go as well as shell scripts. 
+Yandex uses HTTP interface for working from Java and Perl, Python and Go as well as shell scripts.
 
 # TOC
 
@@ -53,15 +53,18 @@ ClickHouse.config do |config|
   config.open_timeout = 3
   config.ssl_verify = false
   config.headers = {}
-  
+
   # or provide connection options separately
-  config.scheme = 'http' 
-  config.host = 'localhost' 
-  config.port = 'port' 
-  
+  config.scheme = 'http'
+  config.host = 'localhost'
+  config.port = 'port'
+
   # if you use HTTP basic Auth
-  config.username = 'user' 
-  config.password = 'password' 
+  config.username = 'user'
+  config.password = 'password'
+
+  # if you want to add settings to all queries
+  config.global_params = { mutations_sync: 1 }
 end
 ```
 
@@ -76,7 +79,7 @@ Now you are able to communicate with ClickHouse:
 ```ruby
 ClickHouse.connection.ping #=> true
 ```
-You can easily build a new raw connection and override any configuration parameter 
+You can easily build a new raw connection and override any configuration parameter
 (such as database name, connection address)
 
 ```ruby
@@ -126,8 +129,8 @@ Select all type-casted result set
 @result.to_a #=> [{"date"=>#<Date: 2000-01-01>, "id"=>1}]
 
 # you can access raw data
-@result.meta #=> [{"name"=>"date", "type"=>"Date"}, {"name"=>"id", "type"=>"UInt32"}] 
-@result.data #=> [{"date"=>"2000-01-01", "id"=>1}, {"date"=>"2000-01-02", "id"=>2}] 
+@result.meta #=> [{"name"=>"date", "type"=>"Date"}, {"name"=>"id", "type"=>"UInt32"}]
+@result.data #=> [{"date"=>"2000-01-01", "id"=>1}, {"date"=>"2000-01-02", "id"=>2}]
 @result.statistics #=> {"elapsed"=>0.0002271, "rows_read"=>2, "bytes_read"=>12}
 ```
 
@@ -182,7 +185,7 @@ response = ClickHouse.connection.execute <<~SQL
   SELECT count(*) AS counter FROM rspec FORMAT RowBinary
 SQL
 
-response.body #=> "\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000" 
+response.body #=> "\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
 ```
 
 ## Insert
@@ -193,7 +196,7 @@ When column names and values are transferred separately
 ClickHouse.connection.insert('table', columns: %i[id name]) do |buffer|
   buffer << [1, 'Mercury']
   buffer << [2, 'Venus']
-end 
+end
 
 ClickHouse.connection.insert('table', columns: %i[id name], values: [[1, 'Mercury'], [2, 'Venus']])
 #=> true
@@ -272,7 +275,7 @@ end
 ### Set table options
 
 ```ruby
-ClickHouse.connection.create_table('visits', 
+ClickHouse.connection.create_table('visits',
   order: 'year',
   ttl: 'date + INTERVAL 1 DAY',
   sample: 'year',
@@ -308,24 +311,24 @@ ClickHouse.connection.modify_column('table', 'column_name', type: :UInt64, defau
 ClickHouse.connection.alter_table('table', 'DROP COLUMN user_id', cluster: nil)
 
 # By SQL in a block
-ClickHouse.connection.alter_table('table', cluster: nil) do 
+ClickHouse.connection.alter_table('table', cluster: nil) do
   <<~SQL
     MOVE PART '20190301_14343_16206_438' TO VOLUME 'slow'
-  SQL  
+  SQL
 end
 ```
 
 ## Type casting
 
 By default gem provides all necessary type casting, but you may overwrite or define
-your own logic 
+your own logic
 
 ```ruby
 class DateType
   def cast(value)
     Date.parse(value)
-  end 
-  
+  end
+
   def serialize(value)
     value.strftime('%Y-%m-%d')
   end
@@ -338,7 +341,7 @@ Actually `serialize` function is not used for now, but you may use it manually:
 
 ```ruby
 time_type = ClickHouse::Type::DateTimeType.new
-string_type = ClickHouse::Type::FixedStringType.new 
+string_type = ClickHouse::Type::FixedStringType.new
 
 ClickHouse.connection.insert('table', columns: %i[name time]) do |buffer|
   buffer << [string_type.serialize('a' * 1000, 20), time_type.serialize(Time.current, 'Europe/Moscow')]
@@ -353,20 +356,20 @@ data = @records.map do |record|
 end
 ```
 
-If native type supports arguments, define *String* type with `%s` 
+If native type supports arguments, define *String* type with `%s`
 argument and *Numeric* type with `%d` argument:
 
 ```ruby
 class DateTimeType
   def cast(value, time_zone)
     Time.parse("#{value} #{time_zone}")
-  end 
+  end
 end
 
 ClickHouse.add_type('DateTime(%s)', DateTimeType.new)
 ```
 
-if you need to redefine all built-in types with your implementation, 
+if you need to redefine all built-in types with your implementation,
 just clear the default type system:
 
 ```ruby
@@ -406,7 +409,7 @@ development:
 test:
   database: ecliptic_test
   <<: *default
-  
+
 production:
   <<: *default
   database: ecliptic_production
@@ -418,7 +421,7 @@ production:
 ClickHouse.config do |config|
   config.logger = Rails.logger
   config.assign(Rails.application.config_for('click_house'))
-end 
+end
 ```
 
 ```ruby
@@ -465,7 +468,7 @@ class CreateAdvertVisits < ActiveRecord::Migration[6.0]
     end
   end
 
-  def down    
+  def down
     ClickHouse.connection.drop_table('visits')
   end
 end
@@ -509,7 +512,7 @@ end
 ````
 
 ````ruby
-# FAKE MODEL FOR ClickHouse 
+# FAKE MODEL FOR ClickHouse
 class Visit < ClickHouseRecord
   scope :with_os, -> { where.not(os_family_id: nil) }
 end
@@ -517,12 +520,12 @@ end
 Visit.with_os.select('COUNT(*) as counter').group(:ipv4).select_all
 #=> [{ 'ipv4' => 1455869, 'counter' => 104 }]
 
-Visit.with_os.select('COUNT(*)').select_value 
+Visit.with_os.select('COUNT(*)').select_value
 #=> 20_345_678
- 
-Visit.where(user_id: 1).select_one 
-#=> { 'ipv4' => 1455869, 'user_id' => 1 }  
-```` 
+
+Visit.where(user_id: 1).select_one
+#=> { 'ipv4' => 1455869, 'user_id' => 1 }
+````
 
 ## Using with RSpec
 
@@ -537,7 +540,7 @@ end
 ```
 
 ```ruby
-RSpec.describe Api::MetricsCountroller, truncate_click_house: true do 
+RSpec.describe Api::MetricsCountroller, truncate_click_house: true do
   it { }
   it { }
 end

data/click_house.gemspec

@@ -10,18 +10,16 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Modern Ruby database driver for ClickHouse'
   spec.description   = 'Yandex ClickHouse database interface for Ruby'
   spec.homepage      = 'https://github.com/shlima/click_house'
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday'
+  spec.add_dependency 'faraday', '>= 1.7'
   spec.add_dependency 'faraday_middleware'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-server:21.1.4
+    image: yandex/clickhouse-server:22.1
     ports:
       - "8123:8123"
       - "9000:9000"

data/lib/click_house/config.rb

@@ -15,7 +15,8 @@ module ClickHouse
       timeout: nil,
       open_timeout: nil,
       ssl_verify: false,
-      headers: {}
+      headers: {},
+      global_params: {}
     }.freeze
 
     attr_accessor :adapter
@@ -31,6 +32,7 @@ module ClickHouse
     attr_accessor :open_timeout
     attr_accessor :ssl_verify
     attr_accessor :headers
+    attr_accessor :global_params
 
     def initialize(params = {})
       assign(DEFAULTS.merge(params))
@@ -49,11 +51,15 @@ module ClickHouse
     end
 
     def logger!
-      @logger || Logger.new(IO::NULL)
+      @logger || null_logger
     end
 
     def url!
       @url || "#{scheme}://#{host}:#{port}"
     end
+
+    def null_logger
+      @null_logger ||= Logger.new(IO::NULL)
+    end
   end
 end

data/lib/click_house/connection.rb

@@ -17,16 +17,33 @@ module ClickHouse
       @config = config
     end
 
-    def execute(query, body = nil, database: config.database)
-      post(body, query: { query: query }, database: database)
+    def execute(query, body = nil, database: config.database, params: {})
+      post(body, query: { query: query }, database: database, params: config.global_params.merge(params))
     end
 
-    def get(path = '/', query: {}, database: config.database)
-      transport.get(compose(path, query.merge(database: database)))
+    # @param path [String] Clickhouse HTTP endpoint, e.g. /ping, /replica_status
+    # @param body [String] SQL to run
+    # @param database [String|NilClass] database to use, nil to skip
+    # @param query [Hash] other CH settings to send through params, e.g. max_rows_to_read=1
+    # @example get(body: 'select number from system.numbers limit 100', query: { max_rows_to_read: 10 })
+    # @return [Faraday::Response]
+    def get(path = '/', body: '', query: {}, database: config.database)
+      # backward compatibility since
+      # https://github.com/shlima/click_house/pull/12/files#diff-9c6f3f06d3b575731eae4b6b95ddbcdcc20452c432b8f6e87a3a8e8645818107R24
+      if query.is_a?(String)
+        query = { query: query }
+        config.logger!.warn('since v1.4.0 use connection.get(body: "SELECT 1") instead of connection.get(query: "SELECT 1")')
+      end
+
+      transport.get(path) do |conn|
+        conn.params = query.merge(database: database).compact
+        conn.params[:send_progress_in_http_headers] = 1 unless body.empty?
+        conn.body = body
+      end
     end
 
-    def post(body = nil, query: {}, database: config.database)
-      transport.post(compose('/', query.merge(database: database)), body)
+    def post(body = nil, query: {}, database: config.database, params: {})
+      transport.post(compose('/', query.merge(database: database, **params)), body)
     end
 
     def transport
@@ -35,9 +52,9 @@ module ClickHouse
         conn.options.open_timeout = config.open_timeout
         conn.headers = config.headers
         conn.ssl.verify = config.ssl_verify
-        conn.basic_auth(config.username, config.password) if config.auth?
-        conn.response Middleware::Logging, logger: config.logger!
+        conn.request(:basic_auth, config.username, config.password) if config.auth?
         conn.response Middleware::RaiseError
+        conn.response Middleware::Logging, logger: config.logger!
         conn.response :json, content_type: %r{application/json}
         conn.response Middleware::ParseCsv, content_type: %r{text/csv}
         conn.adapter config.adapter

data/lib/click_house/extend/connection_explaining.rb

@@ -6,9 +6,11 @@ module ClickHouse
       EXPLAIN = 'EXPLAIN'
       EXPLAIN_RE = /\A(\s*#{EXPLAIN})/io.freeze
 
-      def explain(sql, io: $stdout)
+      # @return String
+      def explain(sql, io: StringIO.new)
         res = execute("#{EXPLAIN} #{sql.gsub(EXPLAIN_RE, '')}")
-        io << res.body
+        io.puts(res.body)
+        io.string
       end
     end
   end

data/lib/click_house/extend/connection_healthy.rb

@@ -4,8 +4,7 @@ module ClickHouse
   module Extend
     module ConnectionHealthy
       def ping
-        # without +send_progress_in_http_headers: nil+ DB::Exception: Empty query returns
-        get(database: nil, query: { send_progress_in_http_headers: nil }).success?
+        get('/ping', database: nil).success?
       end
 
       def replicas_status

data/lib/click_house/extend/connection_selective.rb

@@ -5,17 +5,17 @@ module ClickHouse
     module ConnectionSelective
       # @return [ResultSet]
       def select_all(sql)
-        response = execute(Util::Statement.format(sql, 'JSON'))
+        response = get(body: Util::Statement.format(sql, 'JSON'))
         Response::Factory[response]
       end
 
       def select_value(sql)
-        response = execute(Util::Statement.format(sql, 'JSON'))
+        response = get(body: Util::Statement.format(sql, 'JSON'))
         Array(Response::Factory[response].first).dig(0, -1)
       end
 
       def select_one(sql)
-        response = execute(Util::Statement.format(sql, 'JSON'))
+        response = get(body: Util::Statement.format(sql, 'JSON'))
         Response::Factory[response].first
       end
     end

data/lib/click_house/middleware/logging.rb

@@ -29,11 +29,8 @@ module ClickHouse
       # rubocop:disable Layout/LineLength
       def on_complete(env)
         summary = extract_summary(env.response_headers)
-        elapsed = duration
-        query = CGI.parse(env.url.query.to_s).dig('query', 0) || '[NO QUERY]'
-
-        logger.info("\e[1mSQL (#{Util::Pretty.measure(elapsed)})\e[0m #{query};")
-        logger.debug(body) if body
+        logger.info("\e[1mSQL (#{duration_stats_log(env.body)})\e[0m #{query(env)};")
+        logger.debug(body) if body && !query_in_body?(env)
         logger.info("\e[1mRead: #{summary.fetch(:read_rows)} rows, #{summary.fetch(:read_bytes)}. Written: #{summary.fetch(:written_rows)} rows, #{summary.fetch(:written_bytes)}\e[0m")
       end
       # rubocop:enable Layout/LineLength
@@ -46,6 +43,28 @@ module ClickHouse
         Process.clock_gettime(Process::CLOCK_MONOTONIC)
       end
 
+      def query_in_body?(env)
+        env.method == :get
+      end
+
+      def query(env)
+        if query_in_body?(env)
+          body
+        else
+          CGI.parse(env.url.query.to_s).dig('query', 0) || '[NO QUERY]'
+        end
+      end
+
+      def duration_stats_log(body)
+        elapsed = duration
+        clickhouse_elapsed = body['statistics'].fetch('elapsed') if body.is_a?(Hash) && body.key?('statistics')
+
+        [
+          "Total: #{Util::Pretty.measure(elapsed * 1000)}",
+          ("CH: #{Util::Pretty.measure(clickhouse_elapsed * 1000)}" if clickhouse_elapsed)
+        ].compact.join(', ')
+      end
+
       def extract_summary(headers)
         JSON.parse(headers.fetch('x-clickhouse-summary', '{}')).tap do |summary|
           summary[:read_rows] = summary['read_rows']

data/lib/click_house/response/factory.rb

@@ -10,7 +10,12 @@ module ClickHouse
 
         return body if !body.is_a?(Hash) || !(body.key?('meta') && body.key?('data'))
 
-        ResultSet.new(meta: body.fetch('meta'), data: body.fetch('data'), statistics: body['statistics'])
+        ResultSet.new(
+          meta: body.fetch('meta'),
+          data: body.fetch('data'),
+          totals: body['totals'],
+          statistics: body['statistics']
+        )
       end
     end
   end

data/lib/click_house/response/result_set.rb

@@ -14,7 +14,7 @@ module ClickHouse
                      :inspect, :each, :fetch, :length, :count, :size,
                      :first, :last, :[], :to_h
 
-      attr_reader :meta, :data, :statistics
+      attr_reader :meta, :data, :totals, :statistics
 
       class << self
         # @return [Array<String, Array>]
@@ -48,9 +48,13 @@ module ClickHouse
 
       # @param meta [Array]
       # @param data [Array]
-      def initialize(meta:, data:, statistics: nil)
+      # @param totals [Array|Hash|NilClass] Support for 'GROUP BY WITH TOTALS' modifier
+      #   https://clickhouse.tech/docs/en/sql-reference/statements/select/group-by/#with-totals-modifier
+      #   Hash in JSON format and Array in JSONCompact
+      def initialize(meta:, data:, totals: nil, statistics: nil)
         @meta = meta
         @data = data
+        @totals = totals
         @statistics = Hash(statistics)
       end
 

data/lib/click_house/type/float_type.rb

@@ -4,7 +4,7 @@ module ClickHouse
   module Type
     class FloatType < BaseType
       def cast(value)
-        Float(value)
+        Float(value) unless value.nil?
       end
 
       def serialize(value)

data/lib/click_house/type/integer_type.rb

@@ -4,7 +4,7 @@ module ClickHouse
   module Type
     class IntegerType < BaseType
       def cast(value)
-        Integer(value)
+        Integer(value) unless value.nil?
       end
 
       def serialize(value)

data/lib/click_house/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Aliaksandr Shylau
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2022-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -203,14 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Modern Ruby database driver for ClickHouse