Skip to content

Commit

Permalink
hold error number
Browse files Browse the repository at this point in the history
  • Loading branch information
nakagami committed Mar 17, 2019
1 parent 7118a47 commit fb6cb04
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions lib/firebirdex/error.ex
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
defmodule Firebirdex.Error do
defexception [
:number,
:message,
:statement
]

@type t :: %__MODULE__{
number: integer(),
message: String.t(),
statement: iodata() | nil
}
Expand Down
12 changes: 6 additions & 6 deletions lib/firebirdex/protocol.ex
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ defmodule Firebirdex.Protocol do
{:ok, conn} ->
{:ok, conn} = :efirebirdsql_protocol.begin_transaction(false, conn)
{:ok, %__MODULE__{conn: conn}}
{:error, message, _conn} ->
{:error, %Firebirdex.Error{message: message}}
{:error, number, message, _conn} ->
{:error, %Firebirdex.Error{number: number, message: message}}
end
end

Expand Down Expand Up @@ -52,8 +52,8 @@ defmodule Firebirdex.Protocol do
case :efirebirdsql_protocol.prepare_statement(query.statement, conn, stmt) do
{:ok, conn, stmt} ->
{:ok, %Query{query | stmt: stmt}, %__MODULE__{state | conn: conn}}
{:error, message, conn} ->
{:error, %Firebirdex.Error{message: message, statement: query.statement}, %__MODULE__{state | conn: conn}}
{:error, number, message, conn} ->
{:error, %Firebirdex.Error{number: number, message: message, statement: query.statement}, %__MODULE__{state | conn: conn}}
end
end

Expand All @@ -73,8 +73,8 @@ defmodule Firebirdex.Protocol do
{:ok, rows, conn, stmt} = :efirebirdsql_protocol.fetchall(conn, stmt)
columns = Enum.map(:efirebirdsql_protocol.columns(stmt), &(column_name(&1)))
{:ok, %Query{query | stmt: stmt}, %Result{rows: rows, columns: columns}, %__MODULE__{state | conn: conn}}
{:error, message, conn} ->
{:error, %Firebirdex.Error{message: message, statement: query.statement}, %__MODULE__{state | conn: conn}}
{:error, number, message, conn} ->
{:error, %Firebirdex.Error{number: number, message: message, statement: query.statement}, %__MODULE__{state | conn: 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.0.4"
@version "0.0.5"

def project() do
[
Expand Down Expand Up @@ -43,7 +43,7 @@ defmodule Firebirdex.Mixfile do
[
{:db_connection, "~> 2.0"},
{:decimal, "~> 1.6"},
{:efirebirdsql, "~> 0.5.7"},
{:efirebirdsql, "~> 0.5.8"},
{: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.0.2", "440c05518b0bdca0469dafaf45403597430448c1281def14ef9ccaa41833ea1e", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"},
"decimal": {:hex, :decimal, "1.6.0", "bfd84d90ff966e1f5d4370bdd3943432d8f65f07d3bab48001aebd7030590dcc", [:mix], [], "hexpm"},
"earmark": {:hex, :earmark, "1.3.1", "73812f447f7a42358d3ba79283cfa3075a7580a3a2ed457616d6517ac3738cb9", [:mix], [], "hexpm"},
"efirebirdsql": {:hex, :efirebirdsql, "0.5.7", "f6d2c40636f754bb87be5f07e3e55edb9b3394c66bbb876af876d2e3a92d88d6", [:rebar3], [], "hexpm"},
"efirebirdsql": {:hex, :efirebirdsql, "0.5.8", "d71b2547a94c00c42be42ecacb9510fb6fd7d066065d67ec1e2c58b21d818166", [:rebar3], [], "hexpm"},
"ex_doc": {:hex, :ex_doc, "0.19.3", "3c7b0f02851f5fc13b040e8e925051452e41248f685e40250d7e40b07b9f8c10", [:mix], [{:earmark, "~> 1.2", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
"makeup": {:hex, :makeup, "0.8.0", "9cf32aea71c7fe0a4b2e9246c2c4978f9070257e5c9ce6d4a28ec450a839b55f", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
"makeup_elixir": {:hex, :makeup_elixir, "0.13.0", "be7a477997dcac2e48a9d695ec730b2d22418292675c75aa2d34ba0909dcdeda", [:mix], [{:makeup, "~> 0.8", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
Expand Down

0 comments on commit fb6cb04

Please sign in to comment.