improve tests and ext with integer type

Author: iskyd

ext/WasabiPostgreSQLExt.jl

@@ -6,7 +6,7 @@ using LibPQ
 using Mocking
 using Dates
 
-Wasabi.mapping(db::Type{LibPQ.Connection}, t::Type{Int64}) = "INTEGER"
+Wasabi.mapping(db::Type{LibPQ.Connection}, t::Type{T}) where{T<:Integer} = "INTEGER"
 Wasabi.mapping(db::Type{LibPQ.Connection}, t::Type{String}) = "TEXT"
 Wasabi.mapping(db::Type{LibPQ.Connection}, t::Type{Bool}) = "BOOLEAN"
 Wasabi.mapping(db::Type{LibPQ.Connection}, t::Type{Float64}) = "REAL"

ext/WasabiSQLiteExt.jl

@@ -6,7 +6,7 @@ using DataFrames
 using Mocking
 using Dates
 
-Wasabi.mapping(db::Type{SQLite.DB}, t::Type{Int64}) = "INTEGER"
+Wasabi.mapping(db::Type{SQLite.DB}, t::Type{T}) where{T<:Integer} = "INTEGER"
 Wasabi.mapping(db::Type{SQLite.DB}, t::Type{String}) = "TEXT"
 Wasabi.mapping(db::Type{SQLite.DB}, t::Type{Bool}) = "INTEGER"
 Wasabi.mapping(db::Type{SQLite.DB}, t::Type{Float64}) = "REAL"

test/colnames.jl

@@ -1,4 +1,4 @@
 @testset "colnames" begin
-    @test Wasabi.colnames(User) == Symbol[:id, :name, :created_at, :roles]
+    @test Wasabi.colnames(User) == Symbol[:id, :name, :created_at, :roles, :profile]
     @test Wasabi.colnames(Role) == Symbol[:id, :name, :user_id]
 end

test/coltype.jl

@@ -1,5 +1,5 @@
 @testset "coltype" begin
-    @test Wasabi.coltype(User, :id) == Int
+    @test Wasabi.coltype(User, :id) == Integer
     @test Wasabi.coltype(User, :name) == String
     @test Wasabi.coltype(User, :created_at) == DateTime
 end

test/model.jl

@@ -2,8 +2,13 @@
     using DataFrames
 
     u = User("John", now())
+    @test Wasabi.model2tuple(u) == ((:id, nothing), (:name, "John"), (:created_at, u.created_at), (:roles, Role[]), (:profile, nothing))
 
-    @test Wasabi.model2tuple(u) == ((:id, nothing), (:name, "John"), (:created_at, u.created_at), (:roles, Role[]))
+    Base.:(==)(a::Role, b::Role) = a.name == b.name && a.user_id == b.user_id && a.id == b.id
+    Base.:(==)(a::UserProfile, b::UserProfile) = a.bio == b.bio && a.user_id == b.user_id && a.id == b.id
+
+    u = User("John", now(), [Role("admin", 1), Role("user", 1)], UserProfile(1, "bio"))
+    @test Wasabi.model2tuple(u) == ((:id, nothing), (:name, "John"), (:created_at, u.created_at), (:roles, Role[Role("admin", 1), Role("user", 1)]), (:profile, UserProfile(1, "bio")))
 
     df = DataFrame(id = [1, 2, 3], name = ["John", "Jane", "Joe"], created_at = [now(), now(), now()])
     models = Wasabi.df2model(User, df)

test/postgresql.jl

@@ -11,6 +11,7 @@
     conn = Wasabi.connect(configuration)
 
     @test Wasabi.mapping(LibPQ.Connection, Int64) == "INTEGER"
+    @test Wasabi.mapping(LibPQ.Connection, Int32) == "INTEGER"
     @test Wasabi.mapping(LibPQ.Connection, String) == "TEXT"
     @test Wasabi.mapping(LibPQ.Connection, Bool) == "BOOLEAN"
     @test Wasabi.mapping(LibPQ.Connection, Float64) == "REAL"

test/runtests.jl

@@ -9,21 +9,31 @@ using Mocking
 Random.seed!(42)
 
 mutable struct Role <: Wasabi.Model
-    id::Union{Nothing, Int}
+    id::Union{Nothing, Integer}
     name::String
+    user_id::Integer
+
+    Role(name::String, user_id::Integer) = new(nothing, name, user_id)
+end
+
+mutable struct UserProfile <: Wasabi.Model
+    id::Union{Nothing, Int}
     user_id::Int
+    bio::Union{String,Nothing}
 
-    Role(name::String, user_id::Int) = new(nothing, name, user_id)
+    UserProfile(user_id::Integer, bio::Union{String,Nothing}) = new(nothing, user_id, bio)
+    UserProfile(id::Integer, user_id::Integer, bio::Union{String,Nothing}) = new(id, user_id, bio)
 end
 
 mutable struct User <: Wasabi.Model
-    id::Union{Nothing, Int}
+    id::Union{Nothing, Integer}
     name::String
     created_at::DateTime
     roles::Vector{Role}
+    profile::Union{Nothing, UserProfile}
 
-    User(name::String, created_at::DateTime, roles::Vector{Role} = Role[]) = new(nothing, name, created_at, roles)
-    User(id::Number, name::String, created_at::DateTime, roles::Vector{Role} = Role[]) = new(id, name, created_at, roles)
+    User(name::String, created_at::DateTime, roles::Vector{Role} = Role[], profile::Union{Nothing, UserProfile} = nothing) = new(nothing, name, created_at, roles, profile)
+    User(id::Integer, name::String, created_at::DateTime, roles::Vector{Role} = Role[]) = new(id, name, created_at, roles, nothing)
 end
 
 # struct UserProfile <: Wasabi.Model
@@ -41,7 +51,7 @@ end
 Wasabi.primary_key(m::Type{User}) = Wasabi.PrimaryKeyConstraint(Symbol[:id])
 Wasabi.primary_key(m::Type{Role}) = Wasabi.PrimaryKeyConstraint(Symbol[:id])
 Wasabi.foreign_keys(m::Type{Role}) = [Wasabi.ForeignKeyConstraint(Symbol[:user_id], :user, Symbol[:id])]
-Wasabi.exclude_fields(m::Type{User}) = [:roles]
+Wasabi.exclude_fields(m::Type{User}) = [:roles, :profile]
 
 # Wasabi.primary_key(m::Type{UserProfile}) = Wasabi.PrimaryKeyConstraint(Symbol[:id])
 

test/sqlite.jl

@@ -5,6 +5,7 @@
     conn = Wasabi.connect(configuration)
 
     @test Wasabi.mapping(SQLite.DB, Int64) == "INTEGER"
+    @test Wasabi.mapping(SQLite.DB, Int32) == "INTEGER"
     @test Wasabi.mapping(SQLite.DB, String) == "TEXT"
     @test Wasabi.mapping(SQLite.DB, Bool) == "INTEGER"
     @test Wasabi.mapping(SQLite.DB, Float64) == "REAL"