plunk 0.2.4 → 0.2.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/plunk/result_set.rb +7 -9
- data/plunk.gemspec +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 47c7f2be3a089ccdd46d4a90f3c4daf103d8b0e2
|
4
|
+
data.tar.gz: f0295f181f0e4ddb39690e8c9ab3edb577aed630
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f61912b33e14323fac6f3362ba668188d0753abdf864861868f031c1f53519114e394228871a82ba3c1c57fbade29f0b7f40680ba5bfd8c4939cefe7cbaf28eb
|
7
|
+
data.tar.gz: 8cb23366a7cbff74d9fd1e29647ce88deb976bc787c1d566f74a5fb454ea7b6e8c0e9852841b1576bec391276b57dafe7ba2d8367cdfd58be251423a8570e554
|
data/Gemfile.lock
CHANGED
data/lib/plunk/result_set.rb
CHANGED
@@ -40,24 +40,22 @@ module Plunk
|
|
40
40
|
|
41
41
|
# merges multiple queries with implicit AND
|
42
42
|
def self.merge(result_sets)
|
43
|
-
|
43
|
+
first = result_sets.delete_at 0
|
44
44
|
|
45
|
-
|
46
|
-
|
45
|
+
first.query[:query][:filtered][:filter] ||= {}
|
46
|
+
first.query[:query][:filtered][:filter][:and] ||= []
|
47
47
|
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
base.query[:query][:filtered][:filter][:and] <<
|
48
|
+
result_sets.each do |result_set|
|
49
|
+
first.query[:query][:filtered][:filter][:and] <<
|
52
50
|
result_set.query[:query][:filtered][:query]
|
53
51
|
|
54
52
|
if result_set.query[:query][:filtered][:filter]
|
55
|
-
|
53
|
+
first.query[:query][:filtered][:filter][:and] +=
|
56
54
|
result_set.query[:query][:filtered][:filter][:and]
|
57
55
|
end
|
58
56
|
end
|
59
57
|
|
60
|
-
|
58
|
+
first
|
61
59
|
end
|
62
60
|
end
|
63
61
|
end
|
data/plunk.gemspec
CHANGED