Merge branch 'master' of git://github.com/quinnj/SQLite.jl

Author: quinnj

README.md

@@ -55,10 +55,12 @@ A Julia interface to the SQLite library and support for operations on DataFrames
 
   Used to execute prepared `SQLiteStmt`. The 2nd method is a convenience method to pass in an SQL statement as a string which gets prepared and executed in one call. This method does not check for or return any results, hence it is only useful for database manipulation methods (i.e. ALTER, CREATE, UPDATE, DROP). To return results, see `query` below. Also consider the `create`, `drop`, and `append` methods for manipulation statements as further SQLite performance tricks are incorporated automatically.
 
-* `query(db::SQLiteDB, sql::String)`
+* `query(db::SQLiteDB, sql::String, values=[])`
 
   An SQL statement `sql` is prepared, executed in the context of `db`, and results, if any, are returned. The return values are a `(String[],Any[])` tuple representing `(column names, result values)`.
 
+  The values in `values` are used in parameter binding (see `bind` above). If your statement uses nameless parameters `values` must be a Vector of the values you wish to bind to your statment. If your statement uses named parameters `values` must be a Dict where the keys are of type String or Symbol. The key must match an identifier name in the statement (the name **does not** include the ':', '@' or '$' prefix). You can not use a dictionary which has Strings *and* Symbols for it's keys.
+
 * `create(db::SQLiteDB,name::String,table::AbstractMatrix,
             colnames=String[],coltypes=DataType[];temp::Bool=false)`
 

src/SQLite.jl

@@ -98,6 +98,26 @@ function Base.close(stmt::SQLiteStmt)
     return
 end
 
+# bind a row to nameless parameters
+function Base.bind(stmt::SQLiteStmt, values::Vector)
+    nparams = sqlite3_bind_parameter_count(stmt.handle)
+    @assert nparams == length(values) "you must provide values for all placeholders"
+    for i in 1:nparams
+        @inbounds bind(stmt, i, values[i])
+    end
+end
+# bind a row to named parameters
+function Base.bind{V}(stmt::SQLiteStmt, values::Dict{Symbol, V})
+    nparams = sqlite3_bind_parameter_count(stmt.handle)
+    @assert nparams == length(values) "you must provide values for all placeholders"
+    for i in 1:nparams
+        name = bytestring(sqlite3_bind_parameter_name(stmt.handle, i))
+        @assert !isempty(name) "nameless parameters should be passed as a tuple"
+        # name is returned with the ':', '@' or '$' at the start
+        name = name[2:end]
+        bind(stmt, i, values[symbol(name)])
+    end
+end
 # Binding parameters to SQL statements
 function Base.bind(stmt::SQLiteStmt,name::String,val)
     i = sqlite3_bind_parameter_index(stmt.handle,name)
@@ -141,8 +161,9 @@ end
 
 sqldeserialize(r) = deserialize(IOBuffer(r))
 
-function query(db::SQLiteDB,sql::String)
+function query(db::SQLiteDB,sql::String, values=[])
     stmt = SQLiteStmt(db,sql)
+    bind(stmt, values)
     status = execute(stmt)
     ncols = sqlite3_column_count(stmt.handle)
     if status == SQLITE_DONE || ncols == 0

src/api.jl

@@ -49,6 +49,21 @@ function sqlite3_finalize(stmt::Ptr{Void})
         Cint, (Ptr{Void},),
         stmt)
 end
+
+# SQLITE_API int sqlite3_bind_paramter_count(sqlite3_stmt*)
+function sqlite3_bind_parameter_count(stmt::Ptr{Void})
+    @NULLCHECK stmt
+    return ccall( (:sqlite3_bind_parameter_count, sqlite3_lib),
+        Cint, (Ptr{Void},),
+        stmt)
+end
+#SQLITE_API const char* sqlite3_bind_parameter_name(sqlite3_stmt*, int)
+function sqlite3_bind_parameter_name(stmt::Ptr{Void}, col::Int)
+    @NULLCHECK stmt
+    return ccall( (:sqlite3_bind_parameter_name, sqlite3_lib),
+        Ptr{Uint8}, (Ptr{Void}, Cint),
+        stmt, col)
+end
 # SQLITE_API int sqlite3_bind_parameter_index(sqlite3_stmt*, const char *zName);
 function sqlite3_bind_parameter_index(stmt::Ptr{Void},value::String)
     @NULLCHECK stmt
@@ -108,8 +123,6 @@ end
 # SQLITE_API int sqlite3_bind_zeroblob(sqlite3_stmt*, int, int n);
 # SQLITE_API int sqlite3_bind_value(sqlite3_stmt*, int, const sqlite3_value*);
 
-# SQLITE_API int sqlite3_bind_parameter_count(sqlite3_stmt*);
-# SQLITE_API const char *sqlite3_bind_parameter_name(sqlite3_stmt*, int);
 # SQLITE_API int sqlite3_clear_bindings(sqlite3_stmt*);
 
 function sqlite3_step(stmt::Ptr{Void})

test/runtests.jl

@@ -104,6 +104,29 @@ if VERSION > v"0.4.0-"
     @test drop(db,"temp") == EMPTY_RESULTSET
 end
 
+query(db,"CREATE TABLE temp AS SELECT * FROM Album")
+r = query(db, "SELECT * FROM temp LIMIT ?", [3])
+@test size(r) == (3,3)
+r = query(db, "SELECT * FROM temp WHERE Title LIKE ?", ["%time%"])
+@test r.values[1] == [76, 111, 187]
+query(db, "INSERT INTO temp VALUES (?1, ?3, ?2)", [0,0,"Test Album"])
+r = query(db, "SELECT * FROM temp WHERE AlbumId = 0")
+@test r == ResultSet(Any["AlbumId", "Title", "ArtistId"], Any[Any[0], Any["Test Album"], Any[0]])
+drop(db, "temp")
+
+# I can't be arsed to create a new one using old dictionary syntax
+if VERSION > v"0.4.0-"
+    query(db,"CREATE TABLE temp AS SELECT * FROM Album")
+    r = query(db, "SELECT * FROM temp LIMIT :a", Dict(:a => 3))
+    @test size(r) == (3,3)
+    r = query(db, "SELECT * FROM temp WHERE Title LIKE @word", Dict(:word => "%time%"))
+    @test r.values[1] == [76, 111, 187]
+    query(db, "INSERT INTO temp VALUES (@lid, :title, \$rid)", Dict(:rid => 0, :lid => 0, :title => "Test Album"))
+    r = query(db, "SELECT * FROM temp WHERE AlbumId = 0")
+    @test r == ResultSet(Any["AlbumId", "Title", "ArtistId"], Any[Any[0], Any["Test Album"], Any[0]])
+    drop(db, "temp")
+end
+
 r = query(db, sr"SELECT LastName FROM Employee WHERE BirthDate REGEXP '^\d{4}-08'")
 @test r.values[1][1] == "Peacock"