switchman 3.0.3 → 3.0.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 +4 -4
- data/lib/switchman/active_record/relation.rb +9 -5
- data/lib/switchman/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1ffc8c73f2ac38cf0440d1e556e1c7c2af4ad8d665e40893caf76ae228bc702f
|
|
4
|
+
data.tar.gz: a4567920bb1cff999d77845d0de9f204826cce7ef9da1c2164802230923b56af
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 75493a10996762aacbaeb5d0ec0a8299565758eb5d1e2d8697353f02c90113b865d31253615864ea5778804830fb6abc17f50c0e5650862e6cc77319f6bc57b7
|
|
7
|
+
data.tar.gz: ea96557baaeed4cf99d9144cabfcadf70e6ac00024bffb16fdcc299da7298c5ec073fb9d91bdfcfbf6cd25bbd71f178bb973c7340720ba429521d94f0d4a769e
|
|
@@ -63,7 +63,7 @@ module Switchman
|
|
|
63
63
|
%I[update_all delete_all].each do |method|
|
|
64
64
|
class_eval <<-RUBY, __FILE__, __LINE__ + 1
|
|
65
65
|
def #{method}(*args)
|
|
66
|
-
result = self.activate { |relation| relation.call_super(#{method.inspect}, Relation, *args) }
|
|
66
|
+
result = self.activate(unordered: true) { |relation| relation.call_super(#{method.inspect}, Relation, *args) }
|
|
67
67
|
result = result.sum if result.is_a?(Array)
|
|
68
68
|
result
|
|
69
69
|
end
|
|
@@ -103,7 +103,7 @@ module Switchman
|
|
|
103
103
|
end
|
|
104
104
|
end
|
|
105
105
|
|
|
106
|
-
def activate(&block)
|
|
106
|
+
def activate(unordered: false, &block)
|
|
107
107
|
shards = all_shards
|
|
108
108
|
if Array === shards && shards.length == 1
|
|
109
109
|
if shards.first == DefaultShard || shards.first == Shard.current(klass.connection_classes)
|
|
@@ -124,7 +124,7 @@ module Switchman
|
|
|
124
124
|
|
|
125
125
|
shard_results = relation.activate(&block)
|
|
126
126
|
|
|
127
|
-
if shard_results.present?
|
|
127
|
+
if shard_results.present? && !unordered
|
|
128
128
|
can_order ||= can_order_cross_shard_results? unless order_values.empty?
|
|
129
129
|
raise OrderOnMultiShardQuery if !can_order && !order_values.empty? && result_count.positive?
|
|
130
130
|
|
|
@@ -148,8 +148,12 @@ module Switchman
|
|
|
148
148
|
results.sort! do |l, r|
|
|
149
149
|
result = 0
|
|
150
150
|
order_values.each do |ov|
|
|
151
|
-
|
|
152
|
-
|
|
151
|
+
if l.is_a?(::ActiveRecord::Base)
|
|
152
|
+
a = l.attribute(ov.expr.name)
|
|
153
|
+
b = r.attribute(ov.expr.name)
|
|
154
|
+
else
|
|
155
|
+
a, b = l, r
|
|
156
|
+
end
|
|
153
157
|
next if a == b
|
|
154
158
|
|
|
155
159
|
if a.nil? || b.nil?
|
data/lib/switchman/version.rb
CHANGED