clickhouse-activerecord 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb1844d5c04115646e36f7914b9d3e46872f28d87e941354eb01313df6228df9
-  data.tar.gz: b7ec986391a326ac03d910dfbd40820f339c8f6d49ee937a863c5ea0fffc336f
+  metadata.gz: 71882da78e208681ad3f28c05bfad0ca4746f8e6b046a4b8cd14c2fa26a007b6
+  data.tar.gz: b0daa57171963e98a6d0aa4284b7728731009960a07cbdd45a0cc104fcb14213
 SHA512:
-  metadata.gz: 188bfb4db6343255fb738658d44133380e31806257af0fc3a1077f7483033e47dca2d7f460ac8070859624c1cb77ec208a953d441dae83af39199279e1341a6b
-  data.tar.gz: 9cd536b970e75d0a2ecaf2a1651216dcefbab1ff85cbdfacb5437b57ddf54b56ad8866ee905cfbf9f7c105a771ead6e783de6e5819362c36944d23993e519bf2
+  metadata.gz: aea7e2146f23b6183e4583a1b5cc7e4a38131fabff83574415a1e6c8bd607089305265c53ddb54dcbe2c476144d21b4b97795123cd7bfa038ef7a975de7bde9d
+  data.tar.gz: 2228a7f2a7e71005f2d2bb910c721373671bdbb7a6ea15e370ecd923a8fb47fa7cebaa548b50ed7ca9bf8d6d6c2ac27a95cca8c680604ba95934866b6488a8b9

data/README.md

@@ -149,7 +149,15 @@ Structure load from `db/clickhouse_structure.sql` file:
     $ rake db:schema:dump  
     $ rake db:schema:load  
     $ rake db:structure:dump  
-    $ rake db:structure:load  
+    $ rake db:structure:load
+
+### RSpec
+
+For auto truncate tables before each test add to `spec/rails_helper.rb` file:
+
+```
+require 'clickhouse-activerecord/rspec'
+```
     
 ### Insert and select data
 

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -133,6 +133,16 @@ module ActiveRecord
         connect
       end
 
+      # Savepoints are not supported, noop
+      def create_savepoint(name)
+      end
+
+      def exec_rollback_to_savepoint(name)
+      end
+
+      def release_savepoint(name)
+      end
+
       def migrations_paths
         @config[:migrations_paths] || 'db/migrate_clickhouse'
       end
@@ -264,7 +274,7 @@ module ActiveRecord
       # @param [String] table
       # @return [String]
       def show_create_table(table)
-        do_system_execute("SHOW CREATE TABLE `#{table}`")['data'].try(:first).try(:first).gsub(/[\n\s]+/m, ' ')
+        do_system_execute("SHOW CREATE TABLE `#{table}`")['data'].try(:first).try(:first).gsub(/[\n\s]+/m, ' ').gsub("#{@config[:database]}.", "")
       end
 
       # Create a new ClickHouse database.

data/lib/arel/visitors/clickhouse.rb

@@ -16,8 +16,12 @@ 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)
-        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)
+        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
+        end
       end
 
       def visit_Arel_Nodes_SelectOptions(o, collector)

data/lib/clickhouse-activerecord/rspec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  config.before do
+    ActiveRecord::Base.configurations.configurations.select { |x| x.env_name == Rails.env && x.adapter == 'clickhouse' }.each do |config|
+      ActiveRecord::Base.establish_connection(config)
+      ActiveRecord::Base.connection.tables.each do |table|
+        ActiveRecord::Base.connection.execute("TRUNCATE TABLE #{table}")
+      end
+    end
+  end
+end

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '1.0.12'
+  VERSION = '1.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,6 +121,7 @@ files:
 - lib/arel/visitors/clickhouse.rb
 - lib/clickhouse-activerecord.rb
 - lib/clickhouse-activerecord/railtie.rb
+- lib/clickhouse-activerecord/rspec.rb
 - lib/clickhouse-activerecord/schema.rb
 - lib/clickhouse-activerecord/schema_dumper.rb
 - lib/clickhouse-activerecord/tasks.rb