click_house 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85fbf603cf09ee0a076a3ca0fa0add17c167919c458008a5616a4a7b064b0790
-  data.tar.gz: 95cf0f595c70a2943bba62a0d8568b4f432b3fdf27365b036377a66960733efe
+  metadata.gz: 6a24e10e60cd19671f70f521f6db773ef0d3b0f6f33a9ef40b5a26ed7aaf8106
+  data.tar.gz: 3a948f7381d345f6784a8a125bedbc62ba9df554920cc40eb217699c350cfc02
 SHA512:
-  metadata.gz: 8a31451c3ed68aa5ff213cabaa51578723212fe43d0e63a1b58a1d68b135facece27f2d52025512d41862ba7495dcd05972f3a9cd8a4d01cc25916e2e502f42b
-  data.tar.gz: 0d78cbad863fcb89e8d58da4c10eeec60013877c5097480c0e6bc190c9698641f5ac95c116bd3b938f7ce927aa58ad10abae73729ce579149d40a51e529320c7
+  metadata.gz: 12af01d64fb80f0fbfff2df8654c79b6574bd09b6159bac8ae9425417a5fc48fbf7ae8bcf2b0e42efc80bd23bc55212f5ba232f187e606b76fb8d6f7193a6976
+  data.tar.gz: 2d819029b2030f25b68a85f623dcbbec497aa9756d6b69d2e223eccdc97ba35ef58299ceea47f45de568cfdd161f09ca75e1635f9bc3176e94de337ae88e4a59

data/.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
 
     services:
       clickhouse:
-        image: yandex/clickhouse-server:22.1
+        image: clickhouse/clickhouse-server:22.6
         ports: 
           - 8123:8123
 

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.6.2
+* [PR](https://github.com/shlima/click_house/pull/31) Add rows_before_limit_at_least to ResultSet
+* [PR](https://github.com/shlima/click_house/pull/29) Force JSON format by using "default_format" instead of modifying the query
+
 # 1.6.1
 * [PR](https://github.com/shlima/click_house/pull/26) call logging middleware when an error is raised
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    click_house (1.6.1)
+    click_house (1.6.2)
       faraday (>= 1.7)
       faraday_middleware
 
@@ -27,8 +27,8 @@ GEM
     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)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -37,7 +37,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     method_source (1.0.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     parallel (1.22.1)
     parser (3.1.1.0)
       ast (~> 2.4.1)

data/docker-compose.yml

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

data/lib/click_house/extend/connection_selective.rb

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

data/lib/click_house/response/factory.rb

@@ -14,7 +14,8 @@ module ClickHouse
           meta: body.fetch('meta'),
           data: body.fetch('data'),
           totals: body['totals'],
-          statistics: body['statistics']
+          statistics: body['statistics'],
+          rows_before_limit_at_least: body['rows_before_limit_at_least']
         )
       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, :totals, :statistics
+      attr_reader :meta, :data, :totals, :statistics, :rows_before_limit_at_least
 
       class << self
         # @return [Array<String, Array>]
@@ -51,10 +51,11 @@ module ClickHouse
       # @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)
+      def initialize(meta:, data:, totals: nil, statistics: nil, rows_before_limit_at_least: nil)
         @meta = meta
         @data = data
         @totals = totals
+        @rows_before_limit_at_least = rows_before_limit_at_least
         @statistics = Hash(statistics)
       end
 

data/lib/click_house/util/statement.rb

@@ -3,20 +3,11 @@
 module ClickHouse
   module Util
     module Statement
-      END_OF_STATEMENT = ';'
-      END_OF_STATEMENT_RE = /#{END_OF_STATEMENT}(\s+|\Z)/.freeze
-
       module_function
 
       def ensure(truthful, value, fallback = nil)
         truthful ? value : fallback
       end
-
-      def format(sql, format)
-        return sql if sql.match?(/FORMAT/i)
-
-        "#{sql.sub(END_OF_STATEMENT_RE, '')} FORMAT #{format};"
-      end
     end
   end
 end

data/lib/click_house/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Aliaksandr Shylau
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-03 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday