add any(), all(), haskey()

Author: aplavin

src/dictionary.jl

@@ -24,6 +24,8 @@ Base.keys(d::SQLDictionary) = map(_keyoptic(d), d.coll)
 Dictionaries.issettable(::SQLDictionary) = true
 Dictionaries.isinsertable(::SQLDictionary) = true
 
+Base.haskey(d::SQLDictionary, i) = any((@o _keyoptic(d)(_) == i), d.coll)
+
 function Base.getindex(d::SQLDictionary, i)
     vals = @p filter((@o _keyoptic(d)(_) == i), d.coll) map(_valoptic(d)) first(__, 2) collect
     @assert length(vals) ≤ 1 "Didn't expect multiple values for key $i, got $(length(vals))"

src/readfuncs.jl

@@ -43,6 +43,9 @@ Base.only(dbc::SQLCollection) = first(dbc, 2) |> collect |> only
 
 Base.isempty(dbc::SQLCollection) = first(dbc, 1) |> collect |> isempty
 
+Base.any(pred, dbc::SQLCollection) = !(@p dbc filter(pred) isempty)
+Base.all(pred, dbc::SQLCollection) = @p dbc filter(!pred) isempty
+
 Base.length(dbc::SQLCollection) = count(Returns(true), dbc)
 
 Base.count(pred, dbc::SQLCollection) = @modify(dbc.query) do q

test/runtests.jl

@@ -149,6 +149,12 @@ using TestItemRunner
             length,
             (@f count(Returns(true))),
             (@f count(@o _.i > 7)),
+            (@f any(Returns(true))),
+            (@f any(@o _.i > 7)),
+            (@f any(@o _.i > 100)),
+            (@f all(Returns(true))),
+            (@f all(@o _.i > 7)),
+            (@f all(@o _.i > 100)),
             (@f sort(by=(@o (_.i, -_.j)), rev=true) Iterators.drop(__, 5) first),
             (@f sort(by=(@o (_.i, -_.j)), rev=true) Iterators.drop(__, 5) first(__, 1) only),
             (@f mean(@o _.i)),
@@ -261,11 +267,19 @@ end
         @test first(dct) == (x=1.1, y="def")
 
         @test dct[(a=1, b="a")] == (x=1.1, y="def")
+        @test dct[(b="a", a=1)] == (x=1.1, y="def")
         @test_throws KeyError((a=1, b="c")) dct[(a=1, b="c")]
         @test_throws KeyError((a=1, b="c")) dct[(a=1, b="c")] = (x=1.3, y="ghi")
+        @test_throws AssertionError dct[123]
+        @test_throws AssertionError dct[(a=1, b="c", c="d")]
         dct[(a=1, b="a")] = (x=1.3, y="ghi")
         @test dct[(a=1, b="a")] == (x=1.3, y="ghi")
 
+        @test haskey(dct, (a=1, b="a"))
+        @test !haskey(dct, (a=1, b="c"))
+        @test_throws AssertionError haskey(dct, (a=1, b="c", c="d"))
+        @test_throws AssertionError haskey(dct, 123)
+
         delete!(dct, (a=1, b="a"))
         @test_throws KeyError((a=1, b="a")) delete!(dct, (a=1, b="a"))
         @test collect(dct) == [(x=1.2, y="xyz"), (x=2.1, y="abc")]