click_house 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7486a9c08726582c9824560d471e12260cc0349a80caa10f32ab19edca64cc06
-  data.tar.gz: ada7929336b444323b135773e3e6678276e3a9d3433dc6e81b5e3db9238570f3
+  metadata.gz: 700d57a764315e709b8e78f10a5765801baa2b491aeb4aad6b6cc6c2016f8c74
+  data.tar.gz: 34f61608fd6b67fed90f9ec1d84db1677abdeda86f3c8751fb124457f25274e4
 SHA512:
-  metadata.gz: d3a96167eaac87f3421d0ce146dc1c0f898f02330416e59b06483f02ed8c1acb5403d8f5bf19f1138018c02434736d7edd32a550b3a3ac70f110380e952f8086
-  data.tar.gz: 8c6d0c99b0fbfa2e8d9a298d4d144202eabe564714e2821ee27bc4e436bad19b2d1c0060327be9216ee27a879fb75785af59ee260845fd995ce808faf8e1b71e
+  metadata.gz: bff6c7f9bda496860ee38038bde526f706f7f6a1c1be8be0800806c70c24de15764d090e579c4dafe0bf3e86eca18acfce4a3c96542b5e89756182b8711f8aaf
+  data.tar.gz: 5cd4d79cb422ea0feb9171b2e1ca5eb824d50fabdd718e2789c65e1ce75bcefedd60c479a0a46a9488a0c6ac8f352e25caa07e2c417c8ae79c351c2b121ffd3b

data/Gemfile.lock

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

data/README.md

@@ -38,6 +38,9 @@ Yandex uses HTTP interface for working from Java and Perl, Python and Go as well
 * [Type casting](#type-casting)
 * [Using with a connection pool](#using-with-a-connection-pool)
 * [Using with Rails](#using-with-rails)
+* [Using with ActiveRecord](#using-with-activerecord)
+* [Using with RSpec](#using-with-rspec)
+* [Development](#development)
 
 ## Configuration
 
@@ -459,18 +462,57 @@ class CreateAdvertVisits < ActiveRecord::Migration[6.0]
 end
 ```
 
+## Using with ActiveRecord
+
 if you use `ActiveRecord`, you can use the ORM query builder by using fake models
+(empty tables must be present in the SQL database `create_table :visits`)
+
+```ruby
+class ClickHouseRecord < ActiveRecord::Base
+  self.abstract_class = true
+
+  class << self
+    def agent
+      ClickHouse.connection
+    end
+
+    def insert(*argv, &block)
+      agent.insert(table_name, *argv, &block)
+    end
+
+    def select_one
+      agent.select_one(current_scope.to_sql)
+    end
+
+    def select_value
+      agent.select_value(current_scope.to_sql)
+    end
+
+    def select_all
+      agent.select_all(current_scope.to_sql)
+    end
+  end
+end
+````
 
 ````ruby
 # FAKE MODEL FOR ClickHouse 
-class Visit < ApplicationRecord
+class Visit < ClickHouseRecord
   scope :with_os, -> { where.not(os_family_id: nil) }
 end
 
-scope = Visit.with_os.select('COUNT(*) as counter').group(:ipv4)
-ClickHouse.connection.select_all(scope.to_sql)
+Visit.with_os.select('COUNT(*) as counter').group(:ipv4).select_all
+#=> [{ 'ipv4' => 1455869, 'counter' => 104 }]
+
+Visit.with_os.select('COUNT(*)').select_value 
+#=> 20_345_678
+ 
+Visit.where(user_id: 1).select_one 
+#=> { 'ipv4' => 1455869, 'user_id' => 1 }  
 ```` 
 
+## Using with RSpec
+
 You can clear the data table before each test with RSpec
 
 ```ruby

data/lib/click_house/extend/connection_inserting.rb

@@ -3,6 +3,9 @@
 module ClickHouse
   module Extend
     module ConnectionInserting
+      EMPTY_INSERT = true
+
+      # @return [Boolean]
       def insert(table, columns: [], values: [])
         yield(values) if block_given?
 
@@ -12,6 +15,8 @@ module ClickHouse
           values.map { |value_row| columns.zip(value_row).to_h.to_json }
         end
 
+        return EMPTY_INSERT if values.empty?
+
         execute("INSERT INTO #{table} FORMAT JSONEachRow", body.join("\n")).success?
       end
     end

data/lib/click_house/type/base_type.rb

@@ -3,11 +3,11 @@
 module ClickHouse
   module Type
     class BaseType
-      def cast(_value)
+      def cast(_value, *)
         raise NotImplementedError, __method__
       end
 
-      def serialize(_value)
+      def serialize(_value, *)
         raise NotImplementedError, __method__
       end
     end

data/lib/click_house/type/nullable_type.rb

@@ -13,8 +13,8 @@ module ClickHouse
         subtype.cast(*argv) unless argv.first.nil?
       end
 
-      def serialize(value)
-        value.nil ? 'NULL' : subtype.serialize(value)
+      def serialize(*argv)
+        subtype.serialize(*argv) unless argv.first.nil?
       end
     end
   end

data/lib/click_house/type/undefined_type.rb

@@ -2,7 +2,7 @@
 
 module ClickHouse
   module Type
-    class UndefinedType
+    class UndefinedType < BaseType
       def cast(value, *)
         value
       end

data/lib/click_house/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Aliaksandr Shylau
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday