Fix #164 by making sure we check the return code from binding values and also make sure we reset a statement when it errors

Author: quinnj

src/SQLite.jl

@@ -13,6 +13,7 @@ include("api.jl")
 # Normal constructor from filename
 sqliteopen(file, handle) = sqlite3_open(file, handle)
 sqliteerror(db) = throw(SQLiteException(unsafe_string(sqlite3_errmsg(db.handle))))
+sqliteexception(db) = SQLiteException(unsafe_string(sqlite3_errmsg(db.handle)))
 
 """
 represents an SQLite database, either backed by an on-disk file or in-memory
@@ -138,14 +139,14 @@ function bind!(stmt::Stmt,name::AbstractString, val)
     end
     return bind!(stmt, i, val)
 end
-bind!(stmt::Stmt, i::Int, val::AbstractFloat)  = (stmt.params[i] = val; sqlite3_bind_double(stmt.handle, i ,Float64(val)); return nothing)
-bind!(stmt::Stmt, i::Int, val::Int32)          = (stmt.params[i] = val; sqlite3_bind_int(stmt.handle, i ,val); return nothing)
-bind!(stmt::Stmt, i::Int, val::Int64)          = (stmt.params[i] = val; sqlite3_bind_int64(stmt.handle, i ,val); return nothing)
-bind!(stmt::Stmt, i::Int, val::Missing)        = (stmt.params[i] = val; sqlite3_bind_null(stmt.handle, i ); return nothing)
-bind!(stmt::Stmt, i::Int, val::AbstractString) = (stmt.params[i] = val; sqlite3_bind_text(stmt.handle, i ,val); return nothing)
-bind!(stmt::Stmt, i::Int, val::WeakRefString{UInt8})   = (stmt.params[i] = val; sqlite3_bind_text(stmt.handle, i, val.ptr, val.len); return nothing)
-bind!(stmt::Stmt, i::Int, val::WeakRefString{UInt16})  = (stmt.params[i] = val; sqlite3_bind_text16(stmt.handle, i, val.ptr, val.len*2); return nothing)
-bind!(stmt::Stmt, i::Int, val::Vector{UInt8})  = (stmt.params[i] = val; sqlite3_bind_blob(stmt.handle, i, val); return nothing)
+bind!(stmt::Stmt, i::Int, val::AbstractFloat)  = (stmt.params[i] = val; @CHECK stmt.db sqlite3_bind_double(stmt.handle, i ,Float64(val)); return nothing)
+bind!(stmt::Stmt, i::Int, val::Int32)          = (stmt.params[i] = val; @CHECK stmt.db sqlite3_bind_int(stmt.handle, i ,val); return nothing)
+bind!(stmt::Stmt, i::Int, val::Int64)          = (stmt.params[i] = val; @CHECK stmt.db sqlite3_bind_int64(stmt.handle, i ,val); return nothing)
+bind!(stmt::Stmt, i::Int, val::Missing)        = (stmt.params[i] = val; @CHECK stmt.db sqlite3_bind_null(stmt.handle, i ); return nothing)
+bind!(stmt::Stmt, i::Int, val::AbstractString) = (stmt.params[i] = val; @CHECK stmt.db sqlite3_bind_text(stmt.handle, i ,val); return nothing)
+bind!(stmt::Stmt, i::Int, val::WeakRefString{UInt8})   = (stmt.params[i] = val; @CHECK stmt.db sqlite3_bind_text(stmt.handle, i, val.ptr, val.len); return nothing)
+bind!(stmt::Stmt, i::Int, val::WeakRefString{UInt16})  = (stmt.params[i] = val; @CHECK stmt.db sqlite3_bind_text16(stmt.handle, i, val.ptr, val.len*2); return nothing)
+bind!(stmt::Stmt, i::Int, val::Vector{UInt8})  = (stmt.params[i] = val; @CHECK stmt.db sqlite3_bind_blob(stmt.handle, i, val); return nothing)
 # Fallback is BLOB and defaults to serializing the julia value
 
 # internal wrapper mutable struct to, in-effect, mark something which has been serialized
@@ -248,7 +249,9 @@ function execute!(stmt::Stmt)
     if r == SQLITE_DONE
         sqlite3_reset(stmt.handle)
     elseif r != SQLITE_ROW
-        sqliteerror(stmt.db)
+        e = sqliteexception(stmt.db)
+        sqlite3_reset(stmt.handle)
+        throw(e)
     end
     return r
 end

test/runtests.jl

@@ -2,13 +2,29 @@ using SQLite
 using Test, Dates, Random, WeakRefStrings, Tables, DataFrames
 
 import Base: +, ==
+mutable struct Point{T}
+    x::T
+    y::T
+end
+==(a::Point, b::Point) = a.x == b.x && a.y == b.y
+
+mutable struct Point3D{T<:Number}
+    x::T
+    y::T
+    z::T
+end
+==(a::Point3D, b::Point3D) = a.x == b.x && a.y == b.y && a.z == b.z
++(a::Point3D, b::Point3D) = Point3D(a.x + b.x, a.y + b.y, a.z + b.z)
+
 
 dbfile = joinpath(dirname(pathof(SQLite)),"../test/Chinook_Sqlite.sqlite")
 dbfile2 = joinpath(tempdir(), "test.sqlite")
 cp(dbfile, dbfile2; force=true)
 chmod(dbfile2, 0o777)
 db = SQLite.DB(dbfile2)
 
+@testset "SQLite" begin
+
 # regular SQLite tests
 ds = SQLite.Query(db, "SELECT name FROM sqlite_master WHERE type='table';") |> columntable
 @test length(ds) == 1
@@ -175,13 +191,7 @@ SQLite.Query(db, "CREATE TABLE points (x INT, y INT, z INT)")
 SQLite.Query(db, "INSERT INTO points VALUES (?, ?, ?)"; values=[1, 2, 3])
 SQLite.Query(db, "INSERT INTO points VALUES (?, ?, ?)"; values=[4, 5, 6])
 SQLite.Query(db, "INSERT INTO points VALUES (?, ?, ?)"; values=[7, 8, 9])
-mutable struct Point3D{T<:Number}
-    x::T
-    y::T
-    z::T
-end
-==(a::Point3D, b::Point3D) = a.x == b.x && a.y == b.y && a.z == b.z
-+(a::Point3D, b::Point3D) = Point3D(a.x + b.x, a.y + b.y, a.z + b.z)
+
 sumpoint(p::Point3D, x, y, z) = p + Point3D(x, y, z)
 SQLite.register(db, Point3D(0, 0, 0), sumpoint)
 r = SQLite.Query(db, "SELECT sumpoint(x, y, z) FROM points") |> DataFrame
@@ -236,11 +246,7 @@ r = SQLite.Query(binddb, "SELECT * FROM temp") |> DataFrame
 SQLite.Query(binddb, "CREATE TABLE blobtest (a BLOB, b BLOB)")
 SQLite.Query(binddb, "INSERT INTO blobtest VALUES (?1, ?2)"; values=Any[b"a", b"b"])
 SQLite.Query(binddb, "INSERT INTO blobtest VALUES (?1, ?2)"; values=Any[b"a", BigInt(2)])
-mutable struct Point{T}
-    x::T
-    y::T
-end
-==(a::Point, b::Point) = a.x == b.x && a.y == b.y
+
 p1 = Point(1, 2)
 p2 = Point(1.3, 2.4)
 SQLite.Query(binddb, "INSERT INTO blobtest VALUES (?1, ?2)"; values=Any[b"a", p1])
@@ -276,3 +282,15 @@ GC.gc() # this MUST NOT garbage collect any of the bound values
 SQLite.clear!(stmt)
 GC.gc() # this will garbage collect the no longer bound values
 @test isempty(wkdict)
+
+db = SQLite.DB()
+SQLite.execute!(db, "CREATE TABLE T (a TEXT, PRIMARY KEY (a))")
+
+q = SQLite.Stmt(db, "INSERT INTO T VALUES(?)")
+SQLite.bind!(q, 1, "a")
+SQLite.execute!(q)
+
+SQLite.bind!(q, 1, "a")
+@test_throws SQLite.SQLiteException SQLite.execute!(q)
+
+end #@testset