clickhouse-activerecord 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 823fdbf17f27c65446c01b1599a3c61d9fa9b310d7ce153e9c64a912719e552e
-  data.tar.gz: 5b6dd44cdc44b2d1350e0f1c5937cf08051a5ff7a4f73cf56a5dc7567b4be800
+  metadata.gz: e5a31d2ddff53bb618e1624e325c0be76f2f602655565a74a96106674f3a375e
+  data.tar.gz: 762b41c929d36e7ff0f0ceff557da5b85d0b231e8df3e6c6bd41b6085eb940b0
 SHA512:
-  metadata.gz: 5a8d48c078f5bf79a50fddf9b29ade13694019e8666c8c071e5b1ee7ab5b16c7e92116b794a82ce3fa6f927f0bd1186e7e87a65ed5f4eda0f1e6ed113f590de4
-  data.tar.gz: 2be66ae7ac2cb71b20486685f00552890559f2944777d8557aabb60d2318baa868c3c4bc0cf4be82a97eeee920de0049851771253129022e8fbbb0758190f917
+  metadata.gz: a6f8143c312efbc6f276b0fdc2b9e5ea8ab811f06a865d54ff82dcaa0614c30b26c44f65f60098f0895dcf935aa97c86e8b168e7e1bc5b7e54899662b71ad86a
+  data.tar.gz: d9f4ba22a3f13bd157a225870e4d5eb025ca6a35ac21dc73731c19a8bb0d7464e479479109007d117d29f1aa788bb2f3cd5ae0350f1fa13596c36da3ed99a766

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

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

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

@@ -68,10 +68,9 @@ module ActiveRecord
 
           if options[:precision]
             kind = :datetime64
-            options[:value] = options[:precision]
           end
 
-          args.each { |name| column(name, kind, **options.except(:precision)) }
+          args.each { |name| column(name, kind, **options) }
         end
 
         def uuid(*args, **options)

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

@@ -30,12 +30,16 @@ module ActiveRecord
           true
         end
 
+        # @link https://clickhouse.com/docs/en/sql-reference/statements/alter/update
         def exec_update(_sql, _name = nil, _binds = [])
-          raise ActiveRecord::ActiveRecordError, 'Clickhouse update is not supported'
+          do_execute(_sql, _name, format: nil)
+          true
         end
 
+        # @link https://clickhouse.com/docs/en/sql-reference/statements/delete
         def exec_delete(_sql, _name = nil, _binds = [])
-          raise ActiveRecord::ActiveRecordError, 'Clickhouse delete is not supported'
+          do_execute(_sql, _name, format: nil)
+          true
         end
 
         def tables(name = nil)
@@ -143,11 +147,7 @@ module ActiveRecord
           default = field[3]
           default_value = extract_value_from_default(default)
           default_function = extract_default_function(default_value, default)
-          if ActiveRecord::version >= Gem::Version.new('6')
-            ClickhouseColumn.new(field[0], default_value, type_metadata, field[1].include?('Nullable'), default_function)
-          else
-            ClickhouseColumn.new(field[0], default_value, type_metadata, field[1].include?('Nullable'), table_name, default_function)
-          end
+          ClickhouseColumn.new(field[0], default_value, type_metadata, field[1].include?('Nullable'), default_function)
         end
 
         protected

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -127,9 +127,6 @@ module ActiveRecord
         @full_config = full_config
 
         @prepared_statements = false
-        if ActiveRecord::version == Gem::Version.new('6.0.0')
-          @prepared_statement_status = Concurrent::ThreadLocalVar.new(false)
-        end
 
         connect
       end
@@ -238,30 +235,18 @@ module ActiveRecord
       # Quoting time without microseconds
       def quoted_date(value)
         if value.acts_like?(:time)
-          if ActiveRecord::version >= Gem::Version.new('7')
-            zone_conversion_method = ActiveRecord.default_timezone == :utc ? :getutc : :getlocal
-          else
-            zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
-          end
+          zone_conversion_method = ActiveRecord.default_timezone == :utc ? :getutc : :getlocal
 
           if value.respond_to?(zone_conversion_method)
             value = value.send(zone_conversion_method)
           end
         end
 
-        if ActiveRecord::version >= Gem::Version.new('7')
-          value.to_fs(:db)
-        else
-          value.to_s(:db)
-        end
+        value.to_fs(:db)
       end
 
       def column_name_for_operation(operation, node) # :nodoc:
-        if ActiveRecord::version >= Gem::Version.new('6')
-          visitor.compile(node)
-        else
-          column_name_from_arel_node(node)
-        end
+        visitor.compile(node)
       end
 
       # Executes insert +sql+ statement in the context of this connection using

data/lib/arel/visitors/clickhouse.rb

@@ -23,6 +23,17 @@ module Arel
         maybe_visit o.settings, super
       end
 
+      def visit_Arel_Nodes_UpdateStatement(o, collector)
+        o = prepare_update_statement(o)
+
+        collector << 'ALTER TABLE '
+        collector = visit o.relation, collector
+        collect_nodes_for o.values, collector, ' UPDATE '
+        collect_nodes_for o.wheres, collector, ' WHERE ', ' AND '
+        collect_nodes_for o.orders, collector, ' ORDER BY '
+        maybe_visit o.limit, collector
+      end
+
       def visit_Arel_Nodes_Settings(o, collector)
         return collector if o.expr.empty?
 

data/lib/clickhouse-activerecord/schema.rb

@@ -1,19 +1,7 @@
 # frozen_string_literal: true
 
 module ClickhouseActiverecord
-
   class Schema < ::ActiveRecord::Schema
 
-    def define(info, &block) # :nodoc:
-      instance_eval(&block)
-
-      if info[:version].present?
-        connection.schema_migration.create_table
-        connection.assume_migrated_upto_version(info[:version], ClickhouseActiverecord::Migrator.migrations_paths)
-      end
-
-      ClickhouseActiverecord::InternalMetadata.create_table
-      ClickhouseActiverecord::InternalMetadata[:environment] = connection.migration_context.current_environment
-    end
   end
 end

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

data/lib/tasks/clickhouse.rake

@@ -14,9 +14,10 @@ namespace :clickhouse do
   namespace :schema do
     # TODO: not testing
     desc 'Load database schema'
-    task load: %i[load_config prepare_internal_metadata_table] do
+    task load: %i[prepare_internal_metadata_table] do
       simple = ENV['simple'] || ARGV.any? { |a| a.include?('--simple') } ? '_simple' : nil
-      ClickhouseActiverecord::SchemaMigration.drop_table
+      config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'clickhouse')
+      ClickhouseActiverecord::SchemaMigration.new(ActiveRecord::Base.establish_connection(config).connection).drop_table
       load(Rails.root.join("db/clickhouse_schema#{simple}.rb"))
     end
 
@@ -72,7 +73,7 @@ namespace :clickhouse do
   desc 'Migrate the clickhouse database'
   task migrate: %i[prepare_schema_migration_table prepare_internal_metadata_table] do
     Rake::Task['db:migrate:clickhouse'].execute
-    if File.exists? "#{Rails.root}/db/clickhouse_schema_simple.rb"
+    if File.exist? "#{Rails.root}/db/clickhouse_schema_simple.rb"
       Rake::Task['clickhouse:schema:dump'].execute(simple: true)
     end
   end
@@ -80,7 +81,7 @@ namespace :clickhouse do
   desc 'Rollback the clickhouse database'
   task rollback: %i[prepare_schema_migration_table prepare_internal_metadata_table] do
     Rake::Task['db:rollback:clickhouse'].execute
-    if File.exists? "#{Rails.root}/db/clickhouse_schema_simple.rb"
+    if File.exist? "#{Rails.root}/db/clickhouse_schema_simple.rb"
       Rake::Task['clickhouse:schema:dump'].execute(simple: true)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler