baby_squeel 1.4.3 → 1.4.4

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: e13379a85b00158faa5f8994dc69a579af9c4dcf3d35038368c3680027334ab2
4
- data.tar.gz: 2b6ea8355d38af2512667edb454c0632b7d883173d9a534a29634a92b1a45054
3
+ metadata.gz: 54dbc98299ab8f9909d8c312e9663cc615543ea6421b81f2aab6efdd2bd9fe59
4
+ data.tar.gz: 97cc39dced57e0bd6bf16c854859f47902a2d6550e71c4120643fb01d0de9529
5
5
  SHA512:
6
- metadata.gz: f75a420d6e922df3a174408a11a212edf5663a3d1593608f6cd59b3e9fc52ecd542067364d8f159e6615e695dd7a6c2b0858ca6b4be6905dca706c8e252a17c5
7
- data.tar.gz: a3dac244446df4f543e871daf5bf1d680a1d8389e5d63853cdf475da55024ee34c0f783d4d24f1eefbd46dc855feef08cae57cc80dc0a2680a42a4775dfa5dc7
6
+ metadata.gz: 8f5e68cf4ac0e85d2dc8fce1741f2d64c2bd5b5ecc08c335d71ad3fae335fb3b580f5c3aa2c5f98053ec445d9a7fbc1d3ddec6c7218c99bcb9869a6767fa68c8
7
+ data.tar.gz: ca66ea54876dfb670177ccea3be1808c90b4d1affea3b7bc1cb5c515e6e8208a8b55fb9fcd06202c6411ea102a358ceb0aa7d0468f82ee7c857045fbc0c5e946
data/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  ## [Unreleased]
2
2
 
3
+ ## [1.4.4] - 2022-02-07
4
+
5
+ ### Fixed
6
+
7
+ - Nested merge-joins query causes NoMethodError with ActiveRecord 6.1.4.4 (#119)
8
+
3
9
  ## [1.4.3] - 2022-02-04
4
10
 
5
11
  ### Fixed
@@ -225,7 +231,8 @@
225
231
 
226
232
  - Initial support for selects, orders, wheres, and joins.
227
233
 
228
- [unreleased]: https://github.com/rzane/baby_squeel/compare/v1.4.3...HEAD
234
+ [unreleased]: https://github.com/rzane/baby_squeel/compare/v1.4.4...HEAD
235
+ [1.4.4]: https://github.com/rzane/baby_squeel/compare/v1.4.3...v1.4.4
229
236
  [1.4.3]: https://github.com/rzane/baby_squeel/compare/v1.4.2...v1.4.3
230
237
  [1.4.2]: https://github.com/rzane/baby_squeel/compare/v1.4.1...v1.4.2
231
238
  [1.4.1]: https://github.com/rzane/baby_squeel/compare/v1.4.0...v1.4.1
@@ -51,15 +51,7 @@ module BabySqueel
51
51
  having DSL.evaluate(self, &block)
52
52
  end
53
53
 
54
- private
55
-
56
54
  if BabySqueel::ActiveRecord::VersionHelper.at_least_6_1?
57
- # https://github.com/rails/rails/commit/c0c53ee9d28134757cf1418521cb97c4a135f140
58
- def select_association_list(*args)
59
- args[0].extend(BabySqueel::ActiveRecord::QueryMethods::Injector6_1)
60
- super *args
61
- end
62
-
63
55
  def construct_join_dependency(associations, join_type)
64
56
  result = super(associations, join_type)
65
57
  if associations.any? { |assoc| assoc.is_a?(BabySqueel::Join) }
@@ -67,7 +59,17 @@ module BabySqueel
67
59
  end
68
60
  result
69
61
  end
62
+
63
+ private
64
+
65
+ # https://github.com/rails/rails/commit/c0c53ee9d28134757cf1418521cb97c4a135f140
66
+ def select_association_list(*args)
67
+ args[0].extend(BabySqueel::ActiveRecord::QueryMethods::Injector6_1)
68
+ super *args
69
+ end
70
70
  elsif BabySqueel::ActiveRecord::VersionHelper.at_least_6_0?
71
+ private
72
+
71
73
  # Active Record will call `each` on the `joins`. The
72
74
  # Injector has a custom `each` method that handles
73
75
  # BabySqueel::Join nodes.
@@ -76,6 +78,8 @@ module BabySqueel
76
78
  super(*args)
77
79
  end
78
80
  else
81
+ private
82
+
79
83
  # Active Record will call `group_by` on the `joins`. The
80
84
  # Injector has a custom `group_by` method that handles
81
85
  # BabySqueel::Join nodes.
@@ -1,3 +1,3 @@
1
1
  module BabySqueel
2
- VERSION = '1.4.3'.freeze
2
+ VERSION = '1.4.4'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: baby_squeel
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.3
4
+ version: 1.4.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ray Zane
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-02-04 00:00:00.000000000 Z
11
+ date: 2022-02-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
156
156
  - !ruby/object:Gem::Version
157
157
  version: '0'
158
158
  requirements: []
159
- rubygems_version: 3.2.22
159
+ rubygems_version: 3.3.3
160
160
  signing_key:
161
161
  specification_version: 4
162
162
  summary: An expressive query DSL for Active Record 4 and 5.