click_house 1.3.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd545a5ce410be500540a02ef1f46e57b9a7a2dfe2df8b5be47022ac2cd1f5b4
-  data.tar.gz: 19b872a4901d7543ddf7fbb23ca53ac8f6731023b74ae5af24a52aac4b054fc3
+  metadata.gz: '095426f805a20574d725842799b3e09368ef4239bf8a262d4ca061ef7689cedd'
+  data.tar.gz: 77098569ba1c05b236bc6b68118116c63985c1cc91bc49cdc5ae49c2550459f6
 SHA512:
-  metadata.gz: 6ad04e10ecb7acce32f3c18225b62aad8b83ef79f46e176678bbaadf0b274e8b0cefbe72c678e7ba9d047a22d98912a4de2e89b73957b721731e3666caf3850c
-  data.tar.gz: 0155f69f8faf71b9fbf95a1d32f04dce4c3eb2a9b43752aac786ee29a3f0db882afd85c1e44178e366938a18053f99eead8d247267d53a49f6dffd63ac0223f5
+  metadata.gz: a71819d5ea5c61bf85907501e9b80ca713dc3e78e97a066a9f3e8fb1713dfc0a81b91aef0b12c51389afad53c518ccca913544be0f44d60182d02ecb722e0e1c
+  data.tar.gz: 95fb2a123492cb6f816ed4c8b1984ec1ba21b1784eceb489543081616ad5d0a5947d56623be63c7e8d5f4586977f4c2999a0bb8c229d20519e8d1f8fc2365749

data/.github/workflows/main.yml

@@ -8,13 +8,13 @@ jobs:
 
     services:
       clickhouse:
-        image: yandex/clickhouse-server:20.11.4.13
+        image: yandex/clickhouse-server:21.1.4
         ports: 
           - 8123:8123
 
     strategy:
       matrix:
-        ruby-version: [2.7, 2.6, 2.5]
+        ruby-version: [3.0, 2.7, 2.6, 2.5, 2.4]
 
     steps:
       - uses: actions/checkout@v2

data/.rubocop.yml

@@ -54,8 +54,6 @@ Metrics/BlockLength:
   Enabled: true
 Metrics/MethodLength:
   Max: 25
-Metrics/LineLength:
-  Max: 140
 Metrics/AbcSize:
   Max: 40
 
@@ -73,6 +71,8 @@ Naming/AccessorMethodName:
   Enabled: false
 
 # ============================== Layout =============================
+Layout/LineLength:
+  Max: 140
 Layout/HashAlignment:
   EnforcedHashRocketStyle: key
   EnforcedColonStyle: key
@@ -105,6 +105,10 @@ Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
 Layout/SpaceAroundMethodCallOperator:
   Enabled: true
+Layout/SpaceBeforeBrackets:
+  Enabled: true
+Lint/AmbiguousAssignment:
+  Enabled: true
 
 # ============================== Style ==============================
 Style/RescueModifier:
@@ -217,6 +221,12 @@ Style/SwapValues:
   Enabled: true
 Style/RedundantArgument:
   Enabled: true
+Style/HashExcept:
+  Enabled: true
+Style/EndlessMethod:
+  Enabled: true
+Style/IfWithBooleanLiteralBranches:
+  Enabled: true
 
 # ============================== Lint ==============================
 Lint/DuplicateMethods:
@@ -287,3 +297,17 @@ Lint/UnmodifiedReduceAccumulator:
   Enabled: true
 Lint/UnexpectedBlockArity:
   Enabled: true
+Lint/DeprecatedConstants:
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: true
+Lint/NumberedParameterAssignment:
+  Enabled: true
+Lint/OrAssignmentToConstant:
+  Enabled: true
+Lint/RedundantDirGlobSort:
+  Enabled: true
+Lint/SymbolConversion:
+  Enabled: true
+Lint/TripleQuotes:
+  Enabled: true

data/CHANGELOG.md

