click_house 1.2.7 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51b0ca346ad1346979535a0824660870e242190fe29290ffead5e86176aa33d8
-  data.tar.gz: 9abff05f31db9370d318a6641d7ac5f5e285b887e5a962248021e26e5cf04b81
+  metadata.gz: 55de5fd75c50aca5227537365eca6c1042bdff12833c8803f66b1022b6bbefd4
+  data.tar.gz: 101d57eeb3a903a9b95a9955a0ac093c80796ef5fc6163837d49fc7fc64464b2
 SHA512:
-  metadata.gz: cc743a762b55addf1529d62977c2e8a31863433e42f7af8d35cb13be62a0d8bdf6aaf6dddcadee31bfea829027cc304bcff84334e4374fc1b3253b0ed3bf5eae
-  data.tar.gz: e4797984cb3ea107d6772819c96204b6517bfba908b2f52b595a340eb474b7ebb655999f960e37f32eb383d7a62b1b81592764599cf20165fa5965aa140d49dc
+  metadata.gz: 860b3f17e95893e7cdd0d43c37ca42557492b7e44b8e0c61d326a8d83c9211a942775131d5a4705d53b6cdab3dc8acd716b5c2d629e7f95f9f95c74b9310398f
+  data.tar.gz: dc0fd575a9b1c22ae571fda8edb639a8d16df3ddb6497b97b63b3886933b8904e9d94a97f0f8b17619b4c4dca987282265a3002833c3318775e74d201c6f23fa

data/.rubocop.yml

@@ -34,6 +34,8 @@ Performance/Squeeze:
   Enabled: true
 Performance/StringInclude:
   Enabled: true
+Performance/Sum:
+  Enabled: true
 
 # ============================== Metrics ============================
 Metrics/ClassLength:
@@ -171,6 +173,26 @@ Style/RedundantAssignment:
   Enabled: true
 Style/RedundantFileExtensionInRequire:
   Enabled: true
+Style/ExplicitBlockArgument:
+  Enabled: true
+Style/GlobalStdStream:
+  Enabled: true
+Style/OptionalBooleanParameter:
+  Enabled: true
+Style/SingleArgumentDig:
+  Enabled: true
+Style/StringConcatenation:
+  Enabled: true
+Style/ClassEqualityComparison:
+  Enabled: true
+Style/CombinableLoops:
+  Enabled: true
+Style/KeywordParametersOrder:
+  Enabled: false
+Style/RedundantSelfAssignment:
+  Enabled: true
+Style/SoleNestedConditional:
+  Enabled: true
 
 # ============================== Lint ==============================
 Lint/DuplicateMethods:
@@ -187,3 +209,41 @@ Lint/StructNewOverride:
   Enabled: true
 Lint/DuplicateElsifCondition:
   Enabled: true
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: true
+Lint/DuplicateRescueException:
+  Enabled: true
+Lint/EmptyConditionalBody:
+  Enabled: true
+Lint/FloatComparison:
+  Enabled: true
+Lint/MissingSuper:
+  Enabled: false
+Lint/OutOfRangeRegexpRef:
+  Enabled: true
+Lint/SelfAssignment:
+  Enabled: true
+Lint/TopLevelReturnWithArgument:
+  Enabled: true
+Lint/UnreachableLoop:
+  Enabled: true
+Layout/BeginEndAlignment:
+  Enabled: true
+Lint/ConstantDefinitionInBlock:
+  Enabled: true
+Lint/DuplicateRequire:
+  Enabled: true
+Lint/EmptyFile:
+  Enabled: true
+Lint/HashCompareByIdentity:
+  Enabled: true
+Lint/IdentityComparison:
+  Enabled: true
+Lint/RedundantSafeNavigation:
+  Enabled: true
+Lint/TrailingCommaInAttributeDeclaration:
+  Enabled: true
+Lint/UselessMethodDefinition:
+  Enabled: true
+Lint/UselessTimes:
+  Enabled: true

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 1.3.4
+* added `ClickHouse.type_names(nullable: false)`
+* fixed `connection#create_table` column definitions
+
+# 1.3.3
+* fix logger typo
+
+# 1.3.2
+* fix null logger for windows users
+
+# 1.3.1
+* added request [headers](https://github.com/shlima/click_house/pull/8) support
+
+# 1.3.0
+* added support for IPv4/IPv6 types
+
 # 1.2.7
 * rubocop version bump
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    click_house (1.2.6)
+    click_house (1.3.4)
       faraday
       faraday_middleware
 
@@ -11,27 +11,28 @@ GEM
     ast (2.4.1)
     coderay (1.1.3)
     diff-lcs (1.4.4)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     method_source (1.0.0)
     multipart-post (2.1.1)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.2)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
