clickhouse-activerecord 1.0.9 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f32d998cd41ae14becbea5f03a9b83b996a6622808c49c124d466771825163d7
-  data.tar.gz: 3f49b195d406ce1a7b5ec2f50bba2e12fc37d2c0f4d312998f3ce2a3173ec88d
+  metadata.gz: 48c4995d403717ca5d9b4d8bdadbedd4bae8d42cf7dad7f37768d12922ebb032
+  data.tar.gz: 01cc522bc62fc1015e66b9239b11bf0e5cf4fa9bc998375e0021130737cacaf3
 SHA512:
-  metadata.gz: 99195548b29bdc67139eff0537099c4ee6384efec7eaa5733cd0edbe6b6998ade9c1fcce775b3f8e576ad63ca9dc62a5626cb6b1d9e8d5fb0410611e264d0121
-  data.tar.gz: f9d9fd7a8d3be305447f5612da41fa4dffdfac2536b7015a3b8404395f143feb28ca08ac132c3bfe0bab9b73302e9a7fd59067754410ab629f20fb5280209aba
+  metadata.gz: 8ee641fb865778a883b93d56a834ab4c842e3f0531a60c3e6a10278a558b9eddc14a101a2dd96688c983090d5dabfb1d3040f78ff09946facc7f7709cbd81dec
+  data.tar.gz: 147bcb2f4c7af96e9d68532de7f0c16f4fda78ac31c63735d12f7f7e04597869d827c7fd58cf72e8adc9750395d12442d6becbcc2d9e534e9819e6eef839f20a

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

@@ -104,7 +104,8 @@ HEADER
               raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" unless @connection.valid_type?(column.type)
               next if column.name == pk
               type, colspec = column_spec(column)
-              tbl.print "    t.#{type} #{column.name.inspect}"
+              name = column.name =~ (/\./) ? "\"`#{column.name}`\"" : column.name.inspect
+              tbl.print "    t.#{type} #{name}"
               tbl.print ", #{format_colspec(colspec)}" if colspec.present?
               tbl.puts
             end

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '1.0.9'
+  VERSION = '1.0.11'
 end

data/lib/core_extensions/active_record/schema_migration.rb

@@ -36,10 +36,16 @@ module CoreExtensions
         connection.insert(im, "#{self.class} Create Rollback Version", primary_key, version)
       end
 
-      def all_versions
+      def versions
         return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
 
-        final.where(active: 1).order(:version).pluck(:version)
+        sm = ::Arel::SelectManager.new(arel_table)
+        sm.final!
+        sm.project(arel_table[primary_key])
+        sm.order(arel_table[primary_key].asc)
+        sm.where([arel_table['active'].eq(1)])
+
+        connection.select_values(sm, "#{self.class} Load")
       end
     end
   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.9
+  version: 1.0.11
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler