clickhouse-activerecord 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d56a19e32a58184c6c70b4cc56f30f4e7f742255a9f63441ce8c9b94ec63eebf
-  data.tar.gz: 2bd423580e61443e1b334e2182e4a05a7e712d79141ae6431730edcdc5dee7e3
+  metadata.gz: a41725d372314184b6799381965f0fb299a42d27b5c714bd04ad768ab0f87a11
+  data.tar.gz: 12e892096d7d76f039f484e58b045c9f680ee95297790f485f8b19d9ecca7412
 SHA512:
-  metadata.gz: 17a5a009eb6ece2d6835f5c37598891bde51fb4cf6c6e7ccb8fdc02cf9b1345d822e39d0f3d825b593606180db020357f4828e89f0c9c4cdf8352349ad6f4104
-  data.tar.gz: edc694713807b818d8f2e9c0b6a0592e0a3862a6b064d4110d12d82ebc1cb40133f7495e9e665007f91f0da5223d129ed110387f4922bf4de710729f462d4509
+  metadata.gz: 35afbee04dec61f61685ec9edd70a305df94fa2198933c9271f3221258f069be06a684dfd10a0a203798712ab1113f91b4f773d8c1f85f1455e4511b6437d6be
+  data.tar.gz: 0b9adb5b3da648ab1ca1b44352b58fc91d7d09b0c29cbc816e23faa39b060ca3e7a8f35e67eb87e92332cae513592f19378fcf993c098684463ffbcd817d64e2

data/README.md

@@ -124,11 +124,11 @@ If you using multiple databases, for example: PostgreSQL, Clickhouse.
 
 Schema dump to `db/clickhouse_schema.rb` file:
 
-    $ rake clickhouse:schema:dump
+    $ rake db:schema:dump:clickhouse
     
 Schema load from `db/clickhouse_schema.rb` file:
 
-    $ rake clickhouse:schema:load
+    $ rake db:schema:load:clickhouse
 
 For export schema to PostgreSQL, you need use:
 
@@ -238,6 +238,7 @@ Donations to this project are going directly to [PNixx](https://github.com/PNixx
 * BTC address: `1H3rhpf7WEF5JmMZ3PVFMQc7Hm29THgUfN`
 * ETH address: `0x6F094365A70fe7836A633d2eE80A1FA9758234d5`
 * XMR address: `42gP71qLB5M43RuDnrQ3vSJFFxis9Kw9VMURhpx9NLQRRwNvaZRjm2TFojAMC8Fk1BQhZNKyWhoyJSn5Ak9kppgZPjE17Zh`
+* TON address: `UQBt0-s1igIpJoEup0B1yAUkZ56rzbpruuAjNhQ26MVCaNlC`
 
 ## Development
 

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module Clickhouse
+      module OID # :nodoc:
+        class Uuid < Type::Value # :nodoc:
+          ACCEPTABLE_UUID = %r{\A(\{)?([a-fA-F0-9]{4}-?){8}(?(1)\}|)\z}
+
+          alias :serialize :deserialize
+
+          def type
+            :uuid
+          end
+
+          def changed?(old_value, new_value, _)
+            old_value.class != new_value.class ||
+              new_value && old_value.casecmp(new_value) != 0
+          end
+
+          def changed_in_place?(raw_old_value, new_value)
+            raw_old_value.class != new_value.class ||
+              new_value && raw_old_value.casecmp(new_value) != 0
+          end
+
+          private
+
+          def cast_value(value)
+            casted = value.to_s
+            casted if casted.match?(ACCEPTABLE_UUID)
+          end
+        end
+      end
+    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_adapter.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 require 'arel/visitors/clickhouse'
+require 'arel/nodes/final'
 require 'arel/nodes/settings'
 require 'arel/nodes/using'
-require 'clickhouse-activerecord/migration'
 require 'active_record/connection_adapters/clickhouse/oid/array'
 require 'active_record/connection_adapters/clickhouse/oid/date'
 require 'active_record/connection_adapters/clickhouse/oid/date_time'
 require 'active_record/connection_adapters/clickhouse/oid/big_integer'
+require 'active_record/connection_adapters/clickhouse/oid/uuid'
 require 'active_record/connection_adapters/clickhouse/schema_definitions'
 require 'active_record/connection_adapters/clickhouse/schema_creation'
 require 'active_record/connection_adapters/clickhouse/schema_statements'
@@ -63,7 +64,7 @@ module ActiveRecord
 
   module ModelSchema
     module ClassMethods
-      delegate :final, :settings, to: :all
+      delegate :final, :final!, :settings, :settings!, to: :all
 
       def is_view
         @is_view || false
@@ -131,23 +132,10 @@ module ActiveRecord
         connect
       end
 
-      # Support SchemaMigration from v5.2.2 to v6+
-      def schema_migration # :nodoc:
-        ClickhouseActiverecord::SchemaMigration.new(self)
-      end
-
-      def internal_metadata # :nodoc:
-        ClickhouseActiverecord::InternalMetadata.new(self)
-      end
-
       def migrations_paths
         @full_config[:migrations_paths] || 'db/migrate_clickhouse'
       end
 
-      def migration_context # :nodoc:
-        ClickhouseActiverecord::MigrationContext.new(migrations_paths, schema_migration, internal_metadata)
-      end
-
       def arel_visitor # :nodoc:
         Arel::Visitors::Clickhouse.new(self)
       end
@@ -211,6 +199,9 @@ module ActiveRecord
           register_class_with_limit m, %r(UInt64), Type::UnsignedInteger
           #register_class_with_limit m, %r(UInt128), Type::UnsignedInteger #not implemnted in clickhouse
           register_class_with_limit m, %r(UInt256), Type::UnsignedInteger
+
+          m.register_type %r(bool)i, ActiveModel::Type::Boolean.new
+          m.register_type %r{uuid}i, Clickhouse::OID::Uuid.new
           # register_class_with_limit m, %r(Array), Clickhouse::OID::Array
           m.register_type(%r(Array)) do |sql_type|
             Clickhouse::OID::Array.new(sql_type)

data/lib/arel/nodes/final.rb

@@ -0,0 +1,7 @@
+module Arel # :nodoc: all
+  module Nodes
+    class Final < Arel::Nodes::Unary
+      delegate :empty?, to: :expr
+    end
+  end
+end

data/lib/arel/visitors/clickhouse.rb

@@ -13,12 +13,6 @@ module Arel
         end
       end
 
-      def visit_Arel_Table o, collector
-        collector = super
-        collector << ' FINAL' if o.final
-        collector
-      end
-
       def visit_Arel_Nodes_SelectOptions(o, collector)
         maybe_visit o.settings, super
       end
@@ -34,6 +28,12 @@ module Arel
         maybe_visit o.limit, collector
       end
 
+      def visit_Arel_Nodes_Final(o, collector)
+        visit o.expr, collector
+        collector << ' FINAL'
+        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/tasks.rb

@@ -2,7 +2,7 @@
 
 module ClickhouseActiverecord
   class Tasks
-    delegate :connection, :establish_connection, :clear_active_connections!, to: ActiveRecord::Base
+    delegate :connection, :establish_connection, to: ActiveRecord::Base
 
     def initialize(configuration)
       @configuration = configuration.with_indifferent_access
@@ -25,7 +25,7 @@ module ClickhouseActiverecord
     end
 
     def purge
-      clear_active_connections!
+      ActiveRecord::Base.connection_handler.clear_active_connections!(:all)
       drop
       create
     end

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '1.0.1'
+  VERSION = '1.0.3'
 end

data/lib/clickhouse-activerecord.rb

@@ -2,8 +2,11 @@
 
 require 'active_record/connection_adapters/clickhouse_adapter'
 
+require 'core_extensions/active_record/internal_metadata'
 require 'core_extensions/active_record/relation'
+require 'core_extensions/active_record/schema_migration'
 
+require 'core_extensions/arel/nodes/select_core'
 require 'core_extensions/arel/nodes/select_statement'
 require 'core_extensions/arel/select_manager'
 require 'core_extensions/arel/table'
@@ -21,8 +24,11 @@ end
 
 module ClickhouseActiverecord
   def self.load
+    ActiveRecord::InternalMetadata.singleton_class.prepend(CoreExtensions::ActiveRecord::InternalMetadata::ClassMethods)
     ActiveRecord::Relation.prepend(CoreExtensions::ActiveRecord::Relation)
+    ActiveRecord::SchemaMigration.singleton_class.prepend(CoreExtensions::ActiveRecord::SchemaMigration::ClassMethods)
 
+    Arel::Nodes::SelectCore.prepend(CoreExtensions::Arel::Nodes::SelectCore)
     Arel::Nodes::SelectStatement.prepend(CoreExtensions::Arel::Nodes::SelectStatement)
     Arel::SelectManager.prepend(CoreExtensions::Arel::SelectManager)
     Arel::Table.prepend(CoreExtensions::Arel::Table)

data/lib/core_extensions/active_record/internal_metadata.rb

@@ -0,0 +1,46 @@
+module CoreExtensions
+  module ActiveRecord
+    module InternalMetadata
+      module ClassMethods
+
+        def []=(key, value)
+          row = final.find_by(key: key)
+          if row.nil? || row.value != value
+            create!(key: key, value: value)
+          end
+        end
+
+        def [](key)
+          final.where(key: key).pluck(:value).first
+        end
+
+        def create_table
+          return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
+          return if table_exists? || !enabled?
+
+          key_options = connection.internal_string_options_for_primary_key
+          table_options = {
+            id: false,
+            options: connection.adapter_name.downcase == 'clickhouse' ? 'ReplacingMergeTree(created_at) PARTITION BY key ORDER BY key' : '',
+            if_not_exists: true
+          }
+          full_config = connection.instance_variable_get(:@full_config) || {}
+
+          if full_config[:distributed_service_tables]
+            table_options.merge!(with_distributed: table_name, sharding_key: 'cityHash64(created_at)')
+
+            distributed_suffix = "_#{full_config[:distributed_service_tables_suffix] || 'distributed'}"
+          else
+            distributed_suffix = ''
+          end
+
+          connection.create_table(table_name + distributed_suffix.to_s, **table_options) do |t|
+            t.string :key, **key_options
+            t.string :value
+            t.timestamps
+          end
+        end
+      end
+    end
+  end
+end

data/lib/core_extensions/active_record/relation.rb

@@ -38,17 +38,14 @@ module CoreExtensions
       #   # SELECT users.* FROM users FINAL
       #
       # An <tt>ActiveRecord::ActiveRecordError</tt> will be raised if database not ClickHouse.
-      # @param [Boolean] final
-      def final(final = true)
-        spawn.final!(final)
+      def final
+        spawn.final!
       end
 
-      # @param [Boolean] final
-      def final!(final = true)
+      def final!
         assert_mutability!
         check_command('FINAL')
-        @table = @table.dup
-        @table.final = final
+        @values[:final] = true
         self
       end
 
@@ -79,6 +76,7 @@ module CoreExtensions
       def build_arel(aliases = nil)
         arel = super
 
+        arel.final! if @values[:final].present?
         arel.settings(@values[:settings]) if @values[:settings].present?
         arel.using(@values[:using]) if @values[:using].present?
 

data/lib/core_extensions/active_record/schema_migration.rb

@@ -0,0 +1,48 @@
+module CoreExtensions
+  module ActiveRecord
+    module SchemaMigration
+      module ClassMethods
+
+        def create_table
+          return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
+
+          return if table_exists?
+
+          version_options = connection.internal_string_options_for_primary_key
+          table_options = {
+            id: false, options: 'ReplacingMergeTree(ver) ORDER BY (version)', if_not_exists: true
+          }
+          full_config = connection.instance_variable_get(:@full_config) || {}
+
+          if full_config[:distributed_service_tables]
+            table_options.merge!(with_distributed: table_name, sharding_key: 'cityHash64(version)')
+
+            distributed_suffix = "_#{full_config[:distributed_service_tables_suffix] || 'distributed'}"
+          else
+            distributed_suffix = ''
+          end
+
+          connection.create_table(table_name + distributed_suffix.to_s, **table_options) do |t|
+            t.string :version, **version_options
+            t.column :active, 'Int8', null: false, default: '1'
+            t.datetime :ver, null: false, default: -> { 'now()' }
+          end
+        end
+
+        def delete_version(version)
+          return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
+
+          im = Arel::InsertManager.new(arel_table)
+          im.insert(arel_table[primary_key] => version.to_s, arel_table['active'] => 0)
+          connection.insert(im, "#{self.class} Create Rollback Version", primary_key, version)
+        end
+
+        def all_versions
+          return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
+
+          final.where(active: 1).order(:version).pluck(:version)
+        end
+      end
+    end
+  end
+end

data/lib/core_extensions/arel/nodes/select_core.rb

@@ -0,0 +1,19 @@
+module CoreExtensions
+  module Arel # :nodoc: all
+    module Nodes
+      module SelectCore
+        attr_accessor :final
+
+        def source
+          return super unless final
+
+          ::Arel::Nodes::Final.new(super)
+        end
+
+        def eql?(other)
+          super && final == other.final
+        end
+      end
+    end
+  end
+end

data/lib/core_extensions/arel/select_manager.rb

@@ -2,6 +2,11 @@ module CoreExtensions
   module Arel
     module SelectManager
 
+      def final!
+        @ctx.final = true
+        self
+      end
+
       # @param [Hash] values
       def settings(values)
         @ast.settings = ::Arel::Nodes::Settings.new(values)

data/lib/core_extensions/arel/table.rb

@@ -1,8 +1,6 @@
 module CoreExtensions
   module Arel
     module Table
-      attr_accessor :final
-
       def is_view
         type_caster.is_view
       end

data/lib/tasks/clickhouse.rake

@@ -12,14 +12,16 @@ namespace :clickhouse do
   end
 
   namespace :schema do
-    # TODO: not testing
+    # TODO: deprecated
     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
+      ActiveRecord::Base.establish_connection(:clickhouse)
+      ActiveRecord::SchemaMigration.drop_table
       load(Rails.root.join("db/clickhouse_schema#{simple}.rb"))
     end
 
+    # TODO: deprecated
     desc 'Dump database schema'
     task dump: :environment do |_, args|
       simple = ENV['simple'] || args[:simple] || ARGV.any? { |a| a.include?('--simple') } ? '_simple' : nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,21 +103,25 @@ files:
 - lib/active_record/connection_adapters/clickhouse/oid/big_integer.rb
 - lib/active_record/connection_adapters/clickhouse/oid/date.rb
 - lib/active_record/connection_adapters/clickhouse/oid/date_time.rb
+- lib/active_record/connection_adapters/clickhouse/oid/uuid.rb
 - lib/active_record/connection_adapters/clickhouse/schema_creation.rb
 - lib/active_record/connection_adapters/clickhouse/schema_definitions.rb
 - lib/active_record/connection_adapters/clickhouse/schema_statements.rb
 - lib/active_record/connection_adapters/clickhouse_adapter.rb
+- lib/arel/nodes/final.rb
 - lib/arel/nodes/settings.rb
 - lib/arel/nodes/using.rb
 - lib/arel/visitors/clickhouse.rb
 - lib/clickhouse-activerecord.rb
-- lib/clickhouse-activerecord/migration.rb
 - lib/clickhouse-activerecord/railtie.rb
 - lib/clickhouse-activerecord/schema.rb
 - lib/clickhouse-activerecord/schema_dumper.rb
 - lib/clickhouse-activerecord/tasks.rb
 - lib/clickhouse-activerecord/version.rb
+- lib/core_extensions/active_record/internal_metadata.rb
 - lib/core_extensions/active_record/relation.rb
+- lib/core_extensions/active_record/schema_migration.rb
+- lib/core_extensions/arel/nodes/select_core.rb
 - lib/core_extensions/arel/nodes/select_statement.rb
 - lib/core_extensions/arel/select_manager.rb
 - lib/core_extensions/arel/table.rb

data/lib/clickhouse-activerecord/migration.rb

@@ -1,103 +0,0 @@
-require 'active_record/migration'
-
-module ClickhouseActiverecord
-
-  class SchemaMigration < ::ActiveRecord::SchemaMigration
-    def create_table
-      return if table_exists?
-
-      version_options = connection.internal_string_options_for_primary_key
-      table_options = {
-        id: false, options: 'ReplacingMergeTree(ver) ORDER BY (version)', if_not_exists: true
-      }
-      full_config = connection.instance_variable_get(:@full_config) || {}
-
-      if full_config[:distributed_service_tables]
-        table_options.merge!(with_distributed: table_name, sharding_key: 'cityHash64(version)')
-
-        distributed_suffix = "_#{full_config[:distributed_service_tables_suffix] || 'distributed'}"
-      end
-
-      connection.create_table(table_name + distributed_suffix.to_s, **table_options) do |t|
-        t.string :version, **version_options
-        t.column :active, 'Int8', null: false, default: '1'
-        t.datetime :ver, null: false, default: -> { 'now()' }
-      end
-    end
-
-    def versions
-      table = arel_table.dup
-      table.final = true
-      sm = Arel::SelectManager.new(table)
-      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
-
-    def delete_version(version)
-      im = Arel::InsertManager.new(arel_table)
-      im.insert(arel_table[primary_key] => version.to_s, arel_table['active'] => 0)
-      connection.insert(im, "#{self.class} Create Rollback Version", primary_key, version)
-    end
-  end
-
-  class InternalMetadata < ::ActiveRecord::InternalMetadata
-
-    def create_table
-      return if table_exists? || !enabled?
-
-      key_options = connection.internal_string_options_for_primary_key
-      table_options = {
-        id: false,
-        options: connection.adapter_name.downcase == 'clickhouse' ? 'ReplacingMergeTree(created_at) PARTITION BY key ORDER BY key' : '',
-        if_not_exists: true
-      }
-      full_config = connection.instance_variable_get(:@full_config) || {}
-
-      if full_config[:distributed_service_tables]
-        table_options.merge!(with_distributed: table_name, sharding_key: 'cityHash64(created_at)')
-
-        distributed_suffix = "_#{full_config[:distributed_service_tables_suffix] || 'distributed'}"
-      end
-
-      connection.create_table(table_name + distributed_suffix.to_s, **table_options) do |t|
-        t.string :key, **key_options
-        t.string :value
-        t.timestamps
-      end
-    end
-
-    private
-
-    def update_entry(key, new_value)
-      create_entry(key, new_value)
-    end
-
-    def select_entry(key)
-      table = arel_table.dup
-      table.final = true
-      sm = Arel::SelectManager.new(table)
-      sm.project(Arel::Nodes::SqlLiteral.new("*"))
-      sm.where(table[primary_key].eq(Arel::Nodes::BindParam.new(key)))
-      sm.order(table[primary_key].asc)
-      sm.limit = 1
-
-      connection.select_all(sm, "#{self.class} Load").first
-    end
-  end
-
-  class MigrationContext < ::ActiveRecord::MigrationContext #:nodoc:
-
-    def get_all_versions
-      if schema_migration.table_exists?
-        schema_migration.versions.map(&:to_i)
-      else
-        []
-      end
-    end
-
-  end
-
-end