click_house 1.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f4230ea84634e1cfed295d8cc41239d1212bb48807b68636ce82c6cba08039
-  data.tar.gz: e78054a1f0e3094746adfea54b8fcf649d306cbaa1fce636e822a073ac446376
+  metadata.gz: 87293ae8c38bd7182d525925ca9c36c4660c004465d0d7b4ce9f27f166ef6c6d
+  data.tar.gz: 93bb17fe88aae7e0dae175a4b03dced840a6e8d57b507d78f91833e470cd8cbf
 SHA512:
-  metadata.gz: 280540bf287f99f4fc87e90c47bd94312cc4a82047ada6f193ca4e77b84527c7733e2260f8cb7c960a04d726ffbe449612cf9ee3f297bf30cc6ba27e2ccb9b7c
-  data.tar.gz: 8a4e4213c46c99181a521e749e57fd63857cb0f135fa41ef9e25781947ecbef4eb8844a9062305a5080abeea85e4dee652d50b432e9c1b1cd65f12bf43006624
+  metadata.gz: e7309f25dddb0c7f6e6c032098b6b47b324cbc8c731ff15958bf38f835e3dcacc222cb2f7e7c59a1aeec32b952afb4916e23cacdaf323a624d0c4a6e07e7a114
+  data.tar.gz: dbe36582b28d40ab85bf02067495296609b27600fa4ff3b1b0d7e81bb3890af512ffb4a5a7d045f7b155753c75e31c0353801fbc256767d2a594743a63090aae

data/.github/workflows/main.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [3.1, '3.0', 2.7, 2.6]
+        ruby-version: [3.1, '3.0', 2.7]
 
     steps:
       - uses: actions/checkout@v2
@@ -23,10 +23,21 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true # 'bundle install' and cache
 
-      - name: Run tests
-        run: bundle exec rspec
+      - name: Setup v1
+        run: make faraday1 bundle
+
+      - name: Setup v2
+        run: make faraday2 bundle
+
+      - name: Run tests with faraday v.1 JSON
+        run: make faraday1 rspec
+      - name: Run tests with faraday v.2 JSON
+        run: make faraday2 rspec
+      - name: Run tests with faraday v.1 OJ
+        run: make faraday1 oj rspec
+      - name: Run tests with faraday v.2 OJ
+        run: make faraday2 oj rspec
 
   rubocop:
     runs-on: ubuntu-latest

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.0.0
+* Fixed `Bigdecimal` casting with high precision
+* Added nested `type casting like Array(Array(Array(Nullable(T))))`
+* Added `Map(T1, T2)` support
+* Added `Tuple(T1, T2)` support
+* Added support for `Faraday` v1 and v2
+* Added support for `Oj` parser
+
 # 1.6.3
 * [PR](https://github.com/shlima/click_house/pull/38) Add option format for insert
 * [PR](https://github.com/shlima/click_house/pull/34) Support X-ClickHouse-Exception-Code header

data/Gemfile.lock

@@ -1,44 +1,32 @@
 PATH
   remote: .
   specs:
-    click_house (1.7.0)
-      faraday (>= 1.7)
-      faraday_middleware
+    click_house (2.0.0)
+      activesupport
+      faraday (>= 1.7, < 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (7.0.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     ast (2.4.2)
     coderay (1.1.3)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    faraday (1.10.2)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.7.1)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    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)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
+    faraday-net_http (3.0.2)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
     json (2.6.2)
     method_source (1.0.0)
-    multipart-post (2.2.3)
+    minitest (5.16.3)
+    oj (3.13.23)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
@@ -47,7 +35,7 @@ GEM
       method_source (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -62,7 +50,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.38.0)
+    rubocop (1.39.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -74,11 +62,13 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.15.0)
+    rubocop-performance (1.15.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
 
 PLATFORMS
@@ -87,6 +77,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   click_house!
+  oj
   pry
   rake
   rspec

data/Gemfile_faraday1

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+# lock faraday to v1
+gem 'faraday_middleware'
+
+# Specify your gem's dependencies in click_house.gemspec
+gemspec

data/Gemfile_faraday1.lock

@@ -0,0 +1,111 @@
+PATH
+  remote: .
+  specs:
+    click_house (1.7.0)
+      activesupport
+      faraday (>= 1.7, < 3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    faraday (1.10.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    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)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.2)
+    method_source (1.0.0)
+    minitest (5.16.3)
+    multipart-post (2.2.3)
+    oj (3.13.23)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.6.1)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.39.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.23.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.15.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.3.0)
+
+PLATFORMS
+  x86_64-darwin-21
+
+DEPENDENCIES
+  bundler
+  click_house!
+  faraday_middleware
+  oj
+  pry
+  rake
+  rspec
+  rubocop
+  rubocop-performance
+
+BUNDLED WITH
+   2.3.7

data/Gemfile_faraday2

@@ -0,0 +1 @@
+Gemfile

data/Gemfile_faraday2.lock

@@ -0,0 +1,88 @@
+PATH
+  remote: .
+  specs:
+    click_house (1.7.0)
+      activesupport
+      faraday (>= 1.7, < 3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    faraday (2.7.1)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.2)
+    method_source (1.0.0)
+    minitest (5.16.3)
+    oj (3.13.23)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.6.1)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.39.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.23.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.15.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.3.0)
+
+PLATFORMS
+  x86_64-darwin-21
+
+DEPENDENCIES
+  bundler
+  click_house!
+  oj
+  pry
+  rake
+  rspec
+  rubocop
+  rubocop-performance
+
+BUNDLED WITH
+   2.3.7

