Skip to content

Commit

Permalink
upgrade dependent package
Browse files Browse the repository at this point in the history
  • Loading branch information
nakagami committed Mar 26, 2021
1 parent aba1973 commit 906a8c4
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
40 changes: 20 additions & 20 deletions lib/firebirdex/protocol.ex
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ defmodule Firebirdex.Protocol do
@impl true
def handle_prepare(%Query{} = query, _opts, state) do
Logger.debug "handle_prepare() #{query}"
{:ok, conn, stmt} = :efirebirdsql_protocol.allocate_statement(state.conn)
case :efirebirdsql_protocol.prepare_statement(to_string(query), conn, stmt) do
{:ok, conn, stmt} ->
{:ok, %Query{query | stmt: stmt}, %__MODULE__{state | conn: conn}}
{:error, number, reason, conn} ->
{:error, %Firebirdex.Error{number: number, reason: reason, statement: query.statement}, %__MODULE__{state | conn: conn}}
{:ok, stmt} = :efirebirdsql_protocol.allocate_statement(state.conn)
case :efirebirdsql_protocol.prepare_statement(to_string(query), state.conn, stmt) do
{:ok, stmt} ->
{:ok, %Query{query | stmt: stmt}, %__MODULE__{state | conn: state.conn}}
{:error, number, reason} ->
{:error, %Firebirdex.Error{number: number, reason: reason, statement: query.statement}, %__MODULE__{state | conn: state.conn}}
end
end

Expand Down Expand Up @@ -96,15 +96,15 @@ defmodule Firebirdex.Protocol do
params = Enum.map(params, &convert_param(&1))
Logger.debug "handle_execute() #{inspect(params)}"
case :efirebirdsql_protocol.execute(state.conn, query.stmt, params) do
{:ok, conn, stmt} ->
{:ok, rows, conn, stmt} = :efirebirdsql_protocol.fetchall(conn, stmt)
{:ok, stmt} ->
{:ok, rows, stmt} = :efirebirdsql_protocol.fetchall(state.conn, stmt)
columns = Enum.map(:efirebirdsql_protocol.columns(stmt), &(column_name(&1)))
{:ok, conn, num_rows} = :efirebirdsql_protocol.rowcount(conn, stmt)
{:ok, num_rows} = :efirebirdsql_protocol.rowcount(state.conn, stmt)
Logger.debug "handle_execute() :ok"
{:ok, %Query{query | stmt: stmt}, %Result{columns: columns, num_rows: num_rows, rows: rows}, %__MODULE__{state | conn: conn}}
{:error, number, reason, conn} ->
{:ok, %Query{query | stmt: stmt}, %Result{columns: columns, num_rows: num_rows, rows: rows}, %__MODULE__{state | conn: state.conn}}
{:error, number, reason} ->
Logger.debug "handle_execute() :error #{reason}"
{:error, %Firebirdex.Error{number: number, reason: reason, statement: query.statement}, %__MODULE__{state | conn: conn}}
{:error, %Firebirdex.Error{number: number, reason: reason, statement: query.statement}, %__MODULE__{state | conn: state.conn}}
end
end

Expand Down Expand Up @@ -136,10 +136,10 @@ defmodule Firebirdex.Protocol do
def handle_commit(_opts, %{conn: conn}) do
Logger.debug "handle_commit()"
case :efirebirdsql_protocol.commit(conn) do
{:ok, conn} ->
:ok ->
Logger.debug "handle_commit() :ok"
{:ok, %Result{}, %__MODULE__{conn: conn}}
{:error, _errno, reason, conn} ->
{:error, _errno, reason} ->
Logger.debug "handle_commit() :error #{reason}"
{:error, %__MODULE__{conn: conn}}
end
Expand All @@ -149,10 +149,10 @@ defmodule Firebirdex.Protocol do
def handle_rollback(_opts, %{conn: conn}) do
Logger.debug "handle_rollback()"
case :efirebirdsql_protocol.rollback(conn) do
{:ok, conn} ->
:ok ->
Logger.debug "handle_rollback() :ok"
{:ok, %Result{}, %__MODULE__{conn: conn}}
{:error, _errno, reason, conn} ->
{:error, _errno, reason} ->
Logger.debug "handle_rollback() :error #{reason}"
{:error, %__MODULE__{conn: conn}}
end
Expand All @@ -175,10 +175,10 @@ defmodule Firebirdex.Protocol do
def handle_deallocate(query, _cursor, _opts, state) do
Logger.debug "handle_deallocate()"
case :efirebirdsql_protocol.free_statement(state.conn, query.stmt, :drop) do
{:ok, conn, _stmt} ->
{:ok, %Result{}, %__MODULE__{conn: conn}}
{:error, _errno, _reason, conn} ->
{:error, %__MODULE__{conn: conn}}
{:ok, _stmt} ->
{:ok, %Result{}, %__MODULE__{conn: state.conn}}
{:error, _errno, _reason} ->
{:error, %__MODULE__{conn: state.conn}}
end
end

