clickhouse-activerecord 1.0.4 → 1.0.6

data/lib/core_extensions/active_record/schema_migration.rb

@@ -1,47 +1,45 @@
 module CoreExtensions
   module ActiveRecord
     module SchemaMigration
-      module ClassMethods
 
-        def create_table
-          return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
+      def create_table
+        return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
 
-          return if table_exists?
+        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(:@config) || {}
+        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(:@config) || {}
 
-          if full_config[:distributed_service_tables]
-            table_options.merge!(with_distributed: table_name, sharding_key: 'cityHash64(version)')
+        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
+          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
+        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)
+      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
+        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)
+      def all_versions
+        return super unless connection.is_a?(::ActiveRecord::ConnectionAdapters::ClickhouseAdapter)
 
-          final.where(active: 1).order(:version).pluck(:version)
-        end
+        final.where(active: 1).order(:version).pluck(:version)
       end
     end
   end

data/lib/tasks/clickhouse.rake

@@ -15,15 +15,18 @@ namespace :clickhouse do
     # TODO: deprecated
     desc 'Load database schema'
     task load: %i[prepare_internal_metadata_table] do
+      puts 'Warning: `rake clickhouse:schema:load` is deprecated! Use `rake db:schema:load:clickhouse` instead'
       simple = ENV['simple'] || ARGV.any? { |a| a.include?('--simple') } ? '_simple' : nil
       ActiveRecord::Base.establish_connection(:clickhouse)
-      ActiveRecord::SchemaMigration.drop_table
+      connection = ActiveRecord::Tasks::DatabaseTasks.migration_connection
+      connection.schema_migration.drop_table
       load(Rails.root.join("db/clickhouse_schema#{simple}.rb"))
     end
 
     # TODO: deprecated
     desc 'Dump database schema'
     task dump: :environment do |_, args|
+      puts 'Warning: `rake clickhouse:schema:dump` is deprecated! Use `rake db:schema:dump:clickhouse` instead'
       simple = ENV['simple'] || args[:simple] || ARGV.any? { |a| a.include?('--simple') } ? '_simple' : nil
       filename = Rails.root.join("db/clickhouse_schema#{simple}.rb")
       File.open(filename, 'w:utf-8') do |file|
@@ -36,43 +39,38 @@ namespace :clickhouse do
   namespace :structure do
     desc 'Load database structure'
     task load: ['db:check_protected_environments'] do
-      config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'clickhouse')
       ClickhouseActiverecord::Tasks.new(config).structure_load(Rails.root.join('db/clickhouse_structure.sql'))
     end
 
     desc 'Dump database structure'
     task dump: ['db:check_protected_environments'] do
-      config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'clickhouse')
       ClickhouseActiverecord::Tasks.new(config).structure_dump(Rails.root.join('db/clickhouse_structure.sql'))
     end
   end
 
   desc 'Creates the database from DATABASE_URL or config/database.yml'
   task create: [] do
-    config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'clickhouse')
-    ActiveRecord::Tasks::DatabaseTasks.create(config)
+    puts 'Warning: `rake clickhouse:create` is deprecated! Use `rake db:create:clickhouse` instead'
   end
 
   desc 'Drops the database from DATABASE_URL or config/database.yml'
   task drop: ['db:check_protected_environments'] do
-    config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'clickhouse')
-    ActiveRecord::Tasks::DatabaseTasks.drop(config)
+    puts 'Warning: `rake clickhouse:drop` is deprecated! Use `rake db:drop:clickhouse` instead'
   end
 
   desc 'Empty the database from DATABASE_URL or config/database.yml'
   task purge: ['db:check_protected_environments'] do
-    config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'clickhouse')
-    ActiveRecord::Tasks::DatabaseTasks.purge(config)
+    puts 'Warning: `rake clickhouse:purge` is deprecated! Use `rake db:reset:clickhouse` instead'
   end
 
   # desc 'Resets your database using your migrations for the current environment'
   task :reset  do
-    Rake::Task['clickhouse:purge'].execute
-    Rake::Task['clickhouse:migrate'].execute
+    puts 'Warning: `rake clickhouse:reset` is deprecated! Use `rake db:reset:clickhouse` instead'
   end
 
   desc 'Migrate the clickhouse database'
   task migrate: %i[prepare_schema_migration_table prepare_internal_metadata_table] do
+    puts 'Warning: `rake clickhouse:migrate` is deprecated! Use `rake db:migrate:clickhouse` instead'
     Rake::Task['db:migrate:clickhouse'].execute
     if File.exist? "#{Rails.root}/db/clickhouse_schema_simple.rb"
       Rake::Task['clickhouse:schema:dump'].execute(simple: true)
@@ -81,9 +79,14 @@ namespace :clickhouse do
 
   desc 'Rollback the clickhouse database'
   task rollback: %i[prepare_schema_migration_table prepare_internal_metadata_table] do
+    puts 'Warning: `rake clickhouse:rollback` is deprecated! Use `rake db:rollback:clickhouse` instead'
     Rake::Task['db:rollback:clickhouse'].execute
     if File.exist? "#{Rails.root}/db/clickhouse_schema_simple.rb"
       Rake::Task['clickhouse:schema:dump'].execute(simple: true)
     end
   end
+
+  def config
+    ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: 'clickhouse')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-02 00:00:00.000000000 Z
+date: 2024-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".docker/clickhouse/cluster/server1_config.xml"
+- ".docker/clickhouse/cluster/server2_config.xml"
+- ".docker/clickhouse/single/config.xml"
+- ".docker/clickhouse/users.xml"
+- ".docker/docker-compose.cluster.yml"
+- ".docker/docker-compose.yml"
+- ".docker/nginx/local.conf"
+- ".github/workflows/testing.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -98,7 +106,6 @@ files:
 - bin/console
 - bin/setup
 - clickhouse-activerecord.gemspec
-- core_extensions/active_record/migration/command_recorder.rb
 - lib/active_record/connection_adapters/clickhouse/oid/array.rb
 - lib/active_record/connection_adapters/clickhouse/oid/big_integer.rb
 - lib/active_record/connection_adapters/clickhouse/oid/date.rb
@@ -119,6 +126,7 @@ files:
 - lib/clickhouse-activerecord/tasks.rb
 - lib/clickhouse-activerecord/version.rb
 - lib/core_extensions/active_record/internal_metadata.rb
+- lib/core_extensions/active_record/migration/command_recorder.rb
 - lib/core_extensions/active_record/relation.rb
 - lib/core_extensions/active_record/schema_migration.rb
 - lib/core_extensions/arel/nodes/select_core.rb
@@ -146,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: ClickHouse ActiveRecord