use generators for query results

Author: joshday

src/SQLiteGraph.jl

@@ -151,7 +151,7 @@ end
 Base.getindex(db::DB, ids::AbstractArray{<:Integer}) = getindex.(db, ids)
 function Base.getindex(db::DB, ::Colon)
     res = execute(db, "SELECT props from nodes")
-    [Node(i,row.props) for (i,row) in enumerate(res)]
+    (Node(i,row.props) for (i,row) in enumerate(res))
 end
 function Base.deleteat!(db::DB, id::Integer)
     execute(db, "DELETE FROM nodes WHERE id = ?", (id,))
@@ -166,11 +166,11 @@ function find_nodes(db::DB; kw...)
     end, " AND ")
 
     res = execute(db, "SELECT * FROM nodes WHERE $param")
-    isempty(res) ? nothing : [Node(row...) for row in res]
+    isempty(res) ? nothing : (Node(row...) for row in res)
 end
 function find_nodes(db::DB, r::Regex)
     res = execute(db, "SELECT * FROM nodes WHERE props REGEXP ?", (r.pattern,))
-    isempty(res) ? nothing : [Node(row...) for row in res]
+    isempty(res) ? nothing : (Node(row...) for row in res)
 end
 
 
@@ -191,15 +191,15 @@ function Base.getindex(db::DB, is::AbstractArray{<:Integer}, js::AbstractArray{<
 end
 function Base.getindex(db::DB, i::Integer, ::Colon)
     res = execute(db, "SELECT * FROM edges WHERE source=?", (i,))
-    isempty(res) ? nothing : [Edge(row...) for row in res]
+    isempty(res) ? nothing : (Edge(row...) for row in res)
 end
 function Base.getindex(db::DB, ::Colon, j::Integer)
     res = execute(db, "SELECT * FROM edges WHERE target=?", (j,))
-    isempty(res) ? nothing : [Edge(row...) for row in res]
+    isempty(res) ? nothing : (Edge(row...) for row in res)
 end
 function Base.getindex(db::DB, ::Colon, ::Colon)
     res = execute(db, "SELECT * from edges")
-    isempty(res) ? nothing : [Edge(row...) for row in res]
+    isempty(res) ? nothing : (Edge(row...) for row in res)
 end
 Base.getindex(db::DB, is::AbstractArray{<:Integer}, ::Colon) = filter!(!isnothing, getindex.(db, is, :))
 Base.getindex(db::DB, ::Colon, js::AbstractArray{<:Integer}) = filter!(!isnothing, getindex.(db, :, js))
@@ -217,11 +217,11 @@ function find_edges(db::DB; kw...)
     end, " AND ")
 
     res = execute(db, "SELECT * FROM edges WHERE $param")
-    isempty(res) ? nothing : [Edge(row...) for row in res]
+    isempty(res) ? nothing : (Edge(row...) for row in res)
 end
 function find_edges(db::DB, r::Regex)
     res = execute(db, "SELECT * FROM edges WHERE props REGEXP ?", (r.pattern,))
-    isempty(res) ? nothing : [Edge(row...) for row in res]
+    isempty(res) ? nothing : (Edge(row...) for row in res)
 end
 
 end

test/runtests.jl

@@ -4,24 +4,51 @@ using JSON3
 
 @testset "SQLiteGraph.jl" begin
     db = DB()
+    node1 = (x=1, y=2)
+    node2 = (x=1, y=3)
+    edge1 = (a=1, b=2)
+    edge2 = (a=3, b=4)
+
     @testset "empty DB" begin 
         @test length(db) == 0 
         @test size(db) == (nodes=0, edges=0)
         @test_throws BoundsError db[5]
         @test isnothing(db[1,2])
     end
     @testset "setindex! & getindex" begin
-        db[1] = (x=1, y=2)
-        db[2] = (x=1, y=3)
-        db[1,2] = (a=1, b=2)
+        db[1] = node1
+        db[2] = node2
+        db[1,2] = edge1
+        db[2,1] = edge2
         @test db[1] isa Node{String}
         @test db[2] isa Node{String}
         @test db[1,2] isa Edge{String}
         @testset "getindex Range" begin 
-            @test db[1:2] isa Vector{Node{String}}
-            @test db[1:2][1] == Node(1, JSON3.write((x=1,y=2)))
-            @test db[1:2][2] == Node(2, JSON3.write((x=1,y=3)))
-            @test db[1:2,2] == [Edge(1,2,JSON3.write((a=1,b=2)))]
+            @test collect(db[1:2]) isa Vector{Node{String}}
+            q = collect(db[1:2])
+            @test q[1] == Node(1, JSON3.write(node1))
+            @test q[2] == Node(2, JSON3.write(node2))
+            @test first(db[1:2,2]) == Edge(1,2,JSON3.write(edge1))
         end
     end
+    @testset "find_nodes / find_edges" begin 
+        res = collect(find_nodes(db, y=2))
+        @test length(res) == 1 
+        @test res[1] == Node(1, JSON3.write(node1))
+
+        res = collect(find_nodes(db, r"y"))
+        @test length(res) == 2
+        @test res[1] == Node(1, JSON3.write(node1))
+        @test res[2] == Node(2, JSON3.write(node2))
+
+        res = collect(find_edges(db, a=1))
+        @test length(res) == 1
+        @test res[1] == Edge(1,2, JSON3.write(edge1))
+
+        res = collect(find_edges(db, r"a"))
+        @test length(res) == 2
+        @test res[1] == Edge(1,2, JSON3.write(edge1))
+        @test res[2] == Edge(2,1, JSON3.write(edge2))
+
+    end
 end