Skip to content

Update to DBConnection 1.2 #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fishcakez wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update to DBConnection 1.2 #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c813c4a
Use database transaction status to prevent transaction errors
fishcakez Aug 11, 2017
75d1482
Use one text statement for all queries
fishcakez Aug 12, 2017
bba273d
Support explicit cursor API
fishcakez Aug 12, 2017
d088b77
Remove reserved query name errors
fishcakez Aug 13, 2017
64d51fb
Add max rows option to each cursor fetch
fishcakez Aug 13, 2017
cf37d53
Raise DBConnection.ConnectionError on connection error
fishcakez Nov 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions lib/mariaex.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,12 @@ defmodule Mariaex do
{:ok, Mariaex.Result.t} | {:error, Mariaex.Error.t}
def execute(conn, %Query{} = query, params, opts \\ []) do
case DBConnection.execute(conn, query, params, defaults(opts)) do
{:error, %ArgumentError{} = err} ->
{:ok, _} = ok ->
ok
{:error, %Mariaex.Error{}} = error ->
error
{:error, err} ->
raise err
other ->
other
end
end

Expand Down Expand Up @@ -288,10 +290,10 @@ defmodule Mariaex do
case DBConnection.close(conn, query, defaults(opts)) do
{:ok, _} ->
:ok
{:error, %ArgumentError{} = err} ->
{:error, %Mariaex.Error{}} = error ->
error
{:error, err} ->
raise err
other ->
other
end
end

Expand Down Expand Up @@ -420,19 +422,21 @@ defmodule Mariaex do
case DBConnection.prepare_execute(conn, query, params, defaults(opts)) do
{:ok, _, result} ->
{:ok, result}
{:error, %ArgumentError{} = err} ->
raise err
{:error, _} = error ->
{:error, %Mariaex.Error{}} = error ->
error
{:error, err} ->
raise err
end
end

defp prepare_binary(conn, query, opts) do
case DBConnection.prepare(conn, query, defaults(opts)) do
{:error, %ArgumentError{} = err} ->
{:ok, _} = ok ->
ok
{:error, %Mariaex.Error{}} = error ->
error
{:error, err} ->
raise err
other ->
other
end
end

Expand Down
Loading