clickhouse-activerecord 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 182d838abbda9972bdfa59b1e6a76af247bd4e3b275a5e611dfe6cd8ceaaea5c
-  data.tar.gz: f987ee429692c24518a0ea54d24f52c65f96ddfe1e6d6770fe0c2dd4549c623e
+  metadata.gz: 74728f97bde396aae27436dd6b7ec8d57ec172e818122f9094d994583c92781f
+  data.tar.gz: 64e08f74a95d755338b489b32f2aade49685b6b604a3d02d2f232ca9f24b7b23
 SHA512:
-  metadata.gz: 90aac52260cd39eaa23dddb9be9290afa8ccb6731f4c84b6403d67fc56ddf1e24d075e9e33d9cc99ffdf29309608b0a8ae78a35db87d673731438dd5db50c57b
-  data.tar.gz: 505c299c7f657deb7b0685504c0f61754b801d0900238fa9a00a939b49873e379e2d2c84f9ce3661e0c26d405b9e94a31cbeb71c514f644cf4391059df44fa22
+  metadata.gz: 959c753aaf61bcef02dd336953d1bd88bc0d2d3762bc5f96e3816699685c809da2f4ad7646201570892a12fad32760a80d69ff6292b172fb6e9c518c13dc622d
+  data.tar.gz: e7ee279cf5dc1b8168448f8c657550e2cb418121da1ef58c1d53989f8a7cc678527fcb7678cc0ba903d9e5d9e108450c9da28d03ba0e6d9364738d1c2f60e414

data/README.md

@@ -183,6 +183,10 @@ Action.where(date: Date.current).final.limit(10)
 Action.settings(optimize_read_in_order: 1).where(date: Date.current).limit(10)
 # Clickhouse Action Load (10.3ms)  SELECT actions.* FROM actions FINAL WHERE actions.date = '2017-11-29' LIMIT 10 SETTINGS optimize_read_in_order = 1
 #=> #<ActiveRecord::Relation [#<Action *** >]>
+
+User.joins(:actions).using(:group_id)
+# Clickhouse User Load (10.3ms)  SELECT users.* FROM users INNER JOIN actions USING group_id
+#=> #<ActiveRecord::Relation [#<Action *** >]>
 ```
 
 

data/clickhouse-activerecord.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'bundler', '>= 1.13.4'
-  spec.add_runtime_dependency 'activerecord', '>= 5.2'
+  spec.add_runtime_dependency 'activerecord', '>= 5.2', '< 7'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.4'

data/lib/active_record/connection_adapters/clickhouse/schema_creation.rb

@@ -125,7 +125,7 @@ module ActiveRecord
         end
 
         def current_database
-          if ActiveRecord::version >= Gem::Version.new('6')
+          if ActiveRecord::version >= Gem::Version.new('6.1')
             ActiveRecord::Base.connection_db_config.database
           else
             ActiveRecord::Base.connection_config[:database]

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -2,6 +2,7 @@
 
 require 'arel/visitors/clickhouse'
 require 'arel/nodes/settings'
+require 'arel/nodes/using'
 require 'clickhouse-activerecord/migration'
 require 'active_record/connection_adapters/clickhouse/oid/array'
 require 'active_record/connection_adapters/clickhouse/oid/date'

data/lib/arel/nodes/using.rb

@@ -0,0 +1,6 @@
+module Arel # :nodoc: all
+  module Nodes
+    class Using < Arel::Nodes::Unary
+    end
+  end
+end

data/lib/arel/visitors/clickhouse.rb

@@ -36,6 +36,12 @@ module Arel
         collector
       end
 
+      def visit_Arel_Nodes_Using o, collector
+        collector << "USING "
+        visit o.expr, collector
+        collector
+      end
+
       def sanitize_as_setting_value(value)
         if value == :default
           'DEFAULT'

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/lib/core_extensions/arel/select_manager.rb

@@ -7,6 +7,11 @@ module CoreExtensions
         @ast.settings = ::Arel::Nodes::Settings.new(values)
         self
       end
+
+      def using(*exprs)
+        @ctx.source.right.last.right = ::Arel::Nodes::Using.new(::Arel.sql(exprs.join(',')))
+        self
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +114,7 @@ files:
 - lib/active_record/connection_adapters/clickhouse/schema_statements.rb
 - lib/active_record/connection_adapters/clickhouse_adapter.rb
 - lib/arel/nodes/settings.rb
+- lib/arel/nodes/using.rb
 - lib/arel/visitors/clickhouse.rb
 - lib/clickhouse-activerecord.rb
 - lib/clickhouse-activerecord/migration.rb