some tests

Author: joshday

README.md

@@ -63,11 +63,6 @@ SQLiteGraph.findedges(db, b=2)
 
 SQLiteGraph is **STRONGLY** influenced (much has been copied verbatim) from [https://github.com/dpapathanasiou/simple-graph](https://github.com/dpapathanasiou/simple-graph).  
 
-The differences here are minor, opinionated changes made by `@joshday`:
-
-- Node IDs are `Int`: 1, 2, 3...
-- Both `nodes` and `edges` tables have field `props`
-
 ## TODOs
 
 - Prepare SQL into compiled `SQLite.Stmt`s.

src/SQLiteGraph.jl

@@ -4,7 +4,7 @@ using SQLite: SQLite
 import DBInterface: execute
 using JSON3: JSON3
 
-export DB, ReadAs
+export DB, Node, Edge, find_nodes, find_edges
 
 #-----------------------------------------------------------------------------# utils 
 read_sql(fn::String) = read(joinpath(@__DIR__, "sql", fn), String)
@@ -19,15 +19,24 @@ struct Node{T}
     props::T 
 end
 Node(id::Integer, props=nothing) = Node(id, props)
-Base.show(io::IO, o::Node) = (print(io, "Node($(o.id)) with props: "); show(io, o.props))
+function Base.show(io::IO, o::Node) 
+    print(io, "Node($(o.id)) with props: ")
+    print(io, o.props)
+end
 
 struct Edge{T} 
     source::Int 
     target::Int 
     props::T 
 end
-Base.show(io::IO, o::Edge) = (print(io, "Edge($(o.source) → $(o.target)) with props: "); show(io, o.props))
 Edge(source::Integer, target::Integer, props=nothing) = Edge(source, target, props)
+Edge(T::DataType, e::Edge{<:AbstractString}) = Edge(e.source, e.target, JSON3.read(e.props, T))
+Edge(e::Edge{<:AbstractString}, T::DataType) = Edge(e.source, e.target, JSON3.read(e.props, T))
+function Base.show(io::IO, o::Edge)
+    print(io, "Edge($(o.source) → $(o.target)) with props: ")
+    print(io, o.props)
+end
+
 
 #-----------------------------------------------------------------------------# DB
 """
@@ -61,6 +70,7 @@ struct DB
 
     function DB(file = ":memory:")
         db = SQLite.DB(file)
+        SQLite.@register db SQLite.regexp
         statements = [
             "CREATE TABLE IF NOT EXISTS nodes (
                 id INTEGER NOT NULL UNIQUE, 
@@ -146,8 +156,8 @@ function Base.deleteat!(db::DB, id::Integer)
     execute(db, "DELETE FROM edges WHERE source = ? OR target = ?", (id, id))
     db
 end
-
-function findnodes(db::DB; kw...)
+#-----------------------------------------------------------------------------# find_nodes
+function find_nodes(db::DB; kw...)
     param = join(map(collect(kw)) do kw 
         k, v = kw
         "json_extract(props, '\$.$k') = $v"
@@ -156,6 +166,11 @@ function findnodes(db::DB; kw...)
     res = execute(db, "SELECT * FROM nodes WHERE $param")
     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]
+end
+
 
 #-----------------------------------------------------------------------------# edges
 function Base.setindex!(db::DB, props, i::Integer, j::Integer)
@@ -192,7 +207,8 @@ function Base.deleteat!(db::DB, i::Integer, j::Integer)
     db
 end
 
-function findedges(db::DB; kw...)
+#-----------------------------------------------------------------------------# find_edges
+function find_edges(db::DB; kw...)
     param = join(map(collect(kw)) do kw 
         k, v = kw
         "json_extract(props, '\$.$k') = $v"
@@ -201,5 +217,9 @@ function findedges(db::DB; kw...)
     res = execute(db, "SELECT * FROM edges WHERE $param")
     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]
+end
 
 end

test/runtests.jl

@@ -1,12 +1,27 @@
 using SQLiteGraph
 using Test
+using JSON3
 
 @testset "SQLiteGraph.jl" begin
+    db = DB()
     @testset "empty DB" begin 
-        db = DB()
         @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)
+        @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)))]
+        end
+    end
 end