active_house 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c1ce9f4613cd0dcd9620da942c301d828f2c29fe
-  data.tar.gz: 813e819830b425a3483d6d859c96d35293576f10
+SHA256:
+  metadata.gz: bb0197094ad900501646a07772ec0116aad46f694ac0aebf3917ec54d97646f5
+  data.tar.gz: a7039266527540b20084854ddb0fbc939fad47486dc2d9239aff2e2899e87c1f
 SHA512:
-  metadata.gz: e0ed42cf6fbb9f1f002fe0f7187e224bc20ad595dede752be19b563566e2afe259e3a4424fc9c8b5421e0af87b0bd1a1478987e3b98fd56ea580c67acfd74520
-  data.tar.gz: 8947212b75c06e47f4e3e0cdf6d602dff157b6885bc4ead3f8e7e4fc7a74e84e2c77e4608ad544d2467fe8f57473924201411f444cc132944439de1b928deaab
+  metadata.gz: 4eb7b21237f15550fdff809ec3aa188d9c3e0f0ef46b105ba949172f77c094974785c44f81f225dbd5d8b70cd05faad3c5ef985ac2ce9d155bbe45fa6328c91d
+  data.tar.gz: e1a4bc99777aca92c9d28998e4d2098e3c754a7c7c7a61ae06f4f0430ec2a07d4e00ce01b9d3136601d5ba8f1974ee5a27512102e18ee45dded44ae364d24faa

data/.github/workflows/tests.yml

