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.

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

Support DBInterface.jl v2.5 #268

Merged
merged 1 commit into from
Oct 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "SQLite"
uuid = "0aa819cd-b072-5ff4-a722-6bc24af294d9"
authors = ["Jacob Quinn <quinn.jacobd@gmail.com>"]
version = "1.3.0"
version = "1.4.0"

[deps]
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
Expand All @@ -17,7 +17,7 @@ WeakRefStrings = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"

[compat]
BinaryProvider = "0.5"
DBInterface = "2.4"
DBInterface = "2.5"
SQLite_jll = "3"
Tables = "1"
WeakRefStrings = "0.4,0.5,0.6,1"
Expand Down
4 changes: 4 additions & 0 deletions src/SQLite.jl
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ end
# it from the db.stmts collection
_finalize(stmt::Stmt) = DBInterface.close!(stmt)

DBInterface.getconnection(stmt::Stmt) = stmt.db

# explicitly close prepared statement
function DBInterface.close!(stmt::Stmt)
_st = _stmt_safe(stmt)
Expand Down Expand Up @@ -549,6 +551,8 @@ function transaction(db::DB, mode="DEFERRED")
end
end

DBInterface.transaction(f, db::DB) = transaction(f, db)

@inline function transaction(f::Function, db::DB)
# generate a random name for the savepoint
name = string("SQLITE", Random.randstring(10))
Expand Down
2 changes: 1 addition & 1 deletion src/tables.jl
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ function load!(sch::Tables.Schema, rows, db::DB, name::AbstractString, db_tablei
kind = replace ? "REPLACE" : "INSERT"
stmt = _Stmt(db, "$kind INTO $(esc_id(string(name))) ($columns) VALUES ($params)")
# start a transaction for inserting rows
transaction(db) do
DBInterface.transaction(db) do
if row === nothing
state = iterate(rows)
state === nothing && return
Expand Down
12 changes: 12 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -566,4 +566,16 @@ DBInterface.execute(db, "insert into tmp values (?)", (:a,))
tbl = DBInterface.execute(db, "select x from tmp") |> columntable
@test isequal(tbl.x, [missing, :a])

db = SQLite.DB()
DBInterface.execute(db, "create table tmp (a integer, b integer, c integer)")
stmt = DBInterface.prepare(db, "INSERT INTO tmp VALUES(?, ?, ?)")
tbl = (
a = [1, 1, 1],
b = [3, 4, 5],
c = [4, 5, 6]
)
DBInterface.executemany(stmt, tbl)
tbl2 = DBInterface.execute(db, "select * from tmp") |> columntable
@test tbl == tbl2

end