Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add strict option to create_table! and load! #343

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add strict option to create_table! and load! #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9ee406
add strict option to create_table! and load!
aplavin Dec 31, 2024
6ccd9b6
Update runtests.jl
aplavin Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/tables.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ function DBInterface.execute(
end

"""
SQLite.createtable!(db::SQLite.DB, table_name, schema::Tables.Schema; temp=false, ifnotexists=true)
SQLite.createtable!(db::SQLite.DB, table_name, schema::Tables.Schema; temp=false, ifnotexists=true, strict=false)

Create a table in `db` with name `table_name`, according to `schema`, which is a set of column names and types, constructed like `Tables.Schema(names, types)`
where `names` can be a vector or tuple of String/Symbol column names, and `types` is a vector or tuple of sqlite-compatible types (`Int`, `Float64`, `String`, or unions of `Missing`).
Expand All @@ -193,6 +193,7 @@ function createtable!(
::Tables.Schema{names,types};
temp::Bool = false,
ifnotexists::Bool = true,
strict::Bool = false
) where {names,types}
temp = temp ? "TEMP" : ""
ifnotexists = ifnotexists ? "IF NOT EXISTS" : ""
Expand All @@ -203,7 +204,7 @@ function createtable!(
sqlitetype(types !== nothing ? fieldtype(types, i) : Any),
) for i in eachindex(names)
]
sql = "CREATE $temp TABLE $ifnotexists $(esc_id(string(name))) ($(join(columns, ',')))"
sql = "CREATE $temp TABLE $ifnotexists $(esc_id(string(name))) ($(join(columns, ','))) $(strict ? "STRICT" : "")"
return execute(db, sql)
end

Expand Down Expand Up @@ -303,6 +304,7 @@ function load!(
st = nothing;
temp::Bool = false,
ifnotexists::Bool = false,
strict::Bool = false,
on_conflict::Union{String,Nothing} = nothing,
replace::Bool = false,
analyze::Bool = false,
Expand All @@ -313,7 +315,7 @@ function load!(
if db_tableinfo !== nothing
checknames(sch, db_tableinfo.name)
else
createtable!(db, name, sch; temp = temp, ifnotexists = ifnotexists)
createtable!(db, name, sch; temp = temp, ifnotexists = ifnotexists, strict = strict)
end
# build insert statement
columns = join(esc_id.(string.(sch.names)), ",")
Expand Down
12 changes: 12 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,18 @@ end
@test_throws SQLiteException SQLite.load!(tbl3, db, "data")
end

@testset "PR #343: strict (and only strict) tables should error if types don't match" begin
db = SQLite.DB()

tbl1 = (a = [1, 2, 3], b = [4, 5, 6])
SQLite.load!(tbl1, db, "data_default")
SQLite.load!(tbl1, db, "data_strict", strict=true)

tbl2 = (a = ["a", "b", "c"], b=[7, 8, 9])
SQLite.load!(tbl2, db, "data_default")
@test_throws SQLiteException SQLite.load!(tbl2, db, "data_strict")
end

@testset "Test busy_timeout" begin
db = SQLite.DB()
@test SQLite.busy_timeout(db, 300) == 0
Expand Down
Loading