@@ -1,5 +1,21 @@
+# 1.4.0
+* fizx decimal type casting [#11](https://github.com/shlima/click_house/issues/11)
+
+# 1.3.9
+* add `ClickHouse.connection.add_index`, `ClickHouse.connection.drop_index`
+
+# 1.3.8
+* fix `DateTime` casting for queries like `ClickHouse.connection.select_value('select NOW()')` 
+* fix resulting set console inspection
+
+# 1.3.7
+* specify required ruby version [#10](https://github.com/shlima/click_house/issues/10)
+
+# 1.3.6
+* fix ruby 2.7 warning `maybe ** should be added to the call` on `ClickHouse.connection.databases`
+
 # 1.3.5
-* added `ClickHouse.connexction.explain("sql")` 
+* added `ClickHouse.connection.explain("sql")` 
 
 # 1.3.4
 * added `ClickHouse.type_names(nullable: false)`

data/Gemfile.lock

@@ -1,63 +1,65 @@
 PATH
   remote: .
   specs:
-    click_house (1.3.5)
+    click_house (1.4.0)
       faraday
       faraday_middleware
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
+    ast (2.4.2)
     coderay (1.1.3)
     diff-lcs (1.4.4)
-    faraday (1.1.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
+    faraday-net_http (1.0.1)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     method_source (1.0.0)
     multipart-post (2.1.1)
     parallel (1.20.1)
-    parser (2.7.2.0)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (2.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.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (1.5.2)
+    rspec-support (3.10.2)
+    rubocop (1.9.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
-    rubocop-performance (1.9.1)
+    rubocop-performance (1.9.2)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    unicode-display_width (1.7.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
@@ -72,4 +74,4 @@ DEPENDENCIES
   rubocop-performance
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/README.md

@@ -7,7 +7,6 @@
 [![Gem Version](https://badge.fury.io/rb/click_house.svg)](https://badge.fury.io/rb/click_house)
 
 ```bash
-# Requires Ruby >= 2.5
 gem install click_house
 ```
 
@@ -105,6 +104,9 @@ ClickHouse.connection.truncate_tables(['table_1', 'table_2'], if_exists: true, c
 ClickHouse.connection.truncate_tables # will truncate all tables in database
 ClickHouse.connection.rename_table('old_name', 'new_name', cluster: nil)
 ClickHouse.connection.rename_table(%w[table_1 table_2], %w[new_1 new_2], cluster: nil)
+ClickHouse.connection.alter_table('table', 'DROP COLUMN user_id', cluster: nil)
+ClickHouse.connection.add_index('table', 'ix', 'has(b, a)', type: 'minmax', granularity: 2, cluster: nil)
+ClickHouse.connection.drop_index('table', 'ix', cluster: nil)
 
 ClickHouse.connection.select_all('SELECT * FROM visits')
 ClickHouse.connection.select_one('SELECT * FROM visits LIMIT 1')
@@ -498,6 +500,10 @@ class ClickHouseRecord < ActiveRecord::Base
     def select_all
       agent.select_all(current_scope.to_sql)
     end
+
+    def explain
+      agent.explain(current_scope.to_sql)
+    end
   end
 end
 ````

data/click_house.gemspec

@@ -10,6 +10,7 @@ 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'
 
   # 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.

data/docker-compose.yml

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

data/lib/click_house.rb

@@ -34,7 +34,7 @@ module ClickHouse
     add_type column, Type::StringType.new
   end
 
-  ['DateTime(%s)'].each do |column|
+  %w[DateTime DateTime(%s)].each do |column|
     add_type column, Type::DateTimeType.new
   end
 

data/lib/click_house/config.rb

@@ -2,10 +2,6 @@
 
 module ClickHouse
   class Config
-    DEFAULT_SCHEME = 'http'
-    DEFAULT_HOST = 'localhost'
-    DEFAULT_PORT = '8123'
-
     DEFAULTS = {
       adapter: Faraday.default_adapter,
       url: nil,

data/lib/click_house/extend/connection_altering.rb

@@ -66,6 +66,33 @@ module ClickHouse
 
         execute(format(template, pattern)).success?
       end
+
+      def add_index(
+        table_name,
+        name,
+        expression,
+        type:,
+        granularity: nil,
+        after: nil,
+        cluster: nil
+      )
+        template = 'ADD INDEX %<name>s %<expression>s TYPE %<type>s GRANULARITY %<granularity>d %<after>s'
+        pattern = {
+          name: name,
+          expression: expression,
+          type: type,
+          granularity: granularity,
+          after: Util::Statement.ensure(after, "AFTER #{after}"),
+        }
+
+        alter_table(table_name, format(template, pattern), cluster: cluster)
+      end
+
+      def drop_index(table_name, name, cluster: nil)
+        alter_table(table_name, <<~SQL, cluster: cluster)
+          DROP INDEX #{name}
+        SQL
+      end
     end
   end
 end

data/lib/click_house/middleware/parse_csv.rb

@@ -10,7 +10,7 @@ module ClickHouse
       end
 
       define_parser do |body, parser_options|
-        CSV.parse(body, parser_options || {}) unless body.strip.empty?
+        CSV.parse(body, **Hash.new(parser_options)) unless body.strip.empty?
       end
     end
   end

data/lib/click_house/response/result_set.rb

@@ -11,7 +11,8 @@ module ClickHouse
       NULLABLE_TYPE_RE = /#{NULLABLE}\((.+)\)/i.freeze
 
       def_delegators :to_a,
-                     :each, :fetch, :length, :count, :size, :first, :last, :[], :to_h
+                     :inspect, :each, :fetch, :length, :count, :size,
+                     :first, :last, :[], :to_h
 
       attr_reader :meta, :data, :statistics
 
@@ -72,10 +73,6 @@ module ClickHouse
           }
         end
       end
-
-      def inspect
-        to_a
-      end
     end
   end
 end

data/lib/click_house/type/decimal_type.rb

@@ -4,11 +4,11 @@ module ClickHouse
   module Type
     class DecimalType < BaseType
       def cast(value, precision = Float::DIG, _scale = nil)
-        BigDecimal(value, precision.to_f)
+        BigDecimal(value, precision.to_i)
       end
 
       def serialize(value, precision = Float::DIG, _scale = nil)
-        BigDecimal(value, precision.to_f) unless value.nil?
+        BigDecimal(value, precision.to_i).to_f unless value.nil?
       end
     end
   end

data/lib/click_house/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Aliaksandr Shylau
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-05 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -203,14 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Modern Ruby database driver for ClickHouse