click_house-client 0.3.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83fe3e04dc8f9d5a03f4fe17f2da28f6bcadc38b09189b556b46121da2d4ed83
-  data.tar.gz: c1c41dc3f1addcf6ca4e3547789a83259a599b119386027958a512356000a6e9
+  metadata.gz: 4fb73c384094387fbb53365e18a5378aca87148e07e501b25e03f9371cead01e
+  data.tar.gz: f5a179a229a5c9fe115ce03d84d22d14b01c56dfa99694cea5f75d9f9c034f37
 SHA512:
-  metadata.gz: 494b64ff402c478646f06e881b49999d6d701d42a9609ac00cd7e2e5c09a57c08a9e9764f350f77c3e155eeca99b0ba97b1210495c87b7dc62959a98ac2d5eaa
-  data.tar.gz: 05e682159377bae54bb2556daa68f313ae4407b4103d41062a4e0544763e6a136163feb138fcf7a7cfff61a0ae8c06fff7e07178aa4b2c686d8f9fbdf84aca19
+  metadata.gz: 1b3055e3104e139834ac5e3538ac3d0e402c16b8f1456861ed0bca269c03870038c9aadc97ebb1c74e1486a273c6a44867f20a07f423075ab8e8b90f972c2acd
+  data.tar.gz: 9f1e7160de8c0d4ead180e10dfc40b36db5e155d08a1d7d2c62c6225636dc72751c7b1ee68d583ff8653409b8fdddb8e9ce0cd2ff920bd38995e5eab8408e04e

data/.gitlab-ci.yml

@@ -69,12 +69,6 @@ secret_detection:
   variables:
     # Use a different scanning mode that doesn't rely on commit comparison
     SECURE_ANALYZERS_MODE: "full_repository_scan"
-
   rules:
     - if: '$CI_MERGE_REQUEST_IID'
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-
-.gem-release-default-rules:
-  # Limit gem publication to GitLab's ClickHouse Client project
-  rules:
-    - if: $CI_PROJECT_ID == '71171912'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    click_house-client (0.3.5)
+    click_house-client (0.5.0)
       activerecord (>= 7.0, < 9.0)
       activesupport (>= 7.0, < 9.0)
       addressable (~> 2.8)
@@ -34,6 +34,7 @@ GEM
     base64 (0.3.0)
     benchmark (0.4.1)
     bigdecimal (3.2.2)
+    byebug (12.0.0)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.3)
     diff-lcs (1.5.0)
@@ -117,6 +118,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  byebug
   click_house-client!
   gitlab-styles (~> 12.0.1)
   rake (~> 13.0)
@@ -133,7 +135,8 @@ CHECKSUMS
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   benchmark (0.4.1) sha256=d4ef40037bba27f03b28013e219b950b82bace296549ec15a78016552f8d2cce
   bigdecimal (3.2.2) sha256=39085f76b495eb39a79ce07af716f3a6829bc35eb44f2195e2753749f2fa5adc
-  click_house-client (0.3.5)
+  byebug (12.0.0) sha256=d4a150d291cca40b66ec9ca31f754e93fed8aa266a17335f71bb0afa7fca1a1e
+  click_house-client (0.5.0)
   concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6
   connection_pool (2.5.3) sha256=cfd74a82b9b094d1ce30c4f1a346da23ee19dc8a062a16a85f58eab1ced4305b
   diff-lcs (1.5.0) sha256=49b934001c8c6aedb37ba19daec5c634da27b318a7a3c654ae979d6ba1929b67

data/click_house-client.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "addressable", "~> 2.8"
   spec.add_runtime_dependency "json", "~> 2.7"
 
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "gitlab-styles", "~> 12.0.1"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/click_house/client/query_builder.rb

@@ -6,7 +6,7 @@ module ClickHouse
   module Client
     class QueryBuilder < QueryLike
       attr_reader :table
-      attr_accessor :conditions, :manager
+      attr_accessor :manager
 
       VALID_NODES = [
         Arel::Nodes::In,
@@ -27,38 +27,39 @@ module ClickHouse
       def initialize(table_name)
         @table = Arel::Table.new(table_name)
         @manager = Arel::SelectManager.new(Arel::Table.engine).from(@table).project(Arel.star)
-        @conditions = []
+      end
+
+      def initialize_copy(other)
+        super
+
+        @manager = other.manager.clone
       end
 
       # The `where` method currently only supports IN and equal to queries along
       # with above listed VALID_NODES.
       # For example, using a range (start_date..end_date) will result in incorrect SQL.
-      # If you need to query a range, use greater than and less than conditions with Arel.
+      # If you need to query a range, use greater than and less than constraints with Arel.
       #
       # Correct usage:
       #   query.where(query.table[:created_at].lteq(Date.today)).to_sql
       #   "SELECT * FROM \"table\" WHERE \"table\".\"created_at\" <= '2023-08-01'"
       #
-      # This also supports array conditions which will result in an IN query.
+      # This also supports array constraints which will result in an IN query.
       #   query.where(entity_id: [1,2,3]).to_sql
       #   "SELECT * FROM \"table\" WHERE \"table\".\"entity_id\" IN (1, 2, 3)"
       #
       # Range support and more `Arel::Nodes` could be considered for future iterations.
       # @return [ClickHouse::QueryBuilder] New instance of query builder.
-      def where(conditions)
-        validate_condition_type!(conditions)
+      def where(constraints)
+        validate_constraint_type!(constraints)
 
-        deep_clone.tap do |new_instance|
-          if conditions.is_a?(Arel::Nodes::Node)
-            new_instance.conditions << conditions
-          else
-            add_conditions_to(new_instance, conditions)
-          end
+        clone.tap do |new_instance|
+          add_constraints_to(new_instance, constraints)
         end
       end
 
       def select(*fields)
-        deep_clone.tap do |new_instance|
+        clone.tap do |new_instance|
           existing_fields = new_instance.manager.projections.filter_map do |projection|
             if projection.respond_to?(:to_s) && projection.to_s == '*'
               nil
@@ -90,7 +91,7 @@ module ClickHouse
       def order(field, direction = :asc)
         validate_order_direction!(direction)
 
-        deep_clone.tap do |new_instance|
+        clone.tap do |new_instance|
           order_node = case field
                        when Arel::Nodes::SqlLiteral, Arel::Nodes::Node, Arel::Attribute
                          field
@@ -104,7 +105,7 @@ module ClickHouse
       end
 
       def group(*columns)
-        deep_clone.tap do |new_instance|
+        clone.tap do |new_instance|
           new_instance.manager.group(*columns)
         end
       end
@@ -119,9 +120,45 @@ module ClickHouse
         self
       end
 
-      def to_sql
-        apply_conditions!
+      def from(subquery, alias_name)
+        clone.tap do |new_instance|
+          if subquery.is_a?(self.class)
+            new_instance.manager.from(subquery.to_arel.as(alias_name))
+          else
+            new_instance.manager.from(Arel::Nodes::TableAlias.new(subquery, alias_name))
+          end
+        end
+      end
 
+      def joins(table_name, constraint = nil)
+        clone.tap do |new_instance|
+          join_table = table_name.is_a?(Arel::Table) ? table_name : Arel::Table.new(table_name)
+
+          join_condition = case constraint
+                           when Hash
+                             # Handle hash based constraints like { table1.id: table2.ref_id } or {id: :ref_id}
+                             constraint_conditions = constraint.map do |left, right|
+                               left_field = left.is_a?(Arel::Attributes::Attribute) ? left : new_instance.table[left]
+                               right_field = right.is_a?(Arel::Attributes::Attribute) ? right : join_table[right]
+                               left_field.eq(right_field)
+                             end
+
+                             constraint_conditions.reduce(&:and)
+                           when Proc
+                             constraint.call(new_instance.table, join_table)
+                           when Arel::Nodes::Node
+                             constraint
+                           end
+
+          if join_condition
+            new_instance.manager.join(join_table).on(join_condition)
+          else
+            new_instance.manager.join(join_table)
+          end
+        end
+      end
+
+      def to_sql
         visitor = Arel::Visitors::ToSql.new(ClickHouse::Client::ArelEngine.new)
         visitor.accept(manager.ast, Arel::Collectors::SQLString.new).value
       end
@@ -130,34 +167,44 @@ module ClickHouse
         ClickHouse::Client::Redactor.redact(self, bind_index_manager)
       end
 
+      def to_arel
+        manager
+      end
+
       private
 
-      def validate_condition_type!(condition)
-        return unless condition.is_a?(Arel::Nodes::Node) && VALID_NODES.exclude?(condition.class)
+      def validate_constraint_type!(constraint)
+        return unless constraint.is_a?(Arel::Nodes::Node) && VALID_NODES.exclude?(constraint.class)
 
-        raise ArgumentError, "Unsupported Arel node type for QueryBuilder: #{condition.class.name}"
+        raise ArgumentError, "Unsupported Arel node type for QueryBuilder: #{constraint.class.name}"
       end
 
-      def add_conditions_to(instance, conditions)
-        conditions.each do |key, value|
-          instance.conditions << if value.is_a?(Array)
-                                   instance.table[key].in(value)
-                                 else
-                                   instance.table[key].eq(value)
-                                 end
+      def add_constraints_to(instance, constraints)
+        if constraints.is_a?(Arel::Nodes::Node)
+          instance.manager.where(constraints)
+        else
+          constraints.each do |key, value|
+            if value.is_a?(Hash)
+              # Handle nested hash for joined tables
+              join_table = Arel::Table.new(key)
+              value.each do |nested_key, nested_value|
+                build_arel_constraint(instance, join_table, nested_key, nested_value)
+              end
+            else
+              build_arel_constraint(instance, instance.table, key, value)
+            end
+          end
         end
       end
 
-      def deep_clone
-        self.class.new(table.name).tap do |new_instance|
-          new_instance.manager = manager.clone
-          new_instance.conditions = conditions.map(&:clone)
-        end
-      end
+      def build_arel_constraint(instance, table, key, value)
+        constraint = if value.is_a?(Array)
+                       table[key].in(value)
+                     else
+                       table[key].eq(value)
+                     end
 
-      def apply_conditions!
-        manager.constraints.clear
-        conditions.each { |condition| manager.where(condition) }
+        instance.manager.where(constraint)
       end
 
       def validate_order_direction!(direction)

data/lib/click_house/client/redactor.rb

@@ -3,66 +3,71 @@
 module ClickHouse
   module Client
     module Redactor
-      # Redacts the SQL query represented by the query builder.
-      #
-      # @param query_builder [::ClickHouse::Querybuilder] The query builder object to be redacted.
-      # @return [String] The redacted SQL query as a string.
-      # @raise [ArgumentError] when the condition in the query is of an unsupported type.
-      #
-      # Example:
-      #   query_builder = ClickHouse::QueryBuilder.new('users').where(name: 'John Doe')
-      #   redacted_query = ClickHouse::Redactor.redact(query_builder)
-      #   # The redacted_query will contain the SQL query with values replaced by placeholders.
-      #   output: "SELECT * FROM \"users\" WHERE \"users\".\"name\" = $1"
-      def self.redact(query_builder, bind_manager = ClickHouse::Client::BindIndexManager.new)
-        cloned_query_builder = query_builder.clone
+      class << self
+        # Redacts the SQL query represented by the query builder.
+        #
+        # @param query_builder [::ClickHouse::Querybuilder] The query builder object to be redacted.
+        # @return [String] The redacted SQL query as a string.
+        # @raise [ArgumentError] when the condition in the query is of an unsupported type.
+        #
+        # Example:
+        #   query_builder = ClickHouse::QueryBuilder.new('users').where(name: 'John Doe')
+        #   redacted_query = ClickHouse::Redactor.redact(query_builder)
+        #   # The redacted_query will contain the SQL query with values replaced by placeholders.
+        #   output: "SELECT * FROM \"users\" WHERE \"users\".\"name\" = $1"
+        def redact(query_builder, bind_manager = ClickHouse::Client::BindIndexManager.new)
+          redacted_constraints = query_builder.manager.constraints.map do |constraint|
+            redact_constraint(constraint, bind_manager)
+          end
 
-        cloned_query_builder.conditions = cloned_query_builder.conditions.map do |condition|
-          redact_condition(condition, bind_manager)
-        end
+          cloned_query_builder = query_builder.clone
+
+          cloned_query_builder.manager.constraints.clear
+          redacted_constraints.each do |constraint|
+            cloned_query_builder.manager.where(constraint)
+          end
 
-        cloned_query_builder.manager.constraints.clear
-        cloned_query_builder.conditions.each do |condition|
-          cloned_query_builder.manager.where(condition)
+          cloned_query_builder.to_sql
         end
 
-        visitor = Arel::Visitors::ToSql.new(ClickHouse::Client::ArelEngine.new)
-        visitor.accept(cloned_query_builder.manager.ast, Arel::Collectors::SQLString.new).value
-      end
+        private
 
-      def self.redact_condition(condition, bind_manager)
-        case condition
-        when Arel::Nodes::In
-          condition.left.in(Array.new(condition.right.size) { Arel.sql(bind_manager.next_bind_str) })
-        when Arel::Nodes::Equality
-          condition.left.eq(Arel.sql(bind_manager.next_bind_str))
-        when Arel::Nodes::LessThan
-          condition.left.lt(Arel.sql(bind_manager.next_bind_str))
-        when Arel::Nodes::LessThanOrEqual
-          condition.left.lteq(Arel.sql(bind_manager.next_bind_str))
-        when Arel::Nodes::GreaterThan
-          condition.left.gt(Arel.sql(bind_manager.next_bind_str))
-        when Arel::Nodes::GreaterThanOrEqual
-          condition.left.gteq(Arel.sql(bind_manager.next_bind_str))
-        when Arel::Nodes::NamedFunction
-          redact_named_function(condition, bind_manager)
-        else
-          raise ArgumentError, "Unsupported Arel node type for Redactor: #{condition.class}"
+        def redact_constraint(constraint, bind_manager)
+          case constraint
+          when Arel::Nodes::In
+            constraint.left.in(Array.new(constraint.right.size) { Arel.sql(bind_manager.next_bind_str) })
+          when Arel::Nodes::Equality
+            constraint.left.eq(Arel.sql(bind_manager.next_bind_str))
+          when Arel::Nodes::LessThan
+            constraint.left.lt(Arel.sql(bind_manager.next_bind_str))
+          when Arel::Nodes::LessThanOrEqual
+            constraint.left.lteq(Arel.sql(bind_manager.next_bind_str))
+          when Arel::Nodes::GreaterThan
+            constraint.left.gt(Arel.sql(bind_manager.next_bind_str))
+          when Arel::Nodes::GreaterThanOrEqual
+            constraint.left.gteq(Arel.sql(bind_manager.next_bind_str))
+          when Arel::Nodes::NamedFunction
+            redact_named_function(constraint, bind_manager)
+          else
+            raise ArgumentError, "Unsupported Arel node type for Redactor: #{constraint.class}"
+          end
         end
-      end
 
-      def self.redact_named_function(condition, bind_manager)
-        redacted_condition =
-          Arel::Nodes::NamedFunction.new(condition.name, condition.expressions.dup)
+        def redact_named_function(constraint, bind_manager)
+          redacted_constraint =
+            Arel::Nodes::NamedFunction.new(constraint.name, constraint.expressions.dup)
 
-        case redacted_condition.name
-        when 'startsWith'
-          redacted_condition.expressions[1] = Arel.sql(bind_manager.next_bind_str)
-        else
-          redacted_condition.expressions = redacted_condition.expressions.map { Arel.sql(bind_manager.next_bind_str) }
-        end
+          case redacted_constraint.name
+          when 'startsWith'
+            redacted_constraint.expressions[1] = Arel.sql(bind_manager.next_bind_str)
+          else
+            redacted_constraint.expressions = redacted_constraint.expressions.map do
+              Arel.sql(bind_manager.next_bind_str)
+            end
+          end
 
-        redacted_condition
+          redacted_constraint
+        end
       end
     end
   end

data/lib/click_house/client/version.rb

@@ -2,6 +2,6 @@
 
 module ClickHouse
   module Client
-    VERSION = "0.3.6"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: click_house-client
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.5.0
 platform: ruby
 authors:
 - group::optimize
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -78,6 +78,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gitlab-styles
   requirement: !ruby/object:Gem::Requirement