clickhouse-activerecord 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77b149946e335300ac60c931d1318dd2d3a460127b27f3af8722397177e6153e
-  data.tar.gz: cd77dd40f7b9edf5e052d2f87c918e25d882616b48a69558dfb4f92761009edb
+  metadata.gz: fcb4b8401a210b2fafb35c9947df32c772b83740102b95b982146c573ae76f12
+  data.tar.gz: 41e059ab9a032725874117f4d7f18e6e0c22e568aaec142002b2f9bf5400ddac
 SHA512:
-  metadata.gz: af2eee6764e9c6de36c96cf1d830ddbb6c263f86e3a0e28bb79cb5a7e786c476fd100c8be38cc9226f6c7e6f9f8c4c0d5c73c039411096ddaddd160f72146b5f
-  data.tar.gz: 39c38cf9dbd66f4b7bb27447ebded7a54d999299ab5688bba51fbc6ac8a3ef5a4af29d0f0ec4c44461f300a19d7dde6d3bb5ca890453d42485758cc5740c9389
+  metadata.gz: f6242025f4207c68d8ac1e9a7cb87ede0fcbcbf4f7937b44d9b9e8faff43a121af2cb8c58bbdb2fac0d1959d197efb95e1718968c054ef9e213641fe2da6641a
+  data.tar.gz: 4a007e48f1f7f3866d90cf5080847d0e6af9dba41e525bdd78890419f9edc0f8484dbd3d83d01529185477210d1878527d85506a65a927970c864e9f7d6a60f4

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

@@ -93,6 +93,12 @@ module ActiveRecord
 
           args.each { |name| column(name, kind, **options.except(:limit)) }
         end
+
+        private
+
+        def valid_column_definition_options
+          super + [:array, :low_cardinality, :fixed_string, :value, :type]
+        end
       end
 
       class IndexDefinition

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

@@ -143,7 +143,10 @@ 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}")
+          @connection.post("/?#{request_params.merge(settings).to_param}", formatted_sql, {
+            'User-Agent' => "Clickhouse ActiveRecord #{ClickhouseActiverecord::VERSION}",
+            'Content-Type' => 'application/x-www-form-urlencoded',
+          })
         end
 
         def apply_format(sql, format)

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -293,7 +293,11 @@ module ActiveRecord
         options = apply_replica(table_name, options)
         td = create_table_definition(apply_cluster(table_name), **options)
         block.call td if block_given?
-        td.column(:id, options[:id], null: false) if options[:id].present? && td[:id].blank? && options[:as].blank?
+        # support old migration version: in 5.0 options id: :integer, but 7.1 options empty
+        # todo remove auto add id column in future
+        if (!options.key?(:id) || options[:id].present? && options[:id] != false) && td[:id].blank? && options[:as].blank?
+          td.column(:id, options[:id] || :integer, null: false)
+        end
 
         if options[:force]
           drop_table(table_name, options.merge(if_exists: true))

data/lib/clickhouse-activerecord/schema_dumper.rb

@@ -90,7 +90,9 @@ HEADER
           unless simple
             table_options = @connection.table_options(table)
             if table_options.present?
-              tbl.print ", #{format_options(table_options)}"
+              table_options = format_options(table_options)
+              table_options.gsub!(/Buffer\('[^']+'/, 'Buffer(\'#{connection.database}\'')
+              tbl.print ", #{table_options}"
             end
           end
 
@@ -138,7 +140,7 @@ HEADER
 
     def format_options(options)
       if options && options[:options]
-        options[:options] = options[:options].gsub(/^Replicated(.*?)\('[^']+',\s*'[^']+',?\s?([^\)]*)?\)/, "\\1(\\2)")
+        options[:options].gsub!(/^Replicated(.*?)\('[^']+',\s*'[^']+',?\s?([^\)]*)?\)/, "\\1(\\2)")
       end
       super
     end

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '1.0.8'
+  VERSION = '1.0.10'
 end

data/lib/tasks/clickhouse.rake

@@ -37,6 +37,8 @@ namespace :clickhouse do
   end
 
   namespace :structure do
+    config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'clickhouse')
+
     desc 'Load database structure'
     task load: ['db:check_protected_environments'] do
       ClickhouseActiverecord::Tasks.new(config).structure_load(Rails.root.join('db/clickhouse_structure.sql'))
@@ -85,8 +87,4 @@ namespace :clickhouse do
       Rake::Task['clickhouse:schema:dump'].execute(simple: true)
     end
   end
-
-  def config
-    ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'clickhouse')
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler