Add extension loading: https://github.com/mmzeeman/esqlite/pull/32/files

Author: connor rigby

c_src/esqlite3_nif.c

@@ -60,7 +60,8 @@ typedef enum {
     cmd_column_types,
     cmd_close,
     cmd_stop,
-    cmd_insert
+    cmd_insert,
+    cmd_enable_load_extension
 } command_type;
 
 typedef struct {
@@ -625,6 +626,14 @@ do_column_types(ErlNifEnv *env, sqlite3_stmt *stmt)
     enif_free(array);
     return column_types;
 }
+static ERL_NIF_TERM
+do_enable_extension(ErlNifEnv *env, esqlite_connection *conn, const ERL_NIF_TERM arg)
+{
+    int rc = sqlite3_enable_load_extension(conn->db, 1);
+    if(rc != SQLITE_OK)
+        return make_sqlite3_error_tuple(env, rc, conn->db);
+    return make_atom(env, "ok");
+}
 
 static ERL_NIF_TERM
 do_close(ErlNifEnv *env, esqlite_connection *conn, const ERL_NIF_TERM arg)
@@ -673,6 +682,8 @@ evaluate_command(esqlite_command *cmd, esqlite_connection *conn)
 	    return do_close(cmd->env, conn, cmd->arg);
 	case cmd_insert:
 	    return do_insert(cmd->env, conn, cmd->arg);
+  case cmd_enable_load_extension:
+      return do_enable_extension(cmd->env, conn, cmd->arg);
     default:
 	    return make_error_tuple(cmd->env, "invalid_command");
     }
@@ -1144,6 +1155,34 @@ esqlite_column_types(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
     return push_command(env, conn, cmd);
 }
 
+/*
+* Enable extension loading
+*/
+static ERL_NIF_TERM
+esqlite_enable_load_extension(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{
+   esqlite_connection *conn;
+   esqlite_command *cmd = NULL;
+   ErlNifPid pid;
+
+   if(!enif_get_resource(env, argv[0], esqlite_connection_type, (void **) &conn))
+    return enif_make_badarg(env);
+   if(!enif_is_ref(env, argv[1]))
+    return make_error_tuple(env, "invalid_ref");
+   if(!enif_get_local_pid(env, argv[2], &pid))
+    return make_error_tuple(env, "invalid_pid");
+
+   cmd = command_create();
+   if(!cmd)
+    return make_error_tuple(env, "command_create_failed");
+
+   cmd->type = cmd_enable_load_extension;
+   cmd->ref = enif_make_copy(cmd->env, argv[1]);
+   cmd->pid = pid;
+
+   return push_command(env, conn, cmd);
+}
+
 /*
  * Close the database
  */
@@ -1220,7 +1259,8 @@ static ErlNifFunc nif_funcs[] = {
     {"bind", 5, esqlite_bind},
     {"column_names", 4, esqlite_column_names},
     {"column_types", 4, esqlite_column_types},
-    {"close", 3, esqlite_close}
+    {"close", 3, esqlite_close},
+    {"enable_load_extension", 3, esqlite_enable_load_extension}
 };
 
 ERL_NIF_INIT(Elixir.Esqlite3Nif, nif_funcs, on_load, on_reload, on_upgrade, NULL);

erl_test/esqlite_test.erl

@@ -299,6 +299,17 @@ map_test() ->
 
     ok.
 
+enable_load_extension_test() ->
+    {ok, Db} = esqlite3:open(":memory:"),
+    ?assertEqual(ok, esqlite3:enable_load_extension(Db)),
+    ok.
+
+extension_use_test() ->
+    {ok, Db} = esqlite3:open(":memory:"),
+    ok = esqlite3:exec("create virtual table test_table using fts3(content text);", Db),
+    ok.
+
+
 error1_msg_test() ->
     {ok, Db} = esqlite3:open(":memory:"),
 

erl_test/test_helper.exs

@@ -1,2 +1,5 @@
 :code.ensure_loaded(:esqlite_test)
-:esqlite_test.test()
+case :esqlite_test.test() do
+  :error -> System.halt(1)
+  other -> other
+end

lib/esqlite3/esqlite3.ex

@@ -201,6 +201,19 @@ defmodule Esqlite3 do
     receive_answer(ref, timeout)
   end
 
+  @doc "Enable the database to load extensions"
+  @spec enable_load_extension(connection) :: :ok | error_tup2
+  def enable_load_extension(connection), do: enable_load_extension(connection, @default_timeout)
+
+  @doc "Enable the database to load extensions"
+  @spec enable_load_extension(connection, timeout) :: :ok | error_tup2
+  def enable_load_extension(connection, timeout)
+  def enable_load_extension({:connection, _ref, connection}, timeout) do
+    ref = make_ref()
+    :ok = Esqlite3Nif.enable_load_extension(connection, ref, self())
+    receive_answer(ref, timeout)
+  end
+
   @doc "Execute a sql statement, returns a list with tuples."
   def q(sql, connection), do: q(sql, [], connection)
 

lib/esqlite3/esqlite3_nif.ex

@@ -83,6 +83,10 @@ defmodule Esqlite3Nif do
   @spec insert(connection, reference, pid, sql) :: :ok | error_tup2
   def insert(_db, _ref, _dest, _sql), do: :erlang.nif_error(:nif_library_not_loaded)
 
+  @doc "Enable extension loading."
+  @spec enable_load_extension(connection, reference, pid) :: :ok | error_tup2
+  def enable_load_extension(_db, _ref, _dest), do: :erlang.nif_error(:nif_library_not_loaded)
+
   @on_load :load_nif
   @doc false
   def load_nif do

lib/esqlite3/esqlite_erlang_def.ex

@@ -1,6 +1,7 @@
 defmodule :esqlite3 do
   defdelegate open(filename), to: Esqlite3
-  defdelegate open(filename, timeout), to: Esqlite3
+  defdelegate open(filename, flags), to: Esqlite3
+  defdelegate open(filename, flags, timeout), to: Esqlite3
   defdelegate exec(sql, connection), to: Esqlite3
   defdelegate exec(sql, params, connection), to: Esqlite3
   defdelegate changes(connection), to: Esqlite3
@@ -19,6 +20,8 @@ defmodule :esqlite3 do
   defdelegate column_names(statement, timeout), to: Esqlite3
   defdelegate column_types(statement), to: Esqlite3
   defdelegate column_types(statement, timeout), to: Esqlite3
+  defdelegate enable_load_extension(connection), to: Esqlite3
+  defdelegate enable_load_extension(connection, timeout), to: Esqlite3
   defdelegate close(connection), to: Esqlite3
   defdelegate close(connection, timeout), to: Esqlite3
   defdelegate fetchone(statement), to: Esqlite3

test/esqlite3/esqlite3_test.exs

@@ -23,6 +23,12 @@ defmodule Esqlite3Test do
       Esqlite3.exec("create table test_table(one varchar(10), two int);", db)
   end
 
+  test "enable loadable extensions" do
+    {:ok, db} = Esqlite3.open(":memory:")
+    assert match?(:ok, Esqlite3.enable_load_extension(db))
+    :ok = Esqlite3.exec("create virtual table test_table using fts3(content text);", db)
+  end
+
   test "simple query" do
     {:ok, db} = Esqlite3.open(":memory:")
     :ok = Esqlite3.exec("begin;", db)