From 9bc0713f79f9eb6aea7e4058a5fc2441350af665 Mon Sep 17 00:00:00 2001 From: Maas-Maarten Zeeman Date: Sun, 1 Feb 2015 13:40:06 +0100 Subject: [PATCH] Better version check --- c_src/esqlite3_nif.c | 2 +- rebar.config | 6 ++++-- test/esqlite_test.erl | 15 +++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/c_src/esqlite3_nif.c b/c_src/esqlite3_nif.c index 72daa31..22c6991 100644 --- a/c_src/esqlite3_nif.c +++ b/c_src/esqlite3_nif.c @@ -22,8 +22,8 @@ #include #include -#include "queue.h" #include "sqlite3.h" +#include "queue.h" #define MAX_ATOM_LENGTH 255 /* from atom.h, not exposed in erlang include */ #define MAX_PATHNAME 512 /* unfortunately not in sqlite.h. */ diff --git a/rebar.config b/rebar.config index c2b21b4..1c400ae 100644 --- a/rebar.config +++ b/rebar.config @@ -1,5 +1,7 @@ {require_min_otp_vsn, "R14"}. {port_env, [ - {"CFLAGS", "$CFLAGS -DSQLITE_THREADSAFE=1 -DSQLITE_USE_URI -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS"}]}. + {"CFLAGS", "$CFLAGS -DSQLITE_THREADSAFE=1 -DSQLITE_USE_URI -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS"} +]}. {port_specs, [ - {"priv/esqlite3_nif.so", ["c_src/*.c"]}]}. + {"priv/esqlite3_nif.so", ["c_src/esqlite3_nif.c", "c_src/queue.c", "c_src/sqlite3.c"]} +]}. diff --git a/test/esqlite_test.erl b/test/esqlite_test.erl index b76828c..7776b71 100644 --- a/test/esqlite_test.erl +++ b/test/esqlite_test.erl @@ -298,14 +298,13 @@ sqlite_version_test() -> {ok, Db} = esqlite3:open(":memory:"), {ok, Stmt} = esqlite3:prepare("select sqlite_version() as sqlite_version;", Db), {sqlite_version} = esqlite3:column_names(Stmt), - {row, {<<"3.8.8.2">>}} = esqlite3:step(Stmt), + ?assertEqual({row, {<<"3.8.8.2">>}}, esqlite3:step(Stmt)), ok. - - - - - - - +sqlite_source_id_test() -> + {ok, Db} = esqlite3:open(":memory:"), + {ok, Stmt} = esqlite3:prepare("select sqlite_source_id() as sqlite_source_id;", Db), + {sqlite_source_id} = esqlite3:column_names(Stmt), + ?assertEqual({row, {<<"2015-01-30 14:30:45 7757fc721220e136620a89c9d28247f28bbbc098">>}}, esqlite3:step(Stmt)), + ok.