Advance to "Update DBConnection" commit from 9 Jan 2016. (#43)

* Advance to "Update DBConnection" commit from 9 Jan 2016.

* Update db_connection and postgrex references to match then-current Ecto.

* Pick up newer version of decimal library.

* Pick up increased receive timeout from Postgrex of this time.

* Mimic some of the changes that happened in Postgrex during this time.

* Return a result object from transaction functions.

Author: scouten

config/config.exs

@@ -1,24 +1,5 @@
-# This file is responsible for configuring your application
-# and its dependencies with the aid of the Mix.Config module.
 use Mix.Config
 
-# This configuration is loaded before any dependency and is restricted
-# to this project. If another project depends on this project, this
-# file won't be loaded nor affect the parent project. For this reason,
-# if you want to provide default values for your application for third-
-# party users, it should be done in your mix.exs file.
-
-# Sample configuration:
-#
-#     config :logger, :console,
-#       level: :info,
-#       format: "$date $time [$level] $metadata$message\n",
-#       metadata: [:user_id]
-
-# It is also possible to import configuration files, relative to this
-# directory. For example, you can emulate configuration per environment
-# by uncommenting the line below and defining dev.exs, test.exs and such.
-# Configuration from the imported file will override the ones defined
-# here (which is why it is important to import them last).
-#
-#     import_config "#{Mix.env}.exs"
+if Mix.env == :test do
+  config :ex_unit, :assert_receive_timeout, 1000
+end

lib/sqlite_db_connection/connection.ex

@@ -76,8 +76,6 @@ defmodule Sqlite.DbConnection.Connection do
     (default: `#{@pool_timeout}`)
     * `:queue` - Whether to wait for connection in a queue (default: `true`);
     * `:timeout` - Query request timeout (default: `#{@timeout}`);
-    * `:encode_mapper` - Fun to map each parameter before encoding, see
-    (default: `fn x -> x end`)
     * `:decode_mapper` - Fun to map each row in the result to a term after
     decoding, (default: `fn x -> x end`);
     * `:pool` - The pool module to use, must match that set on
@@ -173,8 +171,6 @@ defmodule Sqlite.DbConnection.Connection do
     (default: `#{@pool_timeout}`)
     * `:queue` - Whether to wait for connection in a queue (default: `true`);
     * `:timeout` - Execute request timeout (default: `#{@timeout}`);
-    * `:encode_mapper` - Fun to map each parameter before encoding, see
-    (default: `fn x -> x end`)
     * `:decode_mapper` - Fun to map each row in the result to a term after
     decoding, (default: `fn x -> x end`);
     * `:pool` - The pool module to use, must match that set on
@@ -235,10 +231,10 @@ defmodule Sqlite.DbConnection.Connection do
   @spec close(conn, Sqlite.DbConnection.Query.t, Keyword.t) :: :ok | {:error, Sqlite.DbConnection.Error.t}
   def close(conn, query, opts \\ []) do
     case DBConnection.close(conn, query, defaults(opts)) do
+      {:ok, _} ->
+        :ok
       {:error, %ArgumentError{} = err} ->
         raise err
-      other ->
-        other
     end
   end
 

lib/sqlite_db_connection/error.ex

@@ -1,3 +1,3 @@
 defmodule Sqlite.DbConnection.Error do
-  defexception [:message, :sqlite, :postgres]
+  defexception [:message, :sqlite, :connection_id]
 end

lib/sqlite_db_connection/protocol.ex

@@ -110,27 +110,34 @@ defmodule Sqlite.DbConnection.Protocol do
     handle_execute(query, params, :sync_close, opts, s)
   end
 
-  # @spec handle_close(Sqlite.DbConnection.Query.t, Keyword.t, state) ::
-  #   {:ok, state} |
-  #   {:error, ArgumentError.t, state} |
-  #   {:error | :disconnect, Sqlite.DbConnection.Error.t, state}
-  # def handle_close(%Query{name: @reserved_prefix <> _} = query, _, s) do
-  #   reserved_error(query, s)
-  # end
+  @spec handle_close(Sqlite.DbConnection.Query.t, Keyword.t, state) ::
+    {:ok, Sqlite.DbConnection.Result.t, state} |
+    {:error, ArgumentError.t, state} |
+    {:error | :disconnect, Sqlite.DbConnection.Error.t, state}
   def handle_close(_query, _opts, s) do
     # no-op: esqlite doesn't expose statement close.
     # Instead it relies on statements getting garbage collected.
-    {:ok, s}
+    res = %Sqlite.DbConnection.Result{command: :close}
+    {:ok, res, s}
   end
 
+  @spec handle_begin(Keyword.t, state) ::
+    {:ok, Sqlite.DbConnection.Result.t, state} |
+    {:error | :disconnect, Sqlite.DbConnection.Error.t, state}
   def handle_begin(_opts, s) do
     handle_transaction("BEGIN", s)
   end
 
+  @spec handle_commit(Keyword.t, state) ::
+    {:ok, Sqlite.DbConnection.Result.t, state} |
+    {:error | :disconnect, Sqlite.DbConnection.Error.t, state}
   def handle_commit(_opts, s) do
     handle_transaction("COMMIT", s)
   end
 
+  @spec handle_rollback(Keyword.t, state) ::
+    {:ok, Sqlite.DbConnection.Result.t, state} |
+    {:error | :disconnect, Sqlite.DbConnection.Error.t, state}
   def handle_rollback(_opts, s) do
     handle_transaction("ROLLBACK", s)
   end
@@ -253,7 +260,12 @@ defmodule Sqlite.DbConnection.Protocol do
   defp handle_transaction(stmt, s) do
     case Sqlitex.Server.query_rows(s.db, stmt, into: :raw_list) do
       {:ok, _rows} ->
-        {:ok, s}
+        command = command_from_sql(stmt)
+        result = %Sqlite.DbConnection.Result{rows: nil,
+                                             num_rows: nil,
+                                             columns: nil,
+                                             command: command}
+        {:ok, result, s}
       {:error, {_sqlite_errcode, _message}} = err ->
         sqlite_error(err, s)
     end

mix.exs

@@ -33,12 +33,13 @@ defmodule Sqlite.Ecto.Mixfile do
     [{:backoff, git: "https://github.com/scouten/backoff.git", ref: "8f10cb83b5fbc2401e6a06b341417cad4c632f34", override: true},
      {:connection, "~> 1.0.2", override: true},
      {:coverex, "~> 1.4.11", only: :test},
-     {:db_connection, git: "https://github.com/fishcakez/db_connection", ref: "f438a1d66f238cc3d786f7aa7719fc36eaa283f2", override: true}, # version 0.1.7
+     {:db_connection, git: "https://github.com/fishcakez/db_connection", ref: "05f3cc3dbf89f3cc475caaa229b20c30c589a5ef", override: true}, # version 0.1.7
+     {:decimal, "1.1.1", override: true},
      {:esqlite, git: "https://github.com/mmzeeman/esqlite", ref: "3f1ef40b9011276eb8bdc366c5ef1e25d79befa5", override: true},
      {:ex_doc, "~> 0.14.5", only: :dev},
-     {:ecto, git: "https://github.com/scouten/ecto.git", ref: "8e2a9274fc5ab6b9b973ca50f2045c5b952617bf"},
+     {:ecto, git: "https://github.com/scouten/ecto.git", ref: "2f753223e26b3cda91acbe2ab130451cafafa3ec"},
      {:poison, "~> 1.0"},
-     {:postgrex, git: "https://github.com/ericmj/postgrex.git", ref: "f773f8d4b88565aea435c6651b711ebfce74c9c2", override: true},
+     {:postgrex, git: "https://github.com/ericmj/postgrex.git", ref: "1dd57fe884d88125fff0661be8af0b5b9b9355fe", override: true},
      {:sbroker, "~> 1.0", override: true},
      {:sqlitex, git: "https://github.com/scouten/sqlitex.git", ref: "8f1dcd4107cd99ca0687bf870b914e44a467722d", override: true}]
   end

mix.lock

@@ -1,22 +1,20 @@
 %{"backoff": {:git, "https://github.com/scouten/backoff.git", "8f10cb83b5fbc2401e6a06b341417cad4c632f34", [ref: "8f10cb83b5fbc2401e6a06b341417cad4c632f34"]},
-  "certifi": {:hex, :certifi, "0.7.0", "861a57f3808f7eb0c2d1802afeaae0fa5de813b0df0979153cbafcd853ababaf", [:rebar3], []},
+  "certifi": {:hex, :certifi, "1.0.0", "1c787a85b1855ba354f0b8920392c19aa1d06b0ee1362f9141279620a5be2039", [:rebar3], []},
   "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], []},
-  "coverex": {:hex, :coverex, "1.4.11", "fb963586be173e0e5253b200ca624e2708ed5dbe58b90ddbed27184a1f46d61e", [:mix], [{:hackney, "~> 1.5", [hex: :hackney, optional: false]}, {:poison, "~> 1.5 or ~> 2.0", [hex: :poison, optional: false]}]},
-  "db_connection": {:git, "https://github.com/fishcakez/db_connection", "f438a1d66f238cc3d786f7aa7719fc36eaa283f2", [ref: "f438a1d66f238cc3d786f7aa7719fc36eaa283f2"]},
+  "coverex": {:hex, :coverex, "1.4.12", "b18d737734edeac578a854cfaa5aa48c5d05e649c77ce02efb7f723a316b6a3b", [:mix], [{:hackney, "~> 1.5", [hex: :hackney, optional: false]}, {:poison, "~> 1.5 or ~> 2.0", [hex: :poison, optional: false]}]},
+  "db_connection": {:git, "https://github.com/fishcakez/db_connection", "05f3cc3dbf89f3cc475caaa229b20c30c589a5ef", [ref: "05f3cc3dbf89f3cc475caaa229b20c30c589a5ef"]},
   "decimal": {:hex, :decimal, "1.1.1", "a8ff5b673105e6cdaca96f799aeefc6f07142881b616c65db16e14e556b16e76", [:mix], []},
-  "earmark": {:hex, :earmark, "1.0.3", "89bdbaf2aca8bbb5c97d8b3b55c5dd0cff517ecc78d417e87f1d0982e514557b", [:mix], []},
-  "ecto": {:git, "https://github.com/scouten/ecto.git", "8e2a9274fc5ab6b9b973ca50f2045c5b952617bf", [ref: "8e2a9274fc5ab6b9b973ca50f2045c5b952617bf"]},
+  "earmark": {:hex, :earmark, "1.1.1", "433136b7f2e99cde88b745b3a0cfc3fbc81fe58b918a09b40fce7f00db4d8187", [:mix], []},
+  "ecto": {:git, "https://github.com/scouten/ecto.git", "2f753223e26b3cda91acbe2ab130451cafafa3ec", [ref: "2f753223e26b3cda91acbe2ab130451cafafa3ec"]},
   "esqlite": {:git, "https://github.com/mmzeeman/esqlite", "3f1ef40b9011276eb8bdc366c5ef1e25d79befa5", [ref: "3f1ef40b9011276eb8bdc366c5ef1e25d79befa5"]},
   "ex_doc": {:hex, :ex_doc, "0.14.5", "c0433c8117e948404d93ca69411dd575ec6be39b47802e81ca8d91017a0cf83c", [:mix], [{:earmark, "~> 1.0", [hex: :earmark, optional: false]}]},
-  "hackney": {:hex, :hackney, "1.6.5", "8c025ee397ac94a184b0743c73b33b96465e85f90a02e210e86df6cbafaa5065", [:rebar3], [{:certifi, "0.7.0", [hex: :certifi, optional: false]}, {:idna, "1.2.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]},
-  "httpoison": {:hex, :httpoison, "0.10.0", "4727b3a5e57e9a4ff168a3c2883e20f1208103a41bccc4754f15a9366f49b676", [:mix], [{:hackney, "~> 1.6.3", [hex: :hackney, optional: false]}]},
-  "idna": {:hex, :idna, "1.2.0", "ac62ee99da068f43c50dc69acf700e03a62a348360126260e87f2b54eced86b2", [:rebar3], []},
+  "hackney": {:hex, :hackney, "1.6.6", "5564b4695d48fd87859e9df77a7fa4b4d284d24519f0cd7cc898f09e8fbdc8a3", [:rebar3], [{:certifi, "1.0.0", [hex: :certifi, optional: false]}, {:idna, "4.0.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]},
+  "idna": {:hex, :idna, "4.0.0", "10aaa9f79d0b12cf0def53038547855b91144f1bfcc0ec73494f38bb7b9c4961", [:rebar3], []},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], []},
   "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},
-  "pipe": {:hex, :pipe, "0.0.2", "eff98a868b426745acef103081581093ff5c1b88100f8ff5949b4a30e81d0d9f", [:mix], []},
   "poison": {:hex, :poison, "1.5.2", "560bdfb7449e3ddd23a096929fb9fc2122f709bcc758b2d5d5a5c7d0ea848910", [:mix], []},
   "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], []},
-  "postgrex": {:git, "https://github.com/ericmj/postgrex.git", "f773f8d4b88565aea435c6651b711ebfce74c9c2", [ref: "f773f8d4b88565aea435c6651b711ebfce74c9c2"]},
+  "postgrex": {:git, "https://github.com/ericmj/postgrex.git", "1dd57fe884d88125fff0661be8af0b5b9b9355fe", [ref: "1dd57fe884d88125fff0661be8af0b5b9b9355fe"]},
   "sbroker": {:hex, :sbroker, "1.0.0", "28ff1b5e58887c5098539f236307b36fe1d3edaa2acff9d6a3d17c2dcafebbd0", [:rebar3], []},
   "sqlitex": {:git, "https://github.com/scouten/sqlitex.git", "8f1dcd4107cd99ca0687bf870b914e44a467722d", [ref: "8f1dcd4107cd99ca0687bf870b914e44a467722d"]},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], []}}

test/sqlite_db_connection/query_test.exs

@@ -121,12 +121,12 @@ defmodule QueryTest do
     assert [[42]] = execute(query, [42])
   end
 
-  test "execute with encode mapper", context do
-    assert (%Sqlite.DbConnection.Query{} = query) = prepare("mapper", "SELECT cast($1 as int)")
-    assert [[84]] = execute(query, [42], [encode_mapper: fn(n) -> n * 2 end])
-    assert :ok = close(query)
-    assert [[42]] = query("SELECT 42", [])
-  end
+  # test "execute with encode mapper", context do
+  #   assert (%Sqlite.DbConnection.Query{} = query) = prepare("mapper", "SELECT cast($1 as int)")
+  #   assert [[84]] = execute(query, [42], [encode_mapper: fn(n) -> n * 2 end])
+  #   assert :ok = close(query)
+  #   assert [[42]] = query("SELECT 42", [])
+  # end
 
   test "closing prepared query that does not exist succeeds", context do
     assert (%Sqlite.DbConnection.Query{} = query) = prepare("42", "SELECT 42")