click_house-client 0.9.0 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cccbd9106d3d83f03a0dba17c0e3c43fc58f93dfd5ed75baaa86cbdd1f3628b0
4
- data.tar.gz: 876218b5e4601d897b0c83b607ec83a23c10e6d927347ac2ac03bf34309d7b55
3
+ metadata.gz: bef646c7c07c30559265378e9fec3f14f5e41aeadd86058120a31d532d77d10a
4
+ data.tar.gz: e969763ad335eda82d36f3d949207cfcb95ab238646ff0b3e4ec18e5a17bd445
5
5
  SHA512:
6
- metadata.gz: 65bfaba824f239654390d509efcaf9dd03486fee4db020916c53cad306cd0abdf8d93fa1ea091da0a55123bef2512947f10df572d181f387eac8ee5d34b8488f
7
- data.tar.gz: 428207f4a11fa7ec577e5316130d053f59c3d88544e3f0f77da8f33ab0f2f60efaa6646ca8cf523e20ef474a13acbdfc8b44f7dde19347c28a861c3816c16a27
6
+ metadata.gz: 9f7883a21fba0ab5534c85ca43686a3490234252c2277e200a244a3bead56fa3a31d7597c8b23deecb0086b5ad3a90dde67c8425f8ce257c289cb29abb8b29ad
7
+ data.tar.gz: 175aaeaefe0f02f0ba1cd9e3828d9d4bb876c450f626765b78568297c0d35d7e2eb7de00f900ea88db84f7240fbb32790fededbd258dcad4afb4d9291bb16f7c
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- click_house-client (0.9.0)
4
+ click_house-client (0.10.0)
5
5
  activerecord (>= 7.0, < 9.0)
6
6
  activesupport (>= 7.0, < 9.0)
7
7
  addressable (~> 2.8)
@@ -136,7 +136,7 @@ CHECKSUMS
136
136
  benchmark (0.4.1) sha256=d4ef40037bba27f03b28013e219b950b82bace296549ec15a78016552f8d2cce
137
137
  bigdecimal (3.2.2) sha256=39085f76b495eb39a79ce07af716f3a6829bc35eb44f2195e2753749f2fa5adc
138
138
  byebug (12.0.0) sha256=d4a150d291cca40b66ec9ca31f754e93fed8aa266a17335f71bb0afa7fca1a1e
139
- click_house-client (0.9.0)
139
+ click_house-client (0.10.0)
140
140
  concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6
141
141
  connection_pool (2.5.3) sha256=cfd74a82b9b094d1ce30c4f1a346da23ee19dc8a062a16a85f58eab1ced4305b
142
142
  diff-lcs (1.5.0) sha256=49b934001c8c6aedb37ba19daec5c634da27b318a7a3c654ae979d6ba1929b67
data/README.md CHANGED
@@ -200,7 +200,10 @@ query.final.where(active: true).to_sql
200
200
 
201
201
  ### Working with JOINs
202
202
 
203
- When using JOINs, you can apply conditions to joined tables: _(Supports only `INNER JOIN`)_
203
+ `#joins` supports `INNER JOIN` (default) and `LEFT OUTER JOIN` via
204
+ `type: :outer`. The join source can be a table name, an `Arel::Table`, or a
205
+ pre-aliased subquery (`QueryBuilder.new(sub, 'alias').table` or
206
+ `sub.to_arel.as('alias')`).
204
207
 
205
208
  ```ruby
206
209
  # Join with conditions on joined table
@@ -217,6 +220,17 @@ query
217
220
  .having(orders: { total: [100, 200, 300] })
218
221
  .to_sql
219
222
  # => "SELECT * FROM `users` INNER JOIN `orders` ON `users`.`id` = `orders`.`user_id` GROUP BY `users`.`department` HAVING `orders`.`total` IN (100, 200, 300)"
223
+
224
+ # LEFT OUTER JOIN against a pre-aliased subquery
225
+ orders_sub = ClickHouse::Client::QueryBuilder.new(
226
+ ClickHouse::Client::QueryBuilder.new('orders').select(:id, :user_id),
227
+ 'o'
228
+ )
229
+
230
+ query
231
+ .joins(orders_sub.table, { id: :user_id }, type: :outer)
232
+ .to_sql
233
+ # => "SELECT * FROM `users` LEFT OUTER JOIN (SELECT `orders`.`id`, `orders`.`user_id` FROM `orders`) `o` ON `users`.`id` = `o`.`user_id`"
220
234
  ```
221
235
 
222
236
  ### Complete Example
@@ -198,30 +198,40 @@ module ClickHouse
198
198
  end
199
199
  end
200
200
 
201
- def joins(table_name, constraint = nil)
201
+ # Adds a JOIN clause. Pass `type: :outer` for `LEFT OUTER JOIN`.
202
+ # To join a subquery, pre-alias it via `QueryBuilder.new(sub, 'x').table`
203
+ # or `sub.to_arel.as('x')` and pass that.
204
+ # @return [ClickHouse::Client::QueryBuilder] New instance of query builder.
205
+ def joins(source, constraint = nil, type: :inner)
206
+ validate_join_type!(type)
207
+
202
208
  clone.tap do |new_instance|
203
- join_table = table_name.is_a?(Arel::Table) ? table_name : Arel::Table.new(table_name)
209
+ join_target = case source
210
+ when Arel::Table, Arel::Nodes::TableAlias then source
211
+ else Arel::Table.new(source)
212
+ end
213
+ join_class = type == :outer ? Arel::Nodes::OuterJoin : Arel::Nodes::InnerJoin
204
214
 
205
215
  join_condition = case constraint
206
216
  when Hash
207
217
  # Handle hash based constraints like { table1.id: table2.ref_id } or {id: :ref_id}
208
218
  constraint_conditions = constraint.map do |left, right|
209
219
  left_field = left.is_a?(Arel::Attributes::Attribute) ? left : new_instance.table[left]
210
- right_field = right.is_a?(Arel::Attributes::Attribute) ? right : join_table[right]
220
+ right_field = right.is_a?(Arel::Attributes::Attribute) ? right : join_target[right]
211
221
  left_field.eq(right_field)
212
222
  end
213
223
 
214
224
  constraint_conditions.reduce(&:and)
215
225
  when Proc
216
- constraint.call(new_instance.table, join_table)
217
- when Arel::Nodes::Node
226
+ constraint.call(new_instance.table, join_target)
227
+ when Arel::Nodes::Node, Arel::Nodes::SqlLiteral
218
228
  constraint
219
229
  end
220
230
 
221
231
  if join_condition
222
- new_instance.manager.join(join_table).on(join_condition)
232
+ new_instance.manager.join(join_target, join_class).on(join_condition)
223
233
  else
224
- new_instance.manager.join(join_table)
234
+ new_instance.manager.join(join_target, join_class)
225
235
  end
226
236
  end
227
237
  end
@@ -448,6 +458,12 @@ module ClickHouse
448
458
 
449
459
  raise ArgumentError, "Invalid order direction '#{direction}'. Must be :asc or :desc"
450
460
  end
461
+
462
+ def validate_join_type!(type)
463
+ return if %i[inner outer].include?(type)
464
+
465
+ raise ArgumentError, "Invalid join type '#{type}'. Must be :inner or :outer"
466
+ end
451
467
  end
452
468
  end
453
469
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module ClickHouse
4
4
  module Client
5
- VERSION = "0.9.0"
5
+ VERSION = "0.10.0"
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: click_house-client
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0
4
+ version: 0.10.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - group::optimize
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2026-05-28 00:00:00.000000000 Z
11
+ date: 2026-06-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord