click_house 1.6.2 → 2.0.0

data/lib/click_house/type/base_type.rb

@@ -7,9 +7,33 @@ module ClickHouse
         raise NotImplementedError, __method__
       end
 
-      def serialize(_value, *)
+      def cast_each(_value, *)
         raise NotImplementedError, __method__
       end
+
+      # @return [Boolean]
+      # true if type contains another type like Nullable(T) or Array(T)
+      def container?
+        false
+      end
+
+      # @return [Boolean]
+      # true if type is a Map
+      def map?
+        false
+      end
+
+      # @return [Boolean]
+      # true if type is a Tuple
+      def tuple?
+        false
+      end
+
+      # @return [Boolean]
+      # skip type from DDL statements
+      def ddl?
+        true
+      end
     end
   end
 end

data/lib/click_house/type/date_time64_type.rb

@@ -4,7 +4,11 @@ module ClickHouse
   module Type
     class DateTime64Type < BaseType
       def cast(value, _precision = nil, tz = nil)
-        DateTime.parse("#{value} #{tz}")
+        if tz
+          Time.find_zone(tz).parse(value)
+        else
+          Time.parse(value)
+        end
       end
 
       def serialize(value, precision = 3)

data/lib/click_house/type/date_time_type.rb

@@ -4,7 +4,11 @@ module ClickHouse
   module Type
     class DateTimeType < BaseType
       def cast(value, tz = nil)
-        DateTime.parse("#{value} #{tz}")
+        if tz
+          Time.find_zone(tz).parse(value)
+        else
+          Time.parse(value)
+        end
       end
 
       def serialize(value)

data/lib/click_house/type/decimal_type.rb

@@ -3,8 +3,22 @@
 module ClickHouse
   module Type
     class DecimalType < BaseType
+      MAXIMUM = Float::DIG
+
+      # clickhouse:
+      # P - precision. Valid range: [ 1 : 76 ]. Determines how many decimal digits number can have (including fraction).
+      # S - scale. Valid range: [ 0 : P ]. Determines how many decimal digits fraction can have.
+      #
+      # when Oj parser @refs https://stackoverflow.com/questions/47885304/deserialise-json-numbers-as-bigdecimal
       def cast(value, precision = Float::DIG, _scale = nil)
-        BigDecimal(value, precision.to_i)
+        case value
+        when BigDecimal
+          value
+        when String
+          BigDecimal(value)
+        else
+          BigDecimal(value, precision > MAXIMUM ? MAXIMUM : precision)
+        end
       end
 
       def serialize(value, precision = Float::DIG, _scale = nil)

data/lib/click_house/type/low_cardinality_type.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ClickHouse
+  module Type
+    class LowCardinalityType < BaseType
+      def cast_each(value, *_argv)
+        yield(value) unless value.nil?
+      end
+
+      def container?
+        true
+      end
+    end
+  end
+end

data/lib/click_house/type/map_type.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ClickHouse
+  module Type
+    class MapType < BaseType
+      def map?
+        true
+      end
+
+      def ddl?
+        false
+      end
+    end
+  end
+end

data/lib/click_house/type/nullable_type.rb

@@ -3,18 +3,16 @@
 module ClickHouse
   module Type
     class NullableType < BaseType
-      attr_reader :subtype
-
-      def initialize(subtype)
-        @subtype = subtype
+      def cast_each(value, *_argv)
+        yield(value) unless value.nil?
       end
 
-      def cast(*argv)
-        subtype.cast(*argv) unless argv.first.nil?
+      def container?
+        true
       end
 
-      def serialize(*argv)
-        subtype.serialize(*argv) unless argv.first.nil?
+      def ddl?
+        false
       end
     end
   end

data/lib/click_house/type/string_type.rb

@@ -3,7 +3,7 @@
 module ClickHouse
   module Type
     class StringType < BaseType
-      def cast(value)
+      def cast(value, *)
         value.to_s unless value.nil?
       end
 

data/lib/click_house/type/tuple_type.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ClickHouse
+  module Type
+    class TupleType < BaseType
+      def tuple?
+        true
+      end
+
+      def ddl?
+        false
+      end
+    end
+  end
+end

data/lib/click_house/type.rb

@@ -14,7 +14,10 @@ module ClickHouse
     autoload :DecimalType, 'click_house/type/decimal_type'
     autoload :FixedStringType, 'click_house/type/fixed_string_type'
     autoload :ArrayType, 'click_house/type/array_type'
+    autoload :TupleType, 'click_house/type/tuple_type'
+    autoload :MapType, 'click_house/type/map_type'
     autoload :StringType, 'click_house/type/string_type'
     autoload :IPType, 'click_house/type/ip_type'
+    autoload :LowCardinalityType, 'click_house/type/low_cardinality_type'
   end
 end

data/lib/click_house/version.rb

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

data/lib/click_house.rb

@@ -8,13 +8,14 @@ require 'logger'
 require 'faraday'
 require 'forwardable'
 require 'bigdecimal'
-require 'faraday_middleware'
+require 'active_support/core_ext/time/calculations'
 require 'click_house/version'
 require 'click_house/errors'
 require 'click_house/response'
 require 'click_house/type'
 require 'click_house/middleware'
 require 'click_house/extend'
+require 'click_house/ast'
 require 'click_house/util'
 require 'click_house/definition'
 
@@ -26,6 +27,12 @@ module ClickHouse
   autoload :Config, 'click_house/config'
   autoload :Connection, 'click_house/connection'
 
+  add_type 'Array', Type::ArrayType.new
+  add_type 'Nullable', Type::NullableType.new
+  add_type 'Map', Type::MapType.new
+  add_type 'LowCardinality', Type::LowCardinalityType.new
+  add_type 'Tuple', Type::TupleType.new
+
   %w[Date].each do |column|
     add_type column, Type::DateType.new
   end
@@ -38,11 +45,11 @@ module ClickHouse
     add_type column, Type::DateTimeType.new
   end
 
-  ['DateTime64(%d, %s)'].each do |column|
+  ['DateTime64(%d)', 'DateTime64(%d, %s)'].each do |column|
     add_type column, Type::DateTime64Type.new
   end
 
-  ['Decimal(%d, %d)', 'Decimal32(%d)', 'Decimal64(%d)', 'Decimal128(%d)'].each do |column|
+  ['Decimal(%d, %d)', 'Decimal32(%d)', 'Decimal64(%d)', 'Decimal128(%d)', 'Decimal256(%d)'].each do |column|
     add_type column, Type::DecimalType.new
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Aliaksandr Shylau
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,8 +27,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +156,10 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Gemfile_faraday1
+- Gemfile_faraday1.lock
+- Gemfile_faraday2
+- Gemfile_faraday2.lock
 - LICENCE.txt
 - Makefile
 - README.md
@@ -147,6 +171,10 @@ files:
 - doc/logo.svg
 - docker-compose.yml
 - lib/click_house.rb
+- lib/click_house/ast.rb
+- lib/click_house/ast/parser.rb
+- lib/click_house/ast/statement.rb
+- lib/click_house/ast/ticker.rb
 - lib/click_house/config.rb
 - lib/click_house/connection.rb
 - lib/click_house/definition.rb
@@ -167,7 +195,10 @@ files:
 - lib/click_house/middleware.rb
 - lib/click_house/middleware/logging.rb
 - lib/click_house/middleware/parse_csv.rb
+- lib/click_house/middleware/parse_json.rb
+- lib/click_house/middleware/parse_json_oj.rb
 - lib/click_house/middleware/raise_error.rb
+- lib/click_house/middleware/response_base.rb
 - lib/click_house/response.rb
 - lib/click_house/response/factory.rb
 - lib/click_house/response/result_set.rb
@@ -183,8 +214,11 @@ files:
 - 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/low_cardinality_type.rb
+- lib/click_house/type/map_type.rb
 - lib/click_house/type/nullable_type.rb
 - lib/click_house/type/string_type.rb
+- lib/click_house/type/tuple_type.rb
 - lib/click_house/type/undefined_type.rb
 - lib/click_house/util.rb
 - lib/click_house/util/pretty.rb
@@ -203,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="