Skip to content
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

Update to DBConnection 2.0 #235

Merged
merged 19 commits into from
Sep 24, 2018
Merged

Update to DBConnection 2.0 #235

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f9f3af6
Remove Docker dependent test
Aug 31, 2018
e0bcf00
Update decimal
wojtekmach Aug 31, 2018
e9c575c
Use database transaction status to prevent transaction errors
fishcakez Aug 11, 2017
dd2dc21
Use one text statement for all queries
fishcakez Aug 12, 2017
0491f72
Support explicit cursor API
fishcakez Aug 12, 2017
9f2350d
Remove reserved query name errors
fishcakez Aug 13, 2017
869c0b7
Add max rows option to each cursor fetch
fishcakez Aug 13, 2017
c1c7475
Raise DBConnection.ConnectionError on connection error
fishcakez Nov 26, 2017
02bc0fb
Update to DBConnection 2.0
Aug 31, 2018
e319241
Update to latest DBCOnnection
Sep 2, 2018
6abbee2
Update to latest DBConnection
Sep 13, 2018
6783f8f
Update docs
Sep 13, 2018
1f33f8e
Fix return types
Sep 13, 2018
31e896a
Update types
Sep 13, 2018
0483010
Update dbconnection reference
Sep 16, 2018
f9a48cc
Remove outdated pool config
Sep 16, 2018
8841917
Add Mariaex.prepare_execute
Sep 16, 2018
642d650
Update mariaex.ex
josevalim Sep 24, 2018
ec14055
Update DBConnection git ref
Sep 24, 2018
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 @@ -240,10 +240,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 @@ -289,10 +291,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 @@ -421,19 +423,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