Expand Down
4 changes: 2 additions & 2 deletions mix.exs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
defmodule Firebirdex.Mixfile do
use Mix.Project

@version "0.1.0"
@version "0.1.1"

def project() do
[
Expand Down Expand Up @@ -43,7 +43,7 @@ defmodule Firebirdex.Mixfile do
[
{:db_connection, "~> 2.0"},
{:decimal, "~> 1.6"},
{:efirebirdsql, "~> 0.6.3"},
{:efirebirdsql, "~> 0.7.0"},
{:ex_doc, ">= 0.0.0", only: :dev, runtime: false}
]
end
Expand Down
2 changes: 1 addition & 1 deletion mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"db_connection": {:hex, :db_connection, "2.2.2", "3bbca41b199e1598245b716248964926303b5d4609ff065125ce98bcd368939e", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm", "642af240d8a8affb93b4ba5a6fcd2bbcbdc327e1a524b825d383711536f8070c"},
"decimal": {:hex, :decimal, "1.8.1", "a4ef3f5f3428bdbc0d35374029ffcf4ede8533536fa79896dd450168d9acdf3c", [:mix], [], "hexpm", "3cb154b00225ac687f6cbd4acc4b7960027c757a5152b369923ead9ddbca7aec"},
"earmark": {:hex, :earmark, "1.4.4", "4821b8d05cda507189d51f2caeef370cf1e18ca5d7dfb7d31e9cafe6688106a4", [:mix], [], "hexpm", "1f93aba7340574847c0f609da787f0d79efcab51b044bb6e242cae5aca9d264d"},
"efirebirdsql": {:hex, :efirebirdsql, "0.6.4", "443367f975aa02cbbfd9019d3388553bcad9a1c97870661994146b33074e44d0", [:rebar3], [], "hexpm", "08fe5e981501792efb7a7ae75e28eb0191a30b5e4053f41e647383a4100ffaf3"},
"efirebirdsql": {:hex, :efirebirdsql, "0.7.0", "d993e181fa9c5bdf8d1353ab420154321ef187c2331db77116c3374b2902f530", [:rebar3], [], "hexpm", "74ca7adade2571c65b1283932cb9991a7311b4d3486369fd0deac45fdf1b00ef"},
"ex_doc": {:hex, :ex_doc, "0.22.1", "9bb6d51508778193a4ea90fa16eac47f8b67934f33f8271d5e1edec2dc0eee4c", [:mix], [{:earmark, "~> 1.4.0", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "d957de1b75cb9f78d3ee17820733dc4460114d8b1e11f7ee4fd6546e69b1db60"},
"makeup": {:hex, :makeup, "1.0.1", "82f332e461dc6c79dbd82fbe2a9c10d48ed07146f0a478286e590c83c52010b5", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "49736fe5b66a08d8575bf5321d716bac5da20c8e6b97714fec2bcd6febcfa1f8"},
"makeup_elixir": {:hex, :makeup_elixir, "0.14.0", "cf8b7c66ad1cff4c14679698d532f0b5d45a3968ffbcbfd590339cb57742f1ae", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "d4b316c7222a85bbaa2fd7c6e90e37e953257ad196dc229505137c5e505e9eff"},
Expand Down

0 comments on commit 906a8c4

Please sign in to comment.