+    rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
     rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -40,20 +41,22 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.88.0)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
+    rubocop-ast (0.8.0)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.8.1)
+      rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     unicode-display_width (1.7.0)
 
 PLATFORMS

data/README.md

@@ -7,7 +7,7 @@
 [![Gem Version](https://badge.fury.io/rb/click_house.svg)](https://badge.fury.io/rb/click_house)
 
 ```bash
-# Requires modern Ruby (>= 2.5), tested with Yandex.Clickhouse v 19.16.2.2
+# Requires Ruby >= 2.5
 gem install click_house
 ```
 
@@ -53,6 +53,7 @@ ClickHouse.config do |config|
   config.timeout = 60
   config.open_timeout = 3
   config.ssl_verify = false
+  config.headers = {}
   
   # or provide connection options separately
   config.scheme = 'http' 
@@ -216,7 +217,8 @@ ClickHouse.connection.create_table('visits', if_not_exists: true, engine: 'Merge
   t.Decimal     :money, 5, 4
   t.String      :event
   t.UInt32      :user_id
-  t.UInt32      :Float32
+  t.IPv4        :ipv4
+  t.IPv6        :ipv6
 end
 ```
 
@@ -328,11 +330,11 @@ ClickHouse.add_type('Date', DateType.new)
 Actually `serialize` function is not used for now, but you may use it manually:
 
 ```ruby
-time_type = DateTimeType.new
-string_type = FixedStringType.new 
+time_type = ClickHouse::Type::DateTimeType.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.serialize(Time.current, 'Europe/Moscow')]
+  buffer << [string_type.serialize('a' * 1000, 20), time_type.serialize(Time.current, 'Europe/Moscow')]
 end
 
 ## alternatively
@@ -344,7 +346,8 @@ data = @records.map do |record|
 end
 ```
 
-If native type supports arguments, define type with `%s` argument:
+If native type supports arguments, define *String* type with `%s` 
+argument and *Numeric* type with `%d` argument:
 
 ```ruby
 class DateTimeType
@@ -448,11 +451,6 @@ class CreateAdvertVisits < ActiveRecord::Migration[6.0]
       t.UInt16   :account_id
       t.UInt16   :user_id
       t.Date     :date
-      t.DateTime :time, 'UTC'
-      t.UInt32   :ipv4
-      t.UInt64   :ipv6
-      t.UInt32   :device_type_id
-      t.UInt32   :os_family_id
     end
   end
 

data/docker-compose.yml

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

data/lib/click_house.rb

@@ -28,36 +28,33 @@ module ClickHouse
 
   %w[Date].each do |column|
     add_type column, Type::DateType.new
-    add_type "Nullable(#{column})", Type::NullableType.new(Type::DateType.new)
   end
 
-  %w[String].each do |column|
+  %w[String FixedString(%d) UUID].each do |column|
     add_type column, Type::StringType.new
-    add_type "Nullable(#{column})", Type::NullableType.new(Type::StringType.new)
   end
 
   ['DateTime(%s)'].each do |column|
     add_type column, Type::DateTimeType.new
-    add_type "Nullable(#{column})", Type::NullableType.new(Type::DateTimeType.new)
   end
 
   ['DateTime64(%d, %s)'].each do |column|
     add_type column, Type::DateTime64Type.new
-    add_type "Nullable(#{column})", Type::NullableType.new(Type::DateTime64Type.new)
   end
 
-  ['Decimal(%s, %s)', 'Decimal32(%s)', 'Decimal64(%s)', 'Decimal128(%s)'].each do |column|
+  ['Decimal(%d, %d)', 'Decimal32(%d)', 'Decimal64(%d)', 'Decimal128(%d)'].each do |column|
     add_type column, Type::DecimalType.new
-    add_type "Nullable(#{column})", Type::NullableType.new(Type::DecimalType.new)
   end
 
   %w[UInt8 UInt16 UInt32 UInt64 Int8 Int16 Int32 Int64].each do |column|
     add_type column, Type::IntegerType.new
-    add_type "Nullable(#{column})", Type::NullableType.new(Type::IntegerType.new)
   end
 
   %w[Float32 Float64].each do |column|
     add_type column, Type::FloatType.new
-    add_type "Nullable(#{column})", Type::NullableType.new(Type::IntegerType.new)
+  end
+
+  %w[IPv4 IPv6].each do |column|
+    add_type column, Type::IPType.new
   end
 end

data/lib/click_house/config.rb

@@ -18,7 +18,8 @@ module ClickHouse
       password: nil,
       timeout: nil,
       open_timeout: nil,
-      ssl_verify: false
+      ssl_verify: false,
+      headers: {}
     }.freeze
 
     attr_accessor :adapter
@@ -33,6 +34,7 @@ module ClickHouse
     attr_accessor :timeout
     attr_accessor :open_timeout
     attr_accessor :ssl_verify
+    attr_accessor :headers
 
     def initialize(params = {})
       assign(DEFAULTS.merge(params))
@@ -51,7 +53,7 @@ module ClickHouse
     end
 
     def logger!
-      @logger || Logger.new('/dev/null')
+      @logger || Logger.new(IO::NULL)
     end
 
     def url!

data/lib/click_house/connection.rb

@@ -11,6 +11,7 @@ module ClickHouse
 
     attr_reader :config
 
+    # @param [Config]
     def initialize(config)
       @config = config
     end
@@ -31,6 +32,7 @@ module ClickHouse
       @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.basic_auth(config.username, config.password) if config.auth?
         conn.response Middleware::Logging, logger: config.logger!

data/lib/click_house/definition/column_set.rb

@@ -3,16 +3,7 @@
 module ClickHouse
   module Definition
     class ColumnSet
-      TYPES = [
-        'UInt8', 'UInt16', 'UInt32', 'UInt64', 'Int8', 'Int16', 'Int32', 'Int64',
-        'Float32', 'Float64',
-        'Decimal(%d, %d)', 'Decimal32(%d)', 'Decimal64(%d)', 'Decimal128(%d)',
-        'String',
-        'FixedString(%d)',
-        'UUID',
-        'Date',
-        "DateTime('%s')", "DateTime64(%d, '%s')"
-      ].freeze
+      TYPES = ClickHouse.type_names(nullable: false).map { |s| s.sub('%s', "'%s'") }.freeze
 
       class << self
         # @input "DateTime('%s')"

data/lib/click_house/extend/type_definition.rb

@@ -3,12 +3,20 @@
 module ClickHouse
   module Extend
     module TypeDefinition
+      NULLABLE = 'Nullable'
+
       def types
         @types ||= Hash.new(Type::UndefinedType.new)
       end
 
-      def add_type(type, klass)
+      def add_type(type, klass, nullable: true)
         types[type] = klass
+        types["#{NULLABLE}(#{type})"] = Type::NullableType.new(klass) if nullable
+      end
+
+      # @return [Enum<String>]
+      def type_names(nullable:)
+        nullable ? types.keys : types.keys.grep_v(/#{NULLABLE}/i)
       end
     end
   end

data/lib/click_house/middleware/logging.rb

@@ -34,7 +34,7 @@ module ClickHouse
 
         logger.info("\e[1mSQL (#{Util::Pretty.measure(elapsed)})\e[0m #{query};")
         logger.debug(body) if body
-        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")
+        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
 

data/lib/click_house/type.rb

@@ -15,5 +15,6 @@ module ClickHouse
     autoload :FixedStringType, 'click_house/type/fixed_string_type'
     autoload :ArrayType, 'click_house/type/array_type'
     autoload :StringType, 'click_house/type/string_type'
+    autoload :IPType, 'click_house/type/ip_type'
   end
 end

data/lib/click_house/type/ip_type.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ClickHouse
+  module Type
+    class IPType < BaseType
+      def cast(value)
+        IPAddr.new(value) unless value.nil?
+      end
+
+      def serialize(value)
+        value.to_s unless value.nil?
+      end
+    end
+  end
+end

data/lib/click_house/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.4
 platform: ruby
 authors:
 - Aliaksandr Shylau
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-05 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -181,6 +181,7 @@ files:
 - lib/click_house/type/fixed_string_type.rb
 - lib/click_house/type/float_type.rb
 - lib/click_house/type/integer_type.rb
+- lib/click_house/type/ip_type.rb
 - lib/click_house/type/nullable_type.rb
 - lib/click_house/type/string_type.rb
 - lib/click_house/type/undefined_type.rb