clickhouse-activerecord 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b40a04fe93423fd3469b65a66429ecb41e4c5c25440777c69617e69081e578b4
-  data.tar.gz: 43586cb853dec4d3453a6b6938158e5f1197504678c2e1aa824b8521a6a1c628
+  metadata.gz: a8710787ab541533a020ea884090c897bd47a7bfefb0cd93bf552e6776ae2583
+  data.tar.gz: 104eb3ec2a235899004ecc1c0ff01432da4b1fccfdfa5144e041351aaedc9dfd
 SHA512:
-  metadata.gz: 38073e81994dd027caf7fab5463a715eac7f15ec8373c1415d0064611118b0f2b0c391cae0db9b7670ebb8a3141c023879b3d1425c7059f4c00450579bcff64c
-  data.tar.gz: 0ce78412004ae3590bc97877141e66f74f9de1ad0aab2cdc1af5a3369157c01e0e29fe10b4921c96487cad66fa16e50163f9c34941381357f1960cc3c7f20fbc
+  metadata.gz: 8346c11c2f912c78f82129f66f0fcc09e4c6689fe64a3d31cbb951c4046ae7102e7e33cd05258eb8b8136c4aa41a0f0297562b2228b8540480a8a6d6d4554edf
+  data.tar.gz: bae4f5c8a7b2ceb3eb9341f0b64cd1c57694791db3aecbdb3b92b4ed98ac4b76246ca0941e19f1f66ca28c96b51b82dbbde98d7552e7c856978de7abf3667db6

data/.docker/docker-compose.cluster.yml

@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   clickhouse1:
     image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-23.11-alpine}'

data/.docker/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   clickhouse:
     image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-23.11-alpine}'

data/.github/workflows/testing.yml

@@ -28,13 +28,15 @@ jobs:
             rails: 7.1.3
           - ruby: 3.2
             rails: 7.2.1
-        clickhouse: [ '22.1', '24.6' ]
+          - ruby: 3.2
+            rails: 8.0.1
+        clickhouse: [ '22.1', '24.9' ]
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Start ClickHouse ${{ matrix.clickhouse }}
-        uses: isbang/compose-action@v1.5.1
+        uses: hoverkraft-tech/compose-action@v2.1.0
         env:
           CLICKHOUSE_VERSION: ${{ matrix.clickhouse }}
         with:
@@ -72,14 +74,16 @@ jobs:
           - ruby: 3.2
             rails: 7.1.3
           - ruby: 3.2
-            rails: 7.2.0
-        clickhouse: [ '22.1', '24.6' ]
+            rails: 7.2.1
+          - ruby: 3.2
+            rails: 8.0.1
+        clickhouse: [ '22.1', '24.9' ]
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Start ClickHouse Cluster ${{ matrix.clickhouse }}
-        uses: isbang/compose-action@v1.5.1
+        uses: hoverkraft-tech/compose-action@v2.1.0
         env:
           CLICKHOUSE_VERSION: ${{ matrix.clickhouse }}
         with:

data/README.md

@@ -184,7 +184,11 @@ Action.settings(optimize_read_in_order: 1).where(date: Date.current).limit(10)
 
 User.joins(:actions).using(:group_id)
 # Clickhouse User Load (10.3ms)  SELECT users.* FROM users INNER JOIN actions USING group_id
-#=> #<ActiveRecord::Relation [#<Action *** >]>
+#=> #<ActiveRecord::Relation [#<User *** >]>
+
+User.window('x', order: 'date', partition: 'name', rows: 'UNBOUNDED PRECEDING').select('sum(value) OVER x')
+# SELECT sum(value) OVER x FROM users WINDOW x AS (PARTITION BY name ORDER BY date ROWS UNBOUNDED PRECEDING)
+#=> #<ActiveRecord::Relation [#<User *** >]>
 ```
 
 

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', '~> 7.1'
+  spec.add_runtime_dependency 'activerecord', '>= 7.1', '< 9.0'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.4'

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

@@ -178,10 +178,12 @@ module ActiveRecord
         def request(sql, format = nil, settings = {})
           formatted_sql = apply_format(sql, format)
           request_params = @connection_config || {}
-          @connection.post("/?#{request_params.merge(settings).to_param}", formatted_sql, {
-            'User-Agent' => "Clickhouse ActiveRecord #{ClickhouseActiverecord::VERSION}",
-            'Content-Type' => 'application/x-www-form-urlencoded',
-          })
+          @lock.synchronize do
+            @connection.post("/?#{request_params.merge(settings).to_param}", formatted_sql, {
+              'User-Agent' => "Clickhouse ActiveRecord #{ClickhouseActiverecord::VERSION}",
+              'Content-Type' => 'application/x-www-form-urlencoded',
+            })
+          end
         end
 
         def apply_format(sql, format)

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -300,9 +300,11 @@ module ActiveRecord
       end
 
       # @param [String] table
+      # @option [Boolean] single_line
       # @return [String]
-      def show_create_table(table)
-        do_system_execute("SHOW CREATE TABLE `#{table}`")['data'].try(:first).try(:first).gsub(/[\n\s]+/m, ' ').gsub("#{@config[:database]}.", "")
+      def show_create_table(table, single_line: true)
+        sql = do_system_execute("SHOW CREATE TABLE `#{table}`")['data'].try(:first).try(:first).gsub("#{@config[:database]}.", '')
+        single_line ? sql.squish : sql
       end
 
       # Create a new ClickHouse database.

data/lib/arel/visitors/clickhouse.rb

@@ -4,6 +4,11 @@ module Arel
   module Visitors
     class Clickhouse < ::Arel::Visitors::ToSql
 
+      def compile(node, collector = Arel::Collectors::SQLString.new)
+        @delete_or_update = false
+        super
+      end
+
       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&.is_view
@@ -16,12 +21,11 @@ module Arel
       # https://clickhouse.com/docs/en/sql-reference/statements/delete
       # DELETE and UPDATE in ClickHouse working only without table name
       def visit_Arel_Attributes_Attribute(o, collector)
-        if collector.value.is_a?(String)
-          collector << quote_table_name(o.relation.table_alias || o.relation.name) << '.' unless collector.value.start_with?('DELETE FROM ') || collector.value.include?(' UPDATE ')
-          collector << quote_column_name(o.name)
-        else
-          super
+        unless @delete_or_update
+          join_name  = o.relation.table_alias || o.relation.name
+          collector << quote_table_name(join_name) << '.'
         end
+        collector << quote_column_name(o.name)
       end
 
       def visit_Arel_Nodes_SelectOptions(o, collector)
@@ -30,6 +34,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_UpdateStatement(o, collector)
+        @delete_or_update = true
         o = prepare_update_statement(o)
 
         collector << 'ALTER TABLE '
@@ -40,6 +45,11 @@ module Arel
         maybe_visit o.limit, collector
       end
 
+      def visit_Arel_Nodes_DeleteStatement(o, collector)
+        @delete_or_update = true
+        super
+      end
+
       def visit_Arel_Nodes_Final(o, collector)
         visit o.expr, collector
         collector << ' FINAL'
@@ -64,7 +74,7 @@ module Arel
         collector
       end
 
-      def visit_Arel_Nodes_Using o, collector
+      def visit_Arel_Nodes_Using(o, collector)
         collector << "USING "
         visit o.expr, collector
         collector

data/lib/clickhouse-activerecord/tasks.rb

@@ -40,7 +40,7 @@ module ClickhouseActiverecord
       # get all tables
       tables = connection.execute("SHOW TABLES FROM #{@configuration.database} WHERE name NOT LIKE '.inner_id.%'")['data'].flatten.map do |table|
         next if %w[schema_migrations ar_internal_metadata].include?(table)
-        connection.show_create_table(table).gsub("#{@configuration.database}.", '')
+        connection.show_create_table(table, single_line: false).gsub("#{@configuration.database}.", '')
       end.compact
 
       # sort view to last

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '1.2.1'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,22 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: ClickHouse ActiveRecord