@@ -0,0 +1,27 @@
+name: Tests
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7' ]
+        rails: [ '~> 5.0', '~> 6.0' ]
+    name: Tests with Ruby ${{ matrix.ruby }} Activemodel/Activesupport ${{ matrix.rails }}
+    env:
+      RAILS_VERSION: ${{ matrix.rails }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Run tests
+        run: |
+          gem install bundler
+          bundle install
+          bundle exec rake

data/Gemfile

@@ -5,6 +5,12 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in active_house.gemspec
 gemspec
 
+gem 'activemodel', ENV['RAILS_VERSION'], require: false
+gem 'activesupport', ENV['RAILS_VERSION'], require: false
+
 group :test do
+  gem 'minitest', '~> 5.0', require: false
+  gem 'rake', '~> 10.0', require: false
   gem 'rubocop', '0.58.1', require: false
+  gem 'webmock', require: false
 end

data/active_house.gemspec

@@ -27,8 +27,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'clickhouse', '~> 0.1.10'
   spec.add_dependency 'kaminari-core', '~> 1.1'
   spec.add_dependency 'plain_model', '~> 0.2'
-
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
 end

data/lib/active_house/connection.rb

@@ -21,7 +21,7 @@ module ActiveHouse
 
     def select_all(sql, *bindings)
       prepared_sql = prepared_statement(sql, *bindings)
-      connection.query(prepared_sql)
+      connection.post_query(prepared_sql)
     end
 
     def select_values(sql, *bindings)

data/lib/active_house/model.rb

@@ -1,4 +1,5 @@
 require 'active_model/conversion'
+require 'active_support/core_ext/module/delegation'
 require 'active_model/naming'
 require 'plain_model/modeling/base'
 require 'plain_model/modeling/queryable'

data/lib/active_house/modeling/attributes.rb

@@ -97,6 +97,14 @@ module ActiveHouse
           super
         end
       end
+
+      def ==(other)
+        other.class == self.class && other._attributes == _attributes
+      end
+
+      protected
+
+      attr_reader :_attributes
     end
   end
 end

data/lib/active_house/modeling/connection.rb

@@ -15,11 +15,11 @@ module ActiveHouse
 
       class_methods do
         def _connection
-          Thread[name]
+          Thread.current[name]
         end
 
         def _connection=(value)
-          Thread[name] = value
+          Thread.current[name] = value
         end
 
         def ensure_connection

data/lib/active_house/query_builder.rb

@@ -1,5 +1,4 @@
 require 'plain_model/querying/base'
-require 'plain_model/querying/except'
 require 'plain_model/querying/with_model'
 require_relative 'querying/select'
 require_relative 'querying/from'
@@ -12,12 +11,12 @@ require_relative 'querying/union'
 require_relative 'querying/array_join'
 require_relative 'querying/page'
 require_relative 'querying/scope'
+require_relative 'querying/except'
 require_relative 'querying/collect'
 
 module ActiveHouse
   class QueryBuilder
     include PlainModel::Querying::Base
-    include PlainModel::Querying::Except
     include PlainModel::Querying::WithModel
 
     include ActiveHouse::Querying::Select
@@ -31,6 +30,7 @@ module ActiveHouse
     include ActiveHouse::Querying::ArrayJoin
     include ActiveHouse::Querying::Scope
     include ActiveHouse::Querying::Page
+    include ActiveHouse::Querying::Except
     include ActiveHouse::Querying::Collect
 
     # allows using query without model_class

data/lib/active_house/querying/except.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module ActiveHouse
+  module Querying
+    module Except
+      extend ActiveSupport::Concern
+
+      # Chain method
+      # @param keys [Array<Symbol>] values keys that you want to exclude from query
+      # @return new instance with applied changes
+      def except(*keys)
+        dup.except!(*keys)
+      end
+
+      # Chain method
+      # @param keys [Array<Symbol>] values keys that you want to exclude from query
+      # @return new instance with applied changes
+      def except!(*keys)
+        values.merge! initial_values.slice(*keys)
+        self
+      end
+
+    end
+  end
+end

data/lib/active_house/querying/from.rb

@@ -8,8 +8,8 @@ module ActiveHouse
       end
 
       def from_subquery
-        return model_class._table_name if values[:subquery].nil?
-        query = values[:subquery].is_a?(ActiveHouse::QueryBuilder) ? values[:subquery].to_query : values[:subquery].to_s
+        return model_class._table_name if values[:from].nil?
+        query = values[:from].is_a?(ActiveHouse::QueryBuilder) ? values[:from].to_query : values[:from].to_s
         "( #{query} )"
       end
 
@@ -18,7 +18,7 @@ module ActiveHouse
       end
 
       def from!(table_or_subquery)
-        values[:subquery] = table_or_subquery.dup
+        values[:from] = table_or_subquery.dup
         self
       end
 

data/lib/active_house/querying/select.rb

@@ -10,15 +10,15 @@ module ActiveHouse
       end
 
       def build_select_query_part
-        if !values[:fields].empty?
-          "SELECT\n#{values[:fields].join(",\n")}"
+        if !values[:select].empty?
+          "SELECT\n#{values[:select].join(",\n")}"
         else
           'SELECT *'
         end
       end
 
       def initial_values
-        super.merge fields: []
+        super.merge select: []
       end
 
       def select(*fields)
@@ -27,7 +27,7 @@ module ActiveHouse
 
       def select!(*fields)
         formatted_fields = ActiveHouse::PreparedStatement.format_fields(model_class, fields)
-        values[:fields] = (values[:fields] + formatted_fields).uniq
+        values[:select] = (values[:select] + formatted_fields).uniq
         self
       end
     end

data/lib/active_house/version.rb

@@ -1,3 +1,3 @@
 module ActiveHouse
-  VERSION = '0.6.3'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/active_house.rb

@@ -3,6 +3,9 @@ require 'active_house/configuration'
 require 'active_house/model'
 require 'active_house/query_builder'
 
+require 'clickhouse/connection/post_query'
+Clickhouse::Connection.include Clickhouse::Connection::PostQuery
+
 module ActiveHouse
   def self.configure
     yield configuration

data/lib/clickhouse/connection/post_query.rb

@@ -0,0 +1,47 @@
+module Clickhouse
+  class Connection
+    # By default Clickhouse uses GET request for query, but it has limitation for length on server side.
+    # So we will allow to use POST request with query in a body.
+    module PostQuery
+
+      def post_query(query)
+        query = Utils.extract_format(query)[0]
+        query += ' FORMAT JSONCompact'
+        parse_data post(nil, query)
+      end
+
+      def select_rows(options)
+        post_query to_select_query(options)
+      end
+
+      def request(method, query, body = nil)
+        raise ArgumentError, 'when query is omitted body must be passed' if query.nil? && body.nil?
+
+        connect!
+        body = body.strip unless body.nil?
+        query = query.strip unless query.nil?
+
+        start = Time.now
+
+        headers = { 'Content-Type' => 'text/plain' }
+        response = client.send(method, path(query), body, headers)
+        status = response.status
+        duration = Time.now - start
+        if query.nil?
+          query, format = Utils.extract_format(body)
+        else
+          query, format = Utils.extract_format(query)
+        end
+        response = parse_body(format, response.body)
+        stats = parse_stats(response)
+
+        write_log duration, query, stats
+        raise QueryError, "Got status #{status} (expected 200): #{response}" unless status == 200
+        response
+      rescue Faraday::Error => e
+        raise ConnectionError, e.message
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_house
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -80,48 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !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: ORM and Query DSL for ClickHouse
 email:
 - senid231@gmail.com
@@ -129,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -154,6 +113,7 @@ files:
 - lib/active_house/query_builder.rb
 - lib/active_house/querying/array_join.rb
 - lib/active_house/querying/collect.rb
+- lib/active_house/querying/except.rb
 - lib/active_house/querying/from.rb
 - lib/active_house/querying/group_by.rb
 - lib/active_house/querying/having.rb
@@ -165,6 +125,7 @@ files:
 - lib/active_house/querying/union.rb
 - lib/active_house/querying/where.rb
 - lib/active_house/version.rb
+- lib/clickhouse/connection/post_query.rb
 homepage: https://github.com/senid231/active_house
 licenses:
 - MIT
@@ -184,8 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: ORM and Query DSL for ClickHouse