clickhouse-activerecord 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eac051324737a5cccf85980602ca00a03a67144f
-  data.tar.gz: e5944f2ddaf351da5607187a3d9d4b0b008ae55d
+  metadata.gz: 526a938e8ee69d1c9ed717405c965e7995d497f5
+  data.tar.gz: 0e073d0606e1dd2c0f96504d571e2fcdbb2df041
 SHA512:
-  metadata.gz: b0440948eda2c9aaf4dae8762cba4a8e506b0620e06e6a4160d64f7865f9e4963966cba30665a6a2cb7660c4f674e94dc7388399d93cb6c788e88c205ab5678c
-  data.tar.gz: fada2ee435950d8521d33a0bbbd1cd08d05e542123c780219f47aba213bed2c238ae6784856c930ab38a8c521da0bb00d0fde13572200fb10e5414762017b127
+  metadata.gz: 17718b1dbe7a43fa085fbd87b8f81640eaaae219217d2256bfd6743e61b5b1990fc2a93cb65dc3da007c7970a67e5f17a48f496aeabb9bbf8e5818be284ce6cd
+  data.tar.gz: 202af70214fab7c2816f9b45dad1557d1fba71087ab6940e8919c9995fd2312573bbea554473aab429f41ddf68d12cef21f7a49638f7ed873df97e7cd26de65f

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+### Version 0.1.4 (Nov 29, 2017)
+
+* Support materialized view
+* Aggregated functions for view
+* Schema dumper with SQL create table
+
+### Version 0.1.2 (Sep 27, 2017)
+
+* Fix Big Int type
+
+### Version 0.1.0 (Aug 31, 2017)
+
+* Initial release

data/README.md

@@ -39,6 +39,14 @@ class Action < ActiveRecord::Base
 end
 ```
 
+For materialized view model add:
+```ruby
+class ActionView < ActiveRecord::Base
+  establish_connection "#{Rails.env}_clickhouse".to_sym
+  self.is_view = true
+end
+```
+
 Or global connection, but schema dump don't works:
 
 ```yml
@@ -54,14 +62,22 @@ Schema dump:
 
     $ rake clickhouse:schema:dump
     
+We use schema for emulate development or tests environment on PostgreSQL adapter.
+    
 ### Insert and select data
 
 ```ruby
 Action.where(url: 'http://example.com', date: Date.current).where.not(name: nil).order(created_at: :desc).limit(10)
-=> #<ActiveRecord::Relation [#<Action *** >]>
+# Clickhouse Action Load (10.3ms)  SELECT  actions.* FROM actions WHERE actions.date = '2017-11-29' AND actions.url = 'http://example.com' AND (actions.name IS NOT NULL)  ORDER BY actions.created_at DESC LIMIT 10
+#=> #<ActiveRecord::Relation [#<Action *** >]>
 
 Action.create(url: 'http://example.com', date: Date.yesterday)
-=> true
+# Clickhouse Action Load (10.8ms)  INSERT INTO actions (url, date) VALUES ('http://example.com', '2017-11-28')
+#=> true
+
+ActionView.maximum(:date)
+# Clickhouse (10.3ms)  SELECT maxMerge(actions.date) FROM actions
+#=> 'Wed, 29 Nov 2017'
 ```
 
 NOTE: Creating tables in developing.

data/clickhouse-activerecord.gemspec

@@ -2,10 +2,11 @@
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require File.expand_path('../lib/clickhouse-activerecord/version', __FILE__)
 
 Gem::Specification.new do |spec|
   spec.name          = 'clickhouse-activerecord'
-  spec.version       = '0.1.3'
+  spec.version       = ClickhouseActiverecord::VERSION
   spec.authors       = ['Sergey Odintsov']
   spec.email         = ['nixx.dj@gmail.com']
 
@@ -21,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency "bundler", ">= 1.13.4"
-  spec.add_dependency 'rails', '>= 4.1.8'
+  spec.add_runtime_dependency 'bundler', '~> 1.13', '>= 1.13.4'
+  spec.add_runtime_dependency 'rails', '>= 4.1.8', '< 5'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -1,3 +1,4 @@
+require 'clickhouse-activerecord/arel/visitors/to_sql'
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/clickhouse/oid/date'
 require 'active_record/connection_adapters/clickhouse/oid/date_time'
@@ -23,6 +24,21 @@ module ActiveRecord
     end
   end
 
+  module ModelSchema
+
+    module ClassMethods
+      def is_view
+        @is_view || false
+      end
+
+      # @param [Boolean] value
+      def is_view=(value)
+        @is_view = value
+      end
+    end
+
+  end
+
   module ConnectionAdapters
 
     class ClickhouseColumn < Column
@@ -89,7 +105,7 @@ module ActiveRecord
         @connection_parameters = connection_parameters
         @config = config
 
-        @visitor = Arel::Visitors::ToSql.new self
+        @visitor = ClickhouseActiverecord::Arel::Visitors::ToSql.new self
 
         connect
       end

data/lib/clickhouse-activerecord.rb

@@ -1,6 +1,9 @@
 require 'active_record/connection_adapters/clickhouse_adapter'
 
-require 'clickhouse/railtie' if defined?(Rails::Railtie)
+if defined?(Rails::Railtie)
+  require 'clickhouse-activerecord/railtie'
+  require 'clickhouse-activerecord/schema_dumper'
+end
 
 module ClickhouseActiverecord
 

data/lib/clickhouse-activerecord/arel/visitors/to_sql.rb

@@ -0,0 +1,20 @@
+require 'arel/visitors/to_sql'
+
+module ClickhouseActiverecord
+  module Arel
+    module Visitors
+      class ToSql < ::Arel::Visitors::ToSql
+
+        def aggregate(name, o, collector)
+          # replacing function name for materialized view
+          if o.expressions.first.relation.engine.is_view
+            super("#{name.downcase}Merge", o, collector)
+          else
+            super
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/{clickhouse → clickhouse-activerecord}/railtie.rb

@@ -1,4 +1,4 @@
-module Clickhouse
+module ClickhouseActiverecord
   require 'rails'
 
   class Railtie < Rails::Railtie

data/lib/clickhouse-activerecord/schema_dumper.rb

@@ -0,0 +1,10 @@
+class ClickhouseActiverecord::SchemaDumper < ActiveRecord::SchemaDumper
+
+  def table(table, stream)
+
+    stream.puts "  # TABLE: #{table}"
+    stream.puts "  # SQL: #{@connection.query("SHOW CREATE TABLE #{table.gsub(/^\.inner\./, '')}")['data'].try(:first).try(:first)}"
+    super(table.gsub(/^\.inner\./, ''), stream)
+
+  end
+end

data/lib/clickhouse-activerecord/version.rb

@@ -0,0 +1,3 @@
+module ClickhouseActiverecord
+  VERSION = '0.1.4'
+end

data/lib/tasks/clickhouse.rake

@@ -14,7 +14,7 @@ namespace :clickhouse do
       filename = "#{Rails.root}/db/clickhouse_schema.rb"
       File.open(filename, 'w:utf-8') do |file|
         ActiveRecord::Base.establish_connection(:"#{Rails.env}_clickhouse")
-        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+        ClickhouseActiverecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
       end
     end
 

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.13.4
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.13.4
@@ -31,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +86,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -87,7 +100,10 @@ files:
 - lib/active_record/connection_adapters/clickhouse/oid/date_time.rb
 - lib/active_record/connection_adapters/clickhouse_adapter.rb
 - lib/clickhouse-activerecord.rb
-- lib/clickhouse/railtie.rb
+- lib/clickhouse-activerecord/arel/visitors/to_sql.rb
+- lib/clickhouse-activerecord/railtie.rb
+- lib/clickhouse-activerecord/schema_dumper.rb
+- lib/clickhouse-activerecord/version.rb
 - lib/tasks/clickhouse.rake
 homepage: https://github.com/pnixx/clickhouse-activerecord
 licenses: