From 51ea6d29be386c4db52291d990bc2c0d16fc611b Mon Sep 17 00:00:00 2001 From: Maas-Maarten Zeeman Date: Sat, 28 May 2022 14:28:58 +0200 Subject: [PATCH] Removed unused stuff --- c_src/esqlite3_nif.c | 7 ------- src/esqlite3.erl | 31 ++++++------------------------- test/esqlite_test.erl | 2 +- 3 files changed, 7 insertions(+), 33 deletions(-) diff --git a/c_src/esqlite3_nif.c b/c_src/esqlite3_nif.c index 69cec18..9e3575e 100644 --- a/c_src/esqlite3_nif.c +++ b/c_src/esqlite3_nif.c @@ -25,7 +25,6 @@ #include #define MAX_ATOM_LENGTH 255 /* from atom.h, not exposed in erlang include */ -#define MAX_SQLITE_NAME_LENGTH 255 /* Maximum name length. Using longer will return misuse */ #define MAX_PATHNAME 512 /* unfortunately not in sqlite.h. */ static ErlNifResourceType *esqlite3_type = NULL; @@ -79,12 +78,6 @@ make_error_tuple(ErlNifEnv *env, const char *reason) return enif_make_tuple2(env, make_atom(env, "error"), make_atom(env, reason)); } -static ERL_NIF_TERM -make_row_tuple(ErlNifEnv *env, ERL_NIF_TERM value) -{ - return enif_make_tuple2(env, make_atom(env, "row"), value); -} - static ERL_NIF_TERM make_sqlite3_error_tuple(ErlNifEnv *env, int error_code) { return enif_make_tuple2(env, make_atom(env, "error"), enif_make_int(env, error_code)); diff --git a/src/esqlite3.erl b/src/esqlite3.erl index ea86db8..2834e8e 100644 --- a/src/esqlite3.erl +++ b/src/esqlite3.erl @@ -47,22 +47,19 @@ bind_blob/3, bind_null/2, - bind/2, - step/1, reset/1, interrupt/1, - q/2, q/3, - - fetchone/1, - fetchall/1, - backup_init/4, backup_remaining/1, backup_pagecount/1, backup_step/2, - backup_finish/1 + backup_finish/1, + + bind/2, + q/2, q/3, + fetchall/1 ]). -define(DEFAULT_TIMEOUT, infinity). @@ -76,7 +73,6 @@ }). -record(esqlite3_stmt, { - db :: esqlite3_nif:esqlite3(), stmt :: esqlite3_nif:esqlite3_stmt() }). @@ -203,21 +199,6 @@ q(Connection, Sql, Args) -> %% fetchall %% -%% -%-spec fetchone(statement()) -> tuple(). -fetchone(Statement) -> - case step(Statement) of - Row when is_list(Row) -> - Row; - '$done' -> - ok; - {error, _} = E -> - E - end. -% -%%% @doc Fetch all records -%%% @param Statement is prepared sql statement -%-spec fetchall(statement()) -> list(row()) | {error, _}. fetchall(Statement) -> fetchall1(Statement, []). @@ -327,7 +308,7 @@ prepare(Connection, Sql) -> prepare(#esqlite3{db=Connection}, Sql, PrepareFlags) -> case esqlite3_nif:prepare(Connection, Sql, props_to_prepare_flag(PrepareFlags)) of {ok, Stmt} -> - {ok, #esqlite3_stmt{db=Connection, stmt=Stmt}}; + {ok, #esqlite3_stmt{stmt=Stmt}}; {error, _}=Error -> Error end. diff --git a/test/esqlite_test.erl b/test/esqlite_test.erl index 0f34f60..e7ef48d 100644 --- a/test/esqlite_test.erl +++ b/test/esqlite_test.erl @@ -35,7 +35,7 @@ close_test() -> prepare_test() -> {ok, C} = esqlite3:open(":memory:"), - ?assertMatch({ok, {esqlite3_stmt, _, _}}, esqlite3:prepare(C, "select 1")), + ?assertMatch({ok, {esqlite3_stmt, _}}, esqlite3:prepare(C, "select 1")), ok = esqlite3:close(C), ok.