clickhouse-activerecord 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95e15e250fc477a64d9a5f99faae7a831643c599
-  data.tar.gz: aea2dd5a8c32635882c94ce49ce2a37b19126835
+  metadata.gz: 9a454d1e7bc652ae74ce866ebceab0a6df2d1a0f
+  data.tar.gz: 70ccff7d8651cf35ff7dbd274773b42e9a5054a7
 SHA512:
-  metadata.gz: c4487476126af3c3025075bd3e8727f7232e163f3bef0ee2fdebf23bed7ca03f40d89601463be151f79caabcfa08540fbe0469f0c43fc94b4a882035642415fb
-  data.tar.gz: 939d15b666d661e1d395b1c6cba3234503764ec3591ecd897ec304361f328aaddb1adb17cc866a14300efa0871c5a72ef70a85a4d7fac3c6ee851de138005e61
+  metadata.gz: c0bac0b7265c1cc259163d423564e151b87eaf37f8d5aee1b1241d4319eb722e8374fa9888285d1db2cee35eae4d4cc85883f0a795ea9d2a3dcf3cd0b614d3db
+  data.tar.gz: 922a4a22e3bd3f3bd22e5f68ffbc0151becf125ca6e15b515e8eda2fe3bdf4c62bd6b3fb5b9800529789e1947e0c4a7a32de70fd0f73ac2f99c86350a11f0566

data/README.md

@@ -1,6 +1,6 @@
 # Clickhouse::Activerecord
 
-A Ruby database ActiveRecord driver for ClickHouse.
+A Ruby database ActiveRecord driver for ClickHouse. Support Rails >= 5.0.
 
 ## Installation
 
@@ -39,14 +39,6 @@ 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
@@ -62,31 +54,23 @@ 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)
-# 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 *** >]>
+=> #<ActiveRecord::Relation [#<Action *** >]>
 
 Action.create(url: 'http://example.com', date: Date.yesterday)
