clickhouse-activerecord 0.5.13 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0d11fee214ec195a5ccb8569e2f0302c7273a74bacc012069837a7f5fd5bec6
-  data.tar.gz: 32d98a8051a6246d567d5ef9278b4a6795b385d4290203c6d6742c961a6490d3
+  metadata.gz: 6534694860bbb41c21789239e0589406bcbef64bc1750645c68485e77acb7310
+  data.tar.gz: c6640ccc74004a93bfaa18d93dd1c135411d66f27273eb65848f9843f64fd6d0
 SHA512:
-  metadata.gz: 0bfb1e29754b50d7c33033dd0be37d1a4205dbb9ff12671fc27f217572d493f2a01c3a28c98e0bfaa968564ca8f714c5abefecf6d14638fa4f767aa00ea13fdf
-  data.tar.gz: eebb37d468dbf8695b50b60ee47e3641517778ee06dc82df767e126bc8f7cd94e9de8c690622777c849ba0ce8adec65d9ff55d30ea0a0b25981f6e41afcbe1dd
+  metadata.gz: f848ad57f80f061aa85a593a90bff65707e8dbe281caf3f4a41914d93a4723351bf7e5ca12bfdc7c8ed2cbed5df3db39472b8d015645875476b68941d7de6111
+  data.tar.gz: 1592560741198e983d43599ff78b145262e0638951a2825dcaac993e0dcc0195bf85980b5eeff80d973e0573aeaa865d6d6c8acdd7ee2b2b1ba6bb6740e734cf

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

@@ -9,9 +9,8 @@ module ActiveRecord
           def serialize(value)
             value = super
             return unless value
-            return value.strftime('%Y-%m-%d %H:%M:%S') unless value.acts_like?(:time)
 
-            value.to_time.strftime('%Y-%m-%d %H:%M:%S')
+            value.strftime('%Y-%m-%d %H:%M:%S' + (@precision.present? && @precision > 0 ? ".%#{@precision}N" : ''))
           end
 
           def type_cast_from_database(value)

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -48,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
@@ -74,7 +61,7 @@ module ActiveRecord
   end
 
   module ModelSchema
-     module ClassMethods
+    module ClassMethods
       def is_view
         @is_view || false
       end
@@ -204,7 +191,7 @@ module ActiveRecord
         super
         register_class_with_limit m, %r(String), Type::String
         register_class_with_limit m, 'Date',  Clickhouse::OID::Date
-        register_class_with_limit m, 'DateTime',  Clickhouse::OID::DateTime
+        register_class_with_precision m, %r(datetime)i,  Clickhouse::OID::DateTime
 
         register_class_with_limit m, %r(Int8), Type::Integer
         register_class_with_limit m, %r(Int16), Type::Integer
@@ -352,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.13'
+  VERSION = '0.5.15'
 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.13
+  version: 0.5.15
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 2023-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,6 +130,7 @@ 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