clickhouse-activerecord 0.5.11 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4828cf36787dd2532b1522cdafc1f221b6088fca1bc394d0b86703355676ebc
-  data.tar.gz: 8d0cf197f79787754461990e8f06599497b4ae9e6eea6419bf30bf83986ad9ac
+  metadata.gz: d0d11fee214ec195a5ccb8569e2f0302c7273a74bacc012069837a7f5fd5bec6
+  data.tar.gz: 32d98a8051a6246d567d5ef9278b4a6795b385d4290203c6d6742c961a6490d3
 SHA512:
-  metadata.gz: 217a21b7456784206a97bd75ed20f337c247973f0d839dec05ef84a60059be43f71b3f7a7a87834be92991262a9272927955cbd0c767adf1d3452496cf511602
-  data.tar.gz: 593dd36a333c07fa7c81a9b011577381cc38a2bad2975a39b9f80c57bc56fab9662501ea25d4e510c06028e62fa46d517942b63e5de902acbabfecb36a6b6bb5
+  metadata.gz: 0bfb1e29754b50d7c33033dd0be37d1a4205dbb9ff12671fc27f217572d493f2a01c3a28c98e0bfaa968564ca8f714c5abefecf6d14638fa4f767aa00ea13fdf
+  data.tar.gz: eebb37d468dbf8695b50b60ee47e3641517778ee06dc82df767e126bc8f7cd94e9de8c690622777c849ba0ce8adec65d9ff55d30ea0a0b25981f6e41afcbe1dd

data/lib/active_record/connection_adapters/clickhouse/oid/array.rb

@@ -23,6 +23,42 @@ module ActiveRecord
             @subtype
           end
 
+          def deserialize(value)
+            if value.is_a?(::Array)
+              value.map { |item| deserialize(item) }
+            else
+              return value if value.nil?
+              case @subtype
+                when :integer
+                  value.to_i
+                when :datetime
+                  ::DateTime.parse(value)
+                when :date
+                  ::Date.parse(value)
+              else
+                super
+              end
+            end
+          end
+
+          def serialize(value)
+            if value.is_a?(::Array)
+              value.map { |item| serialize(item) }
+            else
+              return value if value.nil?
+              case @subtype
+                when :integer
+                  value.to_i
+                when :datetime
+                  DateTime.new.serialize(value)
+                when :date
+                  Date.new.serialize(value)
+              else
+                super
+              end
+            end
+          end
+
         end
       end
     end

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

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

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

@@ -6,8 +6,8 @@ module ActiveRecord
   module ConnectionAdapters
     module Clickhouse
       module SchemaStatements
-        def execute(sql, name = nil)
-          do_execute(sql, name)
+        def execute(sql, name = nil, settings: {})
+          do_execute(sql, name, settings: settings)
         end
 
         def exec_insert(sql, name, _binds, _pk = nil, _sequence_name = nil)

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -11,6 +11,7 @@ require 'active_record/connection_adapters/clickhouse/schema_definitions'
 require 'active_record/connection_adapters/clickhouse/schema_creation'
 require 'active_record/connection_adapters/clickhouse/schema_statements'
 require 'net/http'
+require 'openssl'
 
 module ActiveRecord
   class Base
@@ -224,6 +225,15 @@ module ActiveRecord
         end
       end
 
+      def _quote(value)
+        case value
+        when Array
+          '[' + value.map { |v| _quote(v) }.join(', ') + ']'
+        else
+          super
+        end
+      end
+
       # Quoting time without microseconds
       def quoted_date(value)
         if value.acts_like?(:time)
@@ -301,6 +311,7 @@ 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?
 
         if options[:force]
           drop_table(table_name, options.merge(if_exists: true))

data/lib/clickhouse-activerecord/migration.rb

@@ -10,7 +10,7 @@ module ClickhouseActiverecord
 
         version_options = connection.internal_string_options_for_primary_key
         table_options = {
-          id: false, options: 'ReplacingMergeTree(ver) PARTITION BY version ORDER BY (version)', if_not_exists: true
+          id: false, options: 'ReplacingMergeTree(ver) ORDER BY (version)', if_not_exists: true
         }
         full_config = connection.instance_variable_get(:@full_config) || {}
 

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '0.5.11'
+  VERSION = '0.5.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.13
 platform: ruby
 authors:
 - Sergey Odintsov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ homepage: https://github.com/pnixx/clickhouse-activerecord
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.4
+signing_key:
 specification_version: 4
 summary: ClickHouse ActiveRecord
 test_files: []