-# 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'
+=> true
 ```
 
-## Donations
+NOTE: Creating tables in developing.
+
+## Development
 
-Donations to this project are going directly to [PNixx](https://github.com/PNixx), the original author of this project:
+After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-* BTC address: `3Dny9T9PTVYoQhnJxgZorRRNycYYiPrYMA`
-* ETH address: `0x7eec67c120828334d0e802ce46fc4895f2b386c4`
-* XMR address: `42gP71qLB5M43RuDnrQ3vSJFFxis9Kw9VMURhpx9NLQRRwNvaZRjm2TFojAMC8Fk1BQhZNKyWhoyJSn5Ak9kppgZPjE17Zh`
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/clickhouse-activerecord.gemspec

@@ -2,11 +2,10 @@
 
 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       = ClickhouseActiverecord::VERSION
+  spec.version       = '0.2.0'
   spec.authors       = ['Sergey Odintsov']
   spec.email         = ['nixx.dj@gmail.com']
 
@@ -22,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'bundler', '~> 1.13', '>= 1.13.4'
-  spec.add_runtime_dependency 'rails', '>= 4.1.8', '< 5'
+  spec.add_dependency "bundler", ">= 1.13.4"
+  spec.add_dependency 'rails', '>= 5.0'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -1,4 +1,3 @@
-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'
@@ -24,28 +23,9 @@ 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
-      def initialize(name, default, cast_type, sql_type = nil, null = true)
-        super(name, default, cast_type, sql_type, null)
-        @default_function = 'now'
-      end
 
       private
 
@@ -105,7 +85,7 @@ module ActiveRecord
         @connection_parameters = connection_parameters
         @config = config
 
-        @visitor = ClickhouseActiverecord::Arel::Visitors::ToSql.new self
+        @prepared_statements = false
 
         connect
       end
@@ -122,10 +102,6 @@ module ActiveRecord
         case sql_type
           when 'Nullable(String)'
             255
-          when /Nullable\(U?Int(8|16)\)/
-            4
-          when /Nullable\(U?Int(32|64)\)/
-            8
           else
             super
         end
@@ -138,18 +114,18 @@ module ActiveRecord
         register_class_with_limit m, 'Uint8', Type::UnsignedInteger
         register_class_with_limit m, 'Date',  Clickhouse::OID::Date
         register_class_with_limit m, 'DateTime',  Clickhouse::OID::DateTime
-        m.alias_type 'UInt16', 'uint4'
+        m.alias_type 'UInt16', 'uint8'
         m.alias_type 'UInt32', 'uint8'
         m.register_type 'UInt64', Clickhouse::OID::BigInteger.new
-        m.alias_type 'Int8', 'int4'
-        m.alias_type 'Int16', 'int4'
+        m.alias_type 'Int8', 'int8'
+        m.alias_type 'Int16', 'int8'
         m.alias_type 'Int32', 'int8'
         m.alias_type 'Int64', 'UInt64'
       end
 
       # Queries the database and returns the results in an Array-like object
       def query(sql, _name = nil)
-        res = @connection.post("/?#{@config.to_param}", "#{sql} FORMAT JSONCompact")
+        res = @connection.get("/?#{@config.merge(query: "#{sql} FORMAT JSONCompact").to_param}")
         raise ActiveRecord::ActiveRecordError, "Response code: #{res.code}:\n#{res.body}" unless res.code.to_i == 200
         JSON.parse res.body
       end
@@ -160,7 +136,7 @@ module ActiveRecord
         end
       end
 
-      def exec_query(sql, name = nil, _binds = [])
+      def exec_query(sql, name = nil, binds = [], prepare: false)
         result = execute(sql, name)
         ActiveRecord::Result.new(result['meta'].map { |m| m['name'] }, result['data'])
       end
@@ -190,10 +166,10 @@ module ActiveRecord
         query('SHOW TABLES', name)['data'].flatten
       end
 
-      def columns(table_name, _name = nil) #:nodoc:
-        table_structure(table_name).map do |field|
-          ClickhouseColumn.new(field[0], field[3].present? ? field[3] : nil, lookup_cast_type(field[1]), field[1], field[1].include?('Nullable'))
-        end
+      def new_column_from_field(table_name, field) # :nondoc:
+        sql_type = field[1]
+        type_metadata = fetch_type_metadata(sql_type)
+        ClickhouseColumn.new(field[0], field[3].present? ? field[3] : nil, type_metadata, field[1].include?('Nullable'), table_name, nil)
       end
 
       def indexes(_table_name, _name = nil) #:nodoc:
@@ -207,6 +183,10 @@ module ActiveRecord
         false
       end
 
+      def data_sources
+        tables
+      end
+
       protected
 
       def table_structure(table_name)
@@ -214,6 +194,7 @@ module ActiveRecord
         raise(ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'") if data.empty?
         data
       end
+      alias column_definitions table_structure
 
       def last_inserted_id(result)
         result

data/lib/clickhouse-activerecord.rb

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

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

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

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")
-        ClickhouseActiverecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
       end
     end
 

metadata

@@ -1,81 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2017-10-03 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.13.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.1.8
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.8
-    - - "<"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: ActiveRecord adapter for ClickHouse
@@ -85,8 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- CHANGELOG.md
+- .gitignore
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -100,10 +87,7 @@ 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-activerecord/arel/visitors/to_sql.rb
-- lib/clickhouse-activerecord/railtie.rb
-- lib/clickhouse-activerecord/schema_dumper.rb
-- lib/clickhouse-activerecord/version.rb
+- lib/clickhouse/railtie.rb
 - lib/tasks/clickhouse.rake
 homepage: https://github.com/pnixx/clickhouse-activerecord
 licenses:
@@ -115,19 +99,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: ClickHouse ActiveRecord
 test_files: []
-has_rdoc: 

data/CHANGELOG.md

@@ -1,13 +0,0 @@
-### 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/lib/clickhouse-activerecord/arel/visitors/to_sql.rb

@@ -1,20 +0,0 @@
-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 && o.expressions.first != '*' && !o.expressions.first.is_a?(String) && o.expressions.first.relation && o.expressions.first.relation.engine && o.expressions.first.relation.engine.is_view
-            super("#{name.downcase}Merge", o, collector)
-          else
-            super
-          end
-        end
-
-      end
-    end
-  end
-end

data/lib/clickhouse-activerecord/schema_dumper.rb

@@ -1,10 +0,0 @@
-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

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