umbrellio-utils 1.12.0 → 1.13.0

data/lib/umbrellio_utils/migrations.rb

@@ -200,16 +200,19 @@ module UmbrellioUtils
     end
 
     def create_distributed_table!(table_name, sharding_key, db_name: UmbrellioUtils::ClickHouse.db_name)
+      cluster = UmbrellioUtils.config.clickhouse_cluster
+      on_cluster = UmbrellioUtils::ClickHouse.on_cluster
+
       UmbrellioUtils::ClickHouse.execute(<<~SQL.squish)
         DROP TABLE IF EXISTS #{db_name}.#{table_name}_distributed
-        ON CLUSTER click_cluster
+        #{on_cluster}
       SQL
 
       UmbrellioUtils::ClickHouse.execute(<<~SQL.squish)
         CREATE TABLE #{db_name}.#{table_name}_distributed
-        ON CLUSTER click_cluster
+        #{on_cluster}
         AS #{db_name}.#{table_name}
-        ENGINE = Distributed(click_cluster, #{db_name}, #{table_name}, #{sharding_key})
+        ENGINE = Distributed(#{cluster}, #{db_name}, #{table_name}, #{sharding_key})
       SQL
     end
 
@@ -227,7 +230,6 @@ module UmbrellioUtils
       end
 
       DB.transaction do
-        DB.run("LOCK TABLE #{view_name}")
         definition = view_definition(view_name)
         sql = sequel_columns.map { |x| DB.literal(x) }.join(", ")
         new_definition = definition.sub("FROM", ", #{sql} FROM")
@@ -239,7 +241,6 @@ module UmbrellioUtils
     # drop_columns_from_view("orders_clickhouse_view", "id", "guid")
     def drop_columns_from_view(view_name, *columns)
       DB.transaction do
-        DB.run("LOCK TABLE #{view_name}")
         definition = view_definition(view_name)
         parsed_columns = parse_columns(definition)
         parsed_columns.reject! { |name, _| name.in?(columns) }

data/lib/umbrellio_utils/sql.rb

@@ -6,8 +6,8 @@ module UmbrellioUtils
 
     UniqueConstraintViolation = Sequel::UniqueConstraintViolation
 
-    def [](*args)
-      Sequel[*args]
+    def [](*)
+      Sequel[*]
     end
 
     def func(...)
@@ -47,8 +47,8 @@ module UmbrellioUtils
       Sequel.|(*Array(conditions.flatten.presence || true))
     end
 
-    def pg_range(from_value, to_value, **opts)
-      Sequel::Postgres::PGRange.new(from_value, to_value, **opts)
+    def pg_range(from_value, to_value, **)
+      Sequel::Postgres::PGRange.new(from_value, to_value, **)
     end
 
     def pg_range_by_range(range)
@@ -79,8 +79,8 @@ module UmbrellioUtils
       expr ? func(:count, expr) : func(:count).*
     end
 
-    def ch_count(*args)
-      Sequel.function(:count, *args)
+    def ch_count(*)
+      Sequel.function(:count, *)
     end
 
     def avg(expr)
@@ -107,8 +107,8 @@ module UmbrellioUtils
       func(:coalesce, *exprs)
     end
 
-    def coalesce0(*args)
-      coalesce(*args, 0)
+    def coalesce0(*)
+      coalesce(*, 0)
     end
 
     def nullif(main_expr, checking_expr)

data/lib/umbrellio_utils/tasks/clickhouse_connect.rake

@@ -3,12 +3,13 @@
 namespace :ch do
   desc "run clickhouse client"
   task connect: :environment do
+    cfg = UmbrellioUtils::ClickHouse.config
     params = {
-      host: ENV.fetch("CLICKHOUSE_HOST", UmbrellioUtils::ClickHouse.config.host),
-      user: ENV.fetch("CLICKHOUSE_USER", UmbrellioUtils::ClickHouse.config.username),
-      password: ENV.fetch("CLICKHOUSE_PASSWORD", UmbrellioUtils::ClickHouse.config.password),
-      database: ENV.fetch("CLICKHOUSE_DATABASE", UmbrellioUtils::ClickHouse.config.database),
-      **UmbrellioUtils::ClickHouse.config.global_params,
+      host: ENV.fetch("CLICKHOUSE_HOST", cfg.host),
+      user: ENV.fetch("CLICKHOUSE_USER", cfg.username),
+      password: ENV.fetch("CLICKHOUSE_PASSWORD", cfg.password),
+      database: ENV.fetch("CLICKHOUSE_DATABASE", cfg.database),
+      **(cfg.try(:global_params) || {}),
     }.compact_blank
 
     cmd = Shellwords.join(["clickhouse", "client", *params.map { |k, v| "--#{k}=#{v}" }])

data/lib/umbrellio_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UmbrellioUtils
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/lib/umbrellio_utils.rb

@@ -16,7 +16,16 @@ module UmbrellioUtils
   def config
     synchronize do
       @@config ||= Struct
-        .new(:store_table_name, :http_client_name, :ch_optimize_timeout, keyword_init: true)
+        .new(
+          :store_table_name,
+          :http_client_name,
+          :ch_optimize_timeout,
+          :clickhouse_backend,
+          :clickhouse_native_settings,
+          :clickhouse_native_logger,
+          :clickhouse_cluster,
+          keyword_init: true,
+        )
         .new(**default_settings)
     end
   end
@@ -25,6 +34,10 @@ module UmbrellioUtils
 
   def configure
     synchronize { yield config }
+    # Consumers on the native backend rely on `::ClickHouse.config`
+    # being available at rake/runtime (e.g. umbrellio-sequel-plugins'
+    # ch:create). Load the shim eagerly once the backend is selected.
+    require_relative "umbrellio_utils/click_house/config" if config.clickhouse_backend == :native
   end
 
   def extend_util!(module_name, &block)
@@ -39,6 +52,9 @@ module UmbrellioUtils
       store_table_name: :store,
       http_client_name: :application_httpclient,
       ch_optimize_timeout: 5.minutes,
+      clickhouse_backend: :legacy,
+      clickhouse_native_settings: {},
+      clickhouse_cluster: "click_cluster",
     }
   end
 

data/umbrellio_utils.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "UmbrellioUtils is collection of utility classes and helpers"
   spec.homepage      = "https://github.com/umbrellio/utils"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/umbrellio/utils"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-utils
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Team Umbrellio
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memery
@@ -50,6 +51,11 @@ files:
 - lib/umbrellio_utils/cards.rb
 - lib/umbrellio_utils/checks.rb
 - lib/umbrellio_utils/click_house.rb
+- lib/umbrellio_utils/click_house/backends.rb
+- lib/umbrellio_utils/click_house/backends/base.rb
+- lib/umbrellio_utils/click_house/backends/legacy.rb
+- lib/umbrellio_utils/click_house/backends/native.rb
+- lib/umbrellio_utils/click_house/config.rb
 - lib/umbrellio_utils/constants.rb
 - lib/umbrellio_utils/control.rb
 - lib/umbrellio_utils/database.rb
@@ -81,6 +87,7 @@ metadata:
   homepage_uri: https://github.com/umbrellio/utils
   source_code_uri: https://github.com/umbrellio/utils
   documentation_uri: https://rubydoc.info/gems/umbrellio-utils
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,14 +95,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A set of utilities that speed up development
 test_files: []