data/Makefile

@@ -1,12 +1,37 @@
 .PHONY: help
 
+.BUNDLE_GEMFILE:=
+.REQUIRE:=./spec/spec_helper
+
 help:
 	@echo 'Available targets:'
 	@echo '  make dockerize OR make ARGS="--build" dockerize'
 	@echo '  make release'
+	@echo '  '
+	@echo '  make faraday1 bundle'
+	@echo '  make faraday2 bundle'
+	@echo '  '
+	@echo '  make faraday1 rspec'
+	@echo '  make faraday2 rspec'
+	@echo '  make faraday2 oj rspec'
 
 dockerize:
 	docker-compose up ${ARGS}
 
 release:
 	bin/release.sh
+
+faraday1:
+	$(eval .BUNDLE_GEMFILE=Gemfile_faraday1)
+
+faraday2:
+	$(eval .BUNDLE_GEMFILE=Gemfile_faraday2)
+
+oj:
+	$(eval .REQUIRE=./spec/oj_helper)
+
+bundle:
+	BUNDLE_GEMFILE=${.BUNDLE_GEMFILE} bundle
+
+rspec:
+	BUNDLE_GEMFILE=${.BUNDLE_GEMFILE} rspec --require ${.REQUIRE} spec

data/README.md

@@ -65,6 +65,11 @@ ClickHouse.config do |config|
 
   # if you want to add settings to all queries
   config.global_params = { mutations_sync: 1 }
+  
+  # choose a ruby JSON parser
+  config.json_parser = ClickHouse::Middleware::ParseJson
+  # or Oj parser
+  config.json_parser = ClickHouse::Middleware::ParseJsonOj
 end
 ```
 
@@ -337,25 +342,6 @@ end
 ClickHouse.add_type('Date', DateType.new)
 ```
 
-Actually `serialize` function is not used for now, but you may use it manually:
-
-```ruby
-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_type.serialize(Time.current, 'Europe/Moscow')]
-end
-
-## alternatively
-data = @records.map do |record|
-  {
-    id: record.id,
-    time: ClickHouse.types['DateTime(%s)'].serialize(Time.current)
-  }
-end
-```
-
 If native type supports arguments, define *String* type with `%s`
 argument and *Numeric* type with `%d` argument:
 

data/click_house.gemspec

@@ -10,7 +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.6.0'
+  spec.required_ruby_version = '>= 2.7.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.
@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday', '>= 1.7'
-  spec.add_dependency 'faraday_middleware'
+  spec.add_dependency 'faraday', '>= 1.7', '< 3'
+  spec.add_dependency 'activesupport'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'oj'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rubocop'

data/lib/click_house/ast/parser.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'stringio'
+
+module ClickHouse
+  module Ast
+    class Parser
+      OPEN = '('
+      CLOSED = ')'
+      COMMA = ','
+      SPACE = ' '
+
+      attr_reader :input
+
+      # @param input [String]
+      def initialize(input)
+        @input = input
+      end
+
+      # @refs https://clickhouse.com/docs/en/sql-reference/data-types/
+      # Map(String, Decimal(10, 5))
+      # Array(Array(Array(Array(Nullable(Int, String)))))
+      def parse
+        ticker = Ticker.new
+        control = false
+
+        input.each_char do |char|
+          # cases like (1,<space after comma> 3)
+          next if control && char == SPACE
+
+          case char
+          when OPEN
+            control = true
+            ticker.open
+          when CLOSED
+            control = true
+            ticker.close
+          when COMMA
+            control = true
+            ticker.comma
+          else
+            control = false
+            ticker.char(char)
+          end
+        end
+
+        # if a single type like "Int"
+        ticker.current.name! unless control
+        ticker.current
+      end
+    end
+  end
+end

data/lib/click_house/ast/statement.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'stringio'
+
+module ClickHouse
+  module Ast
+    class Statement
+      PLACEHOLDER_S = '%s'
+      PLACEHOLDER_D = '%d'
+      DIGIT_RE = /\A\d+\Z/.freeze
+
+      attr_reader :name
+      attr_accessor :caster
+
+      def initialize(name: '')
+        @buffer = ''
+        @name = name
+        @opened = false
+      end
+
+      # @param value [String]
+      def print(value)
+        @buffer = "#{@buffer}#{value}"
+      end
+
+      def name!
+        @name = @buffer
+        @buffer = ''
+      end
+
+      def argument!
+        add_argument(Statement.new(name: @buffer))
+        @buffer = ''
+      end
+
+      # @param st [Statement]
+      def add_argument(st)
+        arguments.push(st)
+      end
+
+      # @param other [Statement]
+      def merge(other)
+        if other.named?
+          add_argument(other)
+        else
+          @arguments = arguments.concat(other.arguments)
+        end
+      end
+
+      def named?
+        !@name.empty?
+      end
+
+      def buffer?
+        !@buffer.empty?
+      end
+
+      # @return [Array<Statement>]
+      def arguments
+        @arguments ||= []
+      end
+
+      def placeholder
+        return @placeholder if defined?(@placeholder)
+
+        @placeholder = digit? ? PLACEHOLDER_D : PLACEHOLDER_S
+      end
+
+      def digit?
+        name.match?(DIGIT_RE)
+      end
+
+      def value
+        @value ||=
+          case placeholder
+          when PLACEHOLDER_D
+            Integer(name)
+          when PLACEHOLDER_S
+            # remove leading and trailing quotes
+            name[1..-2]
+          else
+            raise "unknown value extractor for <#{placeholder}>"
+          end
+      end
+
+      def to_s
+        out = StringIO.new
+        out.print(name.empty? ? 'NO_NAME' : name)
+        out.print("<#{@buffer}>") unless @buffer.empty?
+
+        if arguments.any?
+          out.print("(#{arguments.join(',')})")
+        end
+
+        out.string
+      end
+    end
+  end
+end

data/lib/click_house/ast/ticker.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'stringio'
+
+module ClickHouse
+  module Ast
+    class Ticker
+      attr_reader :root, :current
+
+      def initialize
+        @current = Statement.new
+      end
+
+      def open
+        current.name!
+        opened.push(current)
+        @current = Statement.new
+      end
+
+      def comma
+        current.argument! if current.buffer?
+        opened.last.merge(current)
+        @current = Statement.new
+      end
+
+      def close
+        current.argument! unless current.named?
+        opened.last.merge(current)
+        @current = opened.pop
+      end
+
+      # @param char [String]
+      def char(char)
+        current.print(char)
+      end
+
+      def opened
+        @opened ||= []
+      end
+    end
+  end
+end

data/lib/click_house/ast.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ClickHouse
+  module Ast
+    autoload :Statement, 'click_house/ast/statement'
+    autoload :Ticker, 'click_house/ast/ticker'
+    autoload :Parser, 'click_house/ast/parser'
+  end
+end