click_house 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2862b65661584d94d5a12bf10f0f308081e05a8a0cccbb6d79f42d93756bf086
-  data.tar.gz: 4790a4d30017a52878f959e8675979d18d53bed6f9ae0e009679939aca2058a9
+  metadata.gz: 55de5fd75c50aca5227537365eca6c1042bdff12833c8803f66b1022b6bbefd4
+  data.tar.gz: 101d57eeb3a903a9b95a9955a0ac093c80796ef5fc6163837d49fc7fc64464b2
 SHA512:
-  metadata.gz: 6e80ec8a830930a620616c60a57b2b55117da9dc63e6fca248734d5511005fe1e794b3baf82ccaea96ec43e1112164909645cc836554b9a59d0ab4cbcf4fe60a
-  data.tar.gz: 5ed0f070acb487f96fec663efd05576eb0a4d540a2efbbcf36d90c96b1be9dae9de2c1b73c32f27ee255064839726714ac6cc3d2a47563155651155fca8e87fb
+  metadata.gz: 860b3f17e95893e7cdd0d43c37ca42557492b7e44b8e0c61d326a8d83c9211a942775131d5a4705d53b6cdab3dc8acd716b5c2d629e7f95f9f95c74b9310398f
+  data.tar.gz: dc0fd575a9b1c22ae571fda8edb639a8d16df3ddb6497b97b63b3886933b8904e9d94a97f0f8b17619b4c4dca987282265a3002833c3318775e74d201c6f23fa

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.4
+* added `ClickHouse.type_names(nullable: false)`
+* fixed `connection#create_table` column definitions
+
 # 1.3.3
 * fix logger typo
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    click_house (1.3.3)
+    click_house (1.3.4)
       faraday
       faraday_middleware
 

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 20.9.3.45
+# Requires Ruby >= 2.5
 gem install click_house
 ```
 
@@ -346,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

data/docker-compose.yml

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

data/lib/click_house.rb

@@ -28,41 +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
-    add_type "Nullable(#{column})", Type::NullableType.new(Type::IPType.new)
   end
 end

data/lib/click_house/definition/column_set.rb

@@ -3,17 +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',
-        'IPv4', 'IPv6',
-        "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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Aliaksandr Shylau
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday