Fix merge

This commit is contained in:
Maas-Maarten Zeeman
2022-01-04 11:26:35 +01:00
parent 3cb540a553
commit b8882581ac
4 changed files with 19 additions and 7 deletions

View File

@@ -402,11 +402,11 @@ last_insert_rowid(Connection) ->
%% @doc Get the last insert rowid.
%%
-spec last_insert_rowid(connection(), timeout()) -> {ok, integer()} | {error, _}.
last_insert_rowid({connection, _Ref, Connection}, Timeout) ->
-spec last_insert_rowid(connection(), timeout()) -> {ok, rowid()} | {error, _}.
last_insert_rowid(#connection{raw_connection=RawConnection}, Timeout) ->
Ref = make_ref(),
ok = esqlite3_nif:last_insert_rowid(Connection, Ref, self()),
receive_answer(Connection, Ref, Timeout).
ok = esqlite3_nif:last_insert_rowid(RawConnection, Ref, self()),
receive_answer(RawConnection, Ref, Timeout).
%% @doc Get autocommit
%% @doc Check if the connection is in auto-commit mode.

View File

@@ -155,7 +155,7 @@ insert(_Db, _Ref, _Dest, _Sql) ->
%% @doc Get the last insert rowid.
%%
%% @spec insert(connection(), Ref::reference(), Dest::pid()) -> {ok, integer()} | {error, message()}
-spec last_insert_rowid(raw_connection(), reference(), pid()) -> ok | {error, _}.
last_insert_rowid(_Db, _Ref, _Dest) ->
erlang:nif_error(nif_library_not_loaded).