cmis-ruby 0.5.23 → 0.5.24
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cmis/utils.rb +5 -11
- data/lib/cmis/version.rb +1 -1
- data/spec/cmis-ruby/utils_spec.rb +2 -2
- 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: 2db6a73373ddd663cb964d85058ec38e53f6ef75
|
4
|
+
data.tar.gz: e8ad9f1d4ccee4a870e0c524f01613512442b708
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5af30254eaa230833c5dceda3b51204161dbbd31473e3a9df3bc8f19e1d4e86052e8010bd54695f5668570400501c626a0218e4641ec44449050fbb831000799
|
7
|
+
data.tar.gz: 562dd6b72efad5db6b7e2caabb3428112975de9404257ac094ec5c6a9cce8d27bf6c76ce99d20c7f94dbfe94e1475d3c12b27b1ebec96417da4cb3fb5d530bcf
|
data/lib/cmis/utils.rb
CHANGED
@@ -15,18 +15,12 @@ module CMIS
|
|
15
15
|
end
|
16
16
|
|
17
17
|
def build
|
18
|
-
|
19
|
-
statement = "select #{@queried_properties} from #{@type_id}"
|
20
|
-
if
|
21
|
-
statement << " join #{
|
18
|
+
@type_id = Array(@type_id)
|
19
|
+
statement = "select #{@queried_properties} from #{@type_id[0]}"
|
20
|
+
if @type_id[1]
|
21
|
+
statement << " join #{@type_id[1]} as X on cmis:objectId = X.cmis:objectId"
|
22
22
|
end
|
23
|
-
clause = @properties.map
|
24
|
-
if v.is_a? Hash
|
25
|
-
v.map { |kk, vv| build_predicate(kk, vv) }
|
26
|
-
else
|
27
|
-
build_predicate(k, v)
|
28
|
-
end
|
29
|
-
end.flatten.join(' and ')
|
23
|
+
clause = @properties.map { |k, v| build_predicate(k, v) }.join(' and ')
|
30
24
|
statement << " where #{clause}" unless clause.empty?
|
31
25
|
statement
|
32
26
|
end
|
data/lib/cmis/version.rb
CHANGED
@@ -11,8 +11,8 @@ module CMIS
|
|
11
11
|
expect(qs('T', {})).to eq 'select * from T'
|
12
12
|
expect(qs('T', foo: 'bar')).to eq "select * from T where foo = 'bar'"
|
13
13
|
expect(qs('T', bar: 'baz', pif: 'poef')).to eq "select * from T where bar = 'baz' and pif = 'poef'"
|
14
|
-
expect(qs('T', foo
|
15
|
-
expect(qs('T', a: 'b', c: 'd',
|
14
|
+
expect(qs(['T', 'foo'], bar: 'baz', pif: 'poef')).to eq "select * from T join foo as X on cmis:objectId = X.cmis:objectId where bar = 'baz' and pif = 'poef'"
|
15
|
+
expect(qs(['T', 'foo'], a: 'b', c: 'd', bar: 'baz', pif: 'poef')).to eq "select * from T join foo as X on cmis:objectId = X.cmis:objectId where a = 'b' and c = 'd' and bar = 'baz' and pif = 'poef'"
|
16
16
|
end
|
17
17
|
end
|
18
18
|
end
|