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

Add support for decoding using column names #17

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
22 changes: 22 additions & 0 deletions src/sqlight.gleam
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,20 @@ pub fn query(
Ok(rows)
}

pub fn query_entries(
sql: String,
on connection: Connection,
with arguments: List(Value),
expecting decoder: Decoder(t),
) -> Result(List(t), Error) {
use rows <- result.then(run_query_entries(sql, connection, arguments))
use rows <- result.then(
list.try_map(over: rows, with: fn(row) { decode.run(row, decoder) })
|> result.map_error(decode_error),
)
Ok(rows)
}

@external(erlang, "sqlight_ffi", "query")
@external(javascript, "./sqlight_ffi.js", "query")
fn run_query(
Expand All @@ -397,6 +411,14 @@ fn run_query(
c: List(Value),
) -> Result(List(Dynamic), Error)

@external(erlang, "sqlight_ffi", "query_entries")
@external(javascript, "./sqlight_ffi.js", "query_entries")
fn run_query_entries(
a: String,
b: Connection,
c: List(Value),
) -> Result(List(Dynamic), Error)

@external(erlang, "sqlight_ffi", "coerce_value")
@external(javascript, "./sqlight_ffi.js", "coerce_value")
fn coerce_value(a: a) -> Value
Expand Down
13 changes: 12 additions & 1 deletion src/sqlight_ffi.erl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-module(sqlight_ffi).

-export([
status/0, query/3, exec/2, coerce_value/1, coerce_blob/1, null/0, open/1, close/1
status/0, query/3, query_entries/3, exec/2, coerce_value/1, coerce_blob/1, null/0, open/1, close/1
]).

open(Name) ->
Expand All @@ -24,6 +24,17 @@ query(Sql, Connection, Arguments) when is_binary(Sql) ->
Rows -> {ok, lists:map(fun erlang:list_to_tuple/1, Rows)}
end.

query_entries(Sql, Connection, Arguments) when is_binary(Sql) ->
case esqlite3:prepare(Connection, Sql, Arguments) of
{error, Code} -> to_error(Connection, Code);
{ok, Stmt} ->
ColumnNames = esqlite3:column_names(Stmt),
case esqlite3:fetchall(Stmt) of
{error, Code} -> to_error(Connection, Code);
Rows -> {ok, lists:map(fun(Row) -> maps:from_list(lists:zip(ColumnNames, Row)) end, Rows)}
end
end.

exec(Sql, Connection) ->
case esqlite3:exec(Connection, Sql) of
{error, Code} -> to_error(Connection, Code);
Expand Down
10 changes: 10 additions & 0 deletions src/sqlight_ffi.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@ export function query(sql, connection, parameters) {
return new Ok(List.fromArray(rows));
}

export function query_entries(sql, connection, parameters) {
let rows;
try {
rows = connection.queryEntries(sql, parameters.toArray());
} catch (error) {
return convert_error(error);
}
return new Ok(List.fromArray(rows));
}

export function null_() {
return undefined;
}
Expand Down
10 changes: 10 additions & 0 deletions test/sqlight_test.gleam
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ pub fn query_2_test() {
)
}

pub fn query_entries_test() {
use conn <- connect()
let assert Ok([#(1337, "wibble")]) =
sqlight.query_entries("select 1337 as col_a, 'wibble' as col_b", conn, [], {
use col_b <- decode.field("col_b", decode.string)
use col_a <- decode.field("col_a", decode.int)
decode.success(#(col_a, col_b))
})
}

pub fn bind_int_test() {
use conn <- connect()
let assert Ok([12_345]) =
Expand Down