clickhouse-activerecord 0.5.12 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 324c3a376214e1c201b3f5dd052c971a1eb7330033960db2eb10a2671f13d187
-  data.tar.gz: 36f71acd4ef651b78d23771f1620b488e0f963576af8ef11890b7c0d83d8c1c2
+  metadata.gz: 4ff54c1e4a5da2543e1a64ad8002822bf82ba5d3b6f7f74f00f1cb0ce23679dd
+  data.tar.gz: 61158e185f4617e88701d2a9b1d261ddf7b4f9c7617454e66a899d55900a34a8
 SHA512:
-  metadata.gz: a1f13b9879af1ca6ef2d6a8dcce1ceb09a4b342659ae4cf7389d47ec41e7b608000f2d1810503996dafa38a3ff84bee901d8d0ec8c413e3086ac99d71c8f5618
-  data.tar.gz: 43ccc8f02a079bf62569bf0977f1ff45306166a61d30feaa817ddd253732a0426728e9926adeb36c31fcae807ff4b26e969de8b2fe8154952cbd8656e29f3f8d
+  metadata.gz: 2d690a0cf443ce6e1b3f90e0443263e27b44be546fd080c11c8aa0278d6f630360371057880e667d4f5f76e31ac9bccf1b71fdfffeda09aa7d4d9a49af786f79
+  data.tar.gz: f0f96caa0371b8206cee957e38b9f24993549eaa2dcc03265d4b398e051a0a9ebe32a7262c949bf4510dda3f843d8e9e2bb2437cc364dd9bf06f5a622e085530

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_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
@@ -47,19 +48,6 @@ module ActiveRecord
     end
   end
 
-  module ClickhouseRelationReverseOrder
-    def reverse_order!
-      return super unless connection.is_a?(ConnectionAdapters::ClickhouseAdapter)
-
-      orders = order_values.uniq.compact_blank
-      return super unless orders.empty? && !primary_key
-
-      self.order_values = %w(date created_at).select {|c| column_names.include?(c) }.map{|c| arel_attribute(c).desc }
-      self
-    end
-  end
-  Relation.prepend(ClickhouseRelationReverseOrder)
-
   module TypeCaster
     class Map
       def is_view
@@ -73,7 +61,7 @@ module ActiveRecord
   end
 
   module ModelSchema
-     module ClassMethods
+    module ClassMethods
       def is_view
         @is_view || false
       end
@@ -224,6 +212,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 +298,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))
@@ -341,8 +339,22 @@ module ActiveRecord
         end
       end
 
+      def add_column(table_name, column_name, type, **options)
+        return if options[:if_not_exists] == true && column_exists?(table_name, column_name, type)
+
+        at = create_alter_table table_name
+        at.add_column(column_name, type, **options)
+        execute(schema_creation.accept(at), nil, settings: {wait_end_of_query: 1, send_progress_in_http_headers: 1})
+      end
+
+      def remove_column(table_name, column_name, type = nil, **options)
+        return if options[:if_exists] == true && !column_exists?(table_name, column_name)
+
+        execute("ALTER TABLE #{quote_table_name(table_name)} #{remove_column_for_alter(table_name, column_name, type, **options)}", nil, settings: {wait_end_of_query: 1, send_progress_in_http_headers: 1})
+      end
+
       def change_column(table_name, column_name, type, options = {})
-        result = do_execute "ALTER TABLE #{quote_table_name(table_name)} #{change_column_for_alter(table_name, column_name, type, options)}"
+        result = do_execute("ALTER TABLE #{quote_table_name(table_name)} #{change_column_for_alter(table_name, column_name, type, options)}", nil, settings: {wait_end_of_query: 1, send_progress_in_http_headers: 1})
         raise "Error parse json response: #{result}" if result.presence && !result.is_a?(Hash)
       end
 

data/lib/clickhouse-activerecord/railtie.rb

@@ -4,6 +4,12 @@ module ClickhouseActiverecord
   require 'rails'
 
   class Railtie < Rails::Railtie
+    initializer "clickhouse.load" do
+      ActiveSupport.on_load :active_record do
+        ClickhouseActiverecord.load
+      end
+    end
+
     rake_tasks { load 'tasks/clickhouse.rake' }
   end
 end

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '0.5.12'
+  VERSION = '0.5.14'
 end

data/lib/clickhouse-activerecord.rb

@@ -2,6 +2,8 @@
 
 require 'active_record/connection_adapters/clickhouse_adapter'
 
+require 'core_extensions/active_record/relation'
+
 require_relative '../core_extensions/active_record/migration/command_recorder'
 ActiveRecord::Migration::CommandRecorder.include CoreExtensions::ActiveRecord::Migration::CommandRecorder
 
@@ -14,5 +16,7 @@ if defined?(Rails::Railtie)
 end
 
 module ClickhouseActiverecord
-
+  def self.load
+    ActiveRecord::Relation.prepend(CoreExtensions::ActiveRecord::Relation)
+  end
 end

data/lib/core_extensions/active_record/relation.rb

@@ -0,0 +1,15 @@
+module CoreExtensions
+  module ActiveRecord
+    module Relation
+      def reverse_order!
+        return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
+
+        orders = order_values.uniq.reject(&:blank?)
+        return super unless orders.empty? && !primary_key
+
+        self.order_values = (column_names & %w[date created_at]).map { |c| arel_table[c].desc }
+        self
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.14
 platform: ruby
 authors:
 - Sergey Odintsov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,13 +130,14 @@ files:
 - lib/clickhouse-activerecord/schema_dumper.rb
 - lib/clickhouse-activerecord/tasks.rb
 - lib/clickhouse-activerecord/version.rb
+- lib/core_extensions/active_record/relation.rb
 - lib/generators/clickhouse_migration_generator.rb
 - lib/tasks/clickhouse.rake
 homepage: https://github.com/pnixx/clickhouse-activerecord
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.0.4
+signing_key:
 specification_version: 4
 summary: ClickHouse ActiveRecord
 test_files: []