Fixes for extension loading

c_src/sqlite3_drv.c

@@ -181,6 +181,9 @@ static int control(
   case CMD_SQL_EXEC_SCRIPT:
     sql_exec_script(driver_data, buf, len);
     break;
+  case CMD_ENABLE_LOAD_EXTENSION:
+    enable_load_extension(driver_data, buf, len);
+    break;
   default:
     unknown(driver_data, buf, len);
   }
@@ -243,6 +246,14 @@ static inline int output_ok(sqlite3_drv_t *drv) {
   return driver_output_term(drv->port, spec, sizeof(spec) / sizeof(spec[0]));
 }
 
+static int enable_load_extension(sqlite3_drv_t* drv, char *buf,
+    int len) {
+  char enable = buf[0];
+  sqlite3_enable_load_extension(drv->db, (int) enable);
+  output_ok(drv);
+  return 0;
+}
+
 static inline async_sqlite3_command *make_async_command_statement(
     sqlite3_drv_t *drv, sqlite3_stmt *statement) {
   async_sqlite3_command *result =

c_src/sqlite3_drv.h

@@ -39,6 +39,7 @@
 #define CMD_PREPARED_FINALIZE 10
 #define CMD_PREPARED_COLUMNS 11
 #define CMD_SQL_EXEC_SCRIPT 12
+#define CMD_ENABLE_LOAD_EXTENSION 13
 
 // Number of bytes for each key
 // (160 bits for SHA1 hash)
@@ -111,7 +112,7 @@ static void sql_exec_async(void *async_command);
 static void sql_free_async(void *async_command);
 static void ready_async(ErlDrvData drv_data, ErlDrvThreadData thread_data);
 static int unknown(sqlite3_drv_t *bdb_drv, char *buf, int len);
-
+static int enable_load_extension(sqlite3_drv_t *drv, char *buf, int len);
 
 #if defined(_MSC_VER)
 #pragma warning(default: 4201)

src/sqlite3.erl

@@ -19,6 +19,7 @@
 -export([open/1, open/2]).
 -export([start_link/1, start_link/2]).
 -export([stop/0, close/1, close_timeout/2]).
+-export([enable_load_extension/2]).
 -export([sql_exec/1, sql_exec/2, sql_exec_timeout/3,
          sql_exec_script/2, sql_exec_script_timeout/3,
          sql_exec/3, sql_exec_timeout/4]).
@@ -152,6 +153,9 @@ close_timeout(Db, Timeout) ->
 stop() ->
     close(?MODULE).
 
+enable_load_extension(Db, Value) ->
+    gen_server:call(Db, {enable_load_extension, Value}).
+
 %%--------------------------------------------------------------------
 %% @doc
 %%   Executes the Sql statement directly.
@@ -913,6 +917,10 @@ handle_call({finalize, Ref}, _From, State = #state{port = Port, refs = Refs}) ->
             NewState = State
     end,
     {reply, Reply, NewState};
+handle_call({enable_load_extension, _Value} = Payload, _From, State = #state{port =
+        Port, refs = _Refs}) ->
+    Reply = exec(Port, Payload),
+    {reply, Reply, State};
 handle_call({Cmd, Ref}, _From, State = #state{port = Port, refs = Refs}) ->
     Reply = case dict:find(Ref, Refs) of
                 {ok, Index} ->
@@ -1011,6 +1019,7 @@ get_priv_dir() ->
 -define(PREPARED_FINALIZE, 10).
 -define(PREPARED_COLUMNS, 11).
 -define(SQL_EXEC_SCRIPT, 12).
+-define(ENABLE_LOAD_EXTENSION, 13).
 
 create_port_cmd(DbFile) ->
     atom_to_list(?DRIVER_NAME) ++ " " ++ DbFile.
@@ -1052,6 +1061,17 @@ exec(Port, {bind, Index, Params}) ->
     Bin = term_to_binary({Index, Params}),
     port_control(Port, ?PREPARED_BIND, Bin),
     wait_result(Port);
+exec(Port, {enable_load_extension, Value}) ->
+    % Payload is 1 if enabling extension loading,
+    % 0 if disabling
+    Payload = case Value of 
+        true -> 1;
+        _ when is_integer(Value) -> Value;
+        false -> 0;
+        _ -> 0
+    end,
+    port_control(Port, ?ENABLE_LOAD_EXTENSION, <<Payload>>),
+    wait_result(Port);
 exec(Port, {Cmd, Index}) when is_integer(Index) ->
     CmdCode = case Cmd of
                   next -> ?PREPARED_STEP;

test/sqlite3_test.erl

@@ -51,7 +51,8 @@ all_test_() ->
       ?FuncTest(unicode),
       ?FuncTest(acc_string_encoding),
       ?FuncTest(large_offset),
-      ?FuncTest(issue13)]}.
+      ?FuncTest(issue13),
+      ?FuncTest(enable_load_extension)]}.
 
 open_db() ->
     sqlite3:open(ct, [in_memory]).
@@ -326,6 +327,9 @@ issue13() ->
 		[{columns, ["foo"]}, {rows, [{255}, {256}]}],
 		sqlite3:sql_exec(ct, "select foo from issue13 where foo > ?;", [128])).
 
+enable_load_extension() ->
+    ?assertEqual(ok, sqlite3:enable_load_extension(ct, 1)).
+
 % create, read, update, delete
 %%====================================================================
 %% Internal functions