Advance to "Ensure adapters work primarily on primitive types" commit. (#20)

Author: scouten

lib/sqlite_ecto.ex

@@ -1,4 +1,4 @@
-defmodule Sqlite.Ecto do
+  defmodule Sqlite.Ecto do
   @moduledoc ~S"""
   Ecto Adapter module for SQLite.
 
@@ -27,8 +27,6 @@ defmodule Sqlite.Ecto do
 
   """
 
-  import Sqlite.Ecto.Connection, only: [json_library: 0]
-
   # Inherit all behaviour from Ecto.Adapters.SQL
   use Ecto.Adapters.SQL, :sqlitex
 
@@ -37,13 +35,21 @@ defmodule Sqlite.Ecto do
 
   ## Custom SQLite Types
 
-  def load({:embed, _} = type, binary) when is_binary(binary) do
-    super(type, json_library.decode!(binary))
-  end
-  def load(:map, binary) when is_binary(binary) do
-    super(:map, json_library.decode!(binary))
-  end
-  def load(type, value), do: super(type, value)
+  def loaders(:map, type), do: [&json_decode/1, type]
+  def loaders(:boolean, type), do: [&bool_decode/1, type]
+  def loaders(:binary_id, type), do: [Ecto.UUID, type]
+  def loaders({:embed, _} = type, _),
+    do: [&json_decode/1, &Ecto.Adapters.SQL.load_embed(type, &1)]
+  def loaders(_primitive, type), do: [type]
+
+  defp bool_decode(0), do: {:ok, false}
+  defp bool_decode(1), do: {:ok, true}
+  defp bool_decode(x), do: {:ok, x}
+
+  defp json_decode(x) when is_binary(x),
+    do: {:ok, Application.get_env(:ecto, :json_library).decode!(x)}
+  defp json_decode(x),
+    do: {:ok, x}
 
   ## Storage API
 

lib/sqlite_ecto/connection.ex

@@ -355,7 +355,7 @@ if Code.ensure_loaded?(Sqlitex.Server) do
     defp distinct(nil, _sources), do: ""
     defp distinct(%QueryExpr{expr: true}, _exprs),  do: "DISTINCT "
     defp distinct(%QueryExpr{expr: false}, _exprs), do: ""
-    defp distinct(_query, exprs) do
+    defp distinct(_query, _exprs) do
       raise ArgumentError, "DISTINCT with multiple columns is not supported by SQLite"
     end
 
@@ -698,8 +698,6 @@ if Code.ensure_loaded?(Sqlitex.Server) do
     end
     defp table_identifier(_stmt, table, _pos), do: quote_id(table)
 
-    defp fragment_identifier(pos), do: "f" <> Integer.to_string(pos)
-
     # DDL
 
     alias Ecto.Migration.Table
@@ -888,7 +886,7 @@ if Code.ensure_loaded?(Sqlitex.Server) do
     ## Helpers
 
     # Use Ecto's JSON library (currently Poison) for embedded JSON datatypes.
-    def json_library, do: Application.get_env(:ecto, :json_library)
+    defp json_library, do: Application.get_env(:ecto, :json_library)
 
     # Initiate a transaction with a savepoint. If any error occurs when we call
     # the func parameter, rollback our changes. Returns the result of the call
@@ -988,14 +986,6 @@ if Code.ensure_loaded?(Sqlitex.Server) do
       list |> Enum.map(&func.(&1)) |> Enum.intersperse(item)
     end
 
-    defp if_do(condition, value) do
-      if condition, do: value, else: []
-    end
-
-    defp escape_string(value) when is_binary(value) do
-      :binary.replace(value, "'", "''", [:global])
-    end
-
     defp error!(nil, message) do
       raise ArgumentError, message: message
     end

mix.exs

@@ -33,7 +33,7 @@ defmodule Sqlite.Ecto.Mixfile do
   defp deps do
     [{:coverex, "~> 1.4.11", only: :coverage},
      {:ex_doc, "~> 0.14.5", only: :dev},
-     {:ecto, git: "https://github.com/scouten/ecto.git", ref: "bfad2326dedb0f7cfb5ff0272cb6810e3c29d341"},
+     {:ecto, git: "https://github.com/scouten/ecto.git", ref: "5490aa66ac2115225a6219d3bd371bc58c00dc98"},
      {:poison, "~> 1.0"},
      {:sqlitex, git: "https://github.com/scouten/sqlitex.git", ref: "c997c613a69ece59d8dd6b7e7ee557d4c4a1c709"}]
   end

mix.lock

@@ -4,7 +4,7 @@
   "db_connection": {:git, "https://github.com/fishcakez/db_connection.git", "3e169b0b595276cc44fc935b200f428bd1abc08d", []},
   "decimal": {:hex, :decimal, "1.1.1", "a8ff5b673105e6cdaca96f799aeefc6f07142881b616c65db16e14e556b16e76", [:mix], []},
   "earmark": {:hex, :earmark, "1.0.3", "89bdbaf2aca8bbb5c97d8b3b55c5dd0cff517ecc78d417e87f1d0982e514557b", [:mix], []},
-  "ecto": {:git, "https://github.com/scouten/ecto.git", "bfad2326dedb0f7cfb5ff0272cb6810e3c29d341", [ref: "bfad2326dedb0f7cfb5ff0272cb6810e3c29d341"]},
+  "ecto": {:git, "https://github.com/scouten/ecto.git", "5490aa66ac2115225a6219d3bd371bc58c00dc98", [ref: "5490aa66ac2115225a6219d3bd371bc58c00dc98"]},
   "esqlite": {:hex, :esqlite, "0.2.1", "0e2896f177180b33e5a8fe65342b4e81de46e0db59e4cbf6e8b9101e98d423fd", [:make, :rebar], []},
   "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]}]},