From 21dd4b4f4e36c8df140890016f6c21b19e8b63d0 Mon Sep 17 00:00:00 2001
From: Eric Scouten <eric@scouten.com>
Date: Mon, 28 Aug 2017 22:22:19 -0700
Subject: [PATCH 1/7] Track GitHub releases of Ecto in this branch.

---
 mix.exs  | 2 +-
 mix.lock | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mix.exs b/mix.exs
index c19261c1..759f5c74 100644
--- a/mix.exs
+++ b/mix.exs
@@ -43,7 +43,7 @@ defmodule Sqlite.Ecto2.Mixfile do
      {:decimal, "~> 1.5"},
      {:excoveralls, "~> 0.9", only: :test},
      {:ex_doc, "~> 0.18", runtime: false, only: :docs},
-     {:ecto, "~> 2.2"},
+     {:ecto, github: "elixir-ecto/ecto", ref: "394cb70d75d71a49886cab0f314d93022f1c1008"},
      {:poison, "~> 2.2 or ~> 3.0", optional: true},
      {:postgrex, "~> 0.13", optional: true},
      {:sbroker, "~> 1.0"},
diff --git a/mix.lock b/mix.lock
index 4a3dca35..4239ba1c 100644
--- a/mix.lock
+++ b/mix.lock
@@ -4,14 +4,12 @@
   "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
   "coverex": {:hex, :coverex, "1.4.13", "d90833b82bdd6a1ec05a6d971283debc3dd9611957489010e4b1ab0071a9ee6c", [:mix], [{:hackney, "~> 1.5", [hex: :hackney, repo: "hexpm", optional: false]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
   "credo": {:hex, :credo, "0.10.0", "66234a95effaf9067edb19fc5d0cd5c6b461ad841baac42467afed96c78e5e9e", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
-  "db_connection": {:hex, :db_connection, "1.1.2", "2865c2a4bae0714e2213a0ce60a1b12d76a6efba0c51fbda59c9ab8d1accc7a8", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
+  "db_connection": {:hex, :db_connection, "1.1.3", "89b30ca1ef0a3b469b1c779579590688561d586694a3ce8792985d4d7e575a61", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
   "decimal": {:hex, :decimal, "1.5.0", "b0433a36d0e2430e3d50291b1c65f53c37d56f83665b43d79963684865beab68", [:mix], [], "hexpm"},
-  "dogma": {:hex, :dogma, "0.1.16", "3c1532e2f63ece4813fe900a16704b8e33264da35fdb0d8a1d05090a3022eef9", [:mix], [{:poison, ">= 2.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
   "earmark": {:hex, :earmark, "1.2.5", "4d21980d5d2862a2e13ec3c49ad9ad783ffc7ca5769cf6ff891a4553fbaae761", [:mix], [], "hexpm"},
-  "ecto": {:hex, :ecto, "2.2.2", "e9bd6ebc044eaaab1cb369e3465686d8aca830aa5bf545ef2bae000a3d42c54b", [:mix], [{:db_connection, "~> 1.1", [hex: :db_connection, repo: "hexpm", optional: true]}, {:decimal, "~> 1.2", [hex: :decimal, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.8.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: true]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.13.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
-  "elixir_make": {:hex, :elixir_make, "0.4.2", "332c649d08c18bc1ecc73b1befc68c647136de4f340b548844efc796405743bf", [:mix], [], "hexpm"},
+  "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "394cb70d75d71a49886cab0f314d93022f1c1008", [ref: "394cb70d75d71a49886cab0f314d93022f1c1008"]},
   "esqlite": {:hex, :esqlite, "0.2.4", "3a8a352c190afe2d6b828b252a6fbff65b5cc1124647f38b15bdab3bf6fd4b3e", [:rebar3], [], "hexpm"},
-  "ex_doc": {:hex, :ex_doc, "0.19.0", "e22b6434373b4870ea77b24df069dbac7002c1f483615e9ebfc0c37497e1c75c", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
+  "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
   "excoveralls": {:hex, :excoveralls, "0.9.1", "14fd20fac51ab98d8e79615814cc9811888d2d7b28e85aa90ff2e30dcf3191d6", [:mix], [{:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
   "hackney": {:hex, :hackney, "1.7.1", "e238c52c5df3c3b16ce613d3a51c7220a784d734879b1e231c9babd433ac1cb4", [:rebar3], [{:certifi, "1.0.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "4.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
   "idna": {:hex, :idna, "4.0.0", "10aaa9f79d0b12cf0def53038547855b91144f1bfcc0ec73494f38bb7b9c4961", [:rebar3], [], "hexpm"},

From 1c9a58d60360dead5286eaedeaff817e7c70969b Mon Sep 17 00:00:00 2001
From: Eric Scouten <eric@scouten.com>
Date: Wed, 6 Sep 2017 15:35:30 -0700
Subject: [PATCH 2/7] Advance to "Ensure joins associations work select map"
 commit from 05 Sep 2017.

---
 mix.exs  | 2 +-
 mix.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.exs b/mix.exs
index 759f5c74..4e0c13dc 100644
--- a/mix.exs
+++ b/mix.exs
@@ -43,7 +43,7 @@ defmodule Sqlite.Ecto2.Mixfile do
      {:decimal, "~> 1.5"},
      {:excoveralls, "~> 0.9", only: :test},
      {:ex_doc, "~> 0.18", runtime: false, only: :docs},
-     {:ecto, github: "elixir-ecto/ecto", ref: "394cb70d75d71a49886cab0f314d93022f1c1008"},
+     {:ecto, github: "elixir-ecto/ecto", ref: "284eb049b476e2751fbeb5dacf4f15ea31b8b7fd"},
      {:poison, "~> 2.2 or ~> 3.0", optional: true},
      {:postgrex, "~> 0.13", optional: true},
      {:sbroker, "~> 1.0"},
diff --git a/mix.lock b/mix.lock
index 4239ba1c..2a554244 100644
--- a/mix.lock
+++ b/mix.lock
@@ -7,7 +7,7 @@
   "db_connection": {:hex, :db_connection, "1.1.3", "89b30ca1ef0a3b469b1c779579590688561d586694a3ce8792985d4d7e575a61", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
   "decimal": {:hex, :decimal, "1.5.0", "b0433a36d0e2430e3d50291b1c65f53c37d56f83665b43d79963684865beab68", [:mix], [], "hexpm"},
   "earmark": {:hex, :earmark, "1.2.5", "4d21980d5d2862a2e13ec3c49ad9ad783ffc7ca5769cf6ff891a4553fbaae761", [:mix], [], "hexpm"},
-  "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "394cb70d75d71a49886cab0f314d93022f1c1008", [ref: "394cb70d75d71a49886cab0f314d93022f1c1008"]},
+  "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "284eb049b476e2751fbeb5dacf4f15ea31b8b7fd", [ref: "284eb049b476e2751fbeb5dacf4f15ea31b8b7fd"]},
   "esqlite": {:hex, :esqlite, "0.2.4", "3a8a352c190afe2d6b828b252a6fbff65b5cc1124647f38b15bdab3bf6fd4b3e", [:rebar3], [], "hexpm"},
   "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
   "excoveralls": {:hex, :excoveralls, "0.9.1", "14fd20fac51ab98d8e79615814cc9811888d2d7b28e85aa90ff2e30dcf3191d6", [:mix], [{:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},

From 2eb16d919127630f42b7ed58672be7f17435805c Mon Sep 17 00:00:00 2001
From: Eric Scouten <eric@scouten.com>
Date: Mon, 11 Sep 2017 22:58:44 -0700
Subject: [PATCH 3/7] Advance to "SQLite does not have an independent boolean
 type." commit from 11 Sep 2017.

Yay! We no longer need to hack out incompatible tests.
---
 integration/hack_out_incompatible_tests.sh | 42 ----------------------
 integration/sqlite/test_helper.exs         |  2 +-
 mix.exs                                    |  2 +-
 mix.lock                                   |  2 +-
 test/test_helper.exs                       | 10 ------
 5 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 100755 integration/hack_out_incompatible_tests.sh

diff --git a/integration/hack_out_incompatible_tests.sh b/integration/hack_out_incompatible_tests.sh
deleted file mode 100755
index d64aa39a..00000000
--- a/integration/hack_out_incompatible_tests.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# Ugly but necessary hack to disable certain untagged tests that can't be
-# supported by SQLite.
-
-# WARNING: There is trailing whitespace on the `sed` line that must be retained.
-
-if [ "$(uname)" == "Darwin" ] ; then
-
-sed -i "" '/test "insert all/ i\ 
-  @tag :insert_cell_wise_defaults
-' deps/ecto/integration_test/cases/repo.exs
-
-sed -i "" '/failing child foreign key/ i\ 
-  @tag :foreign_key_constraint
-' deps/ecto/integration_test/cases/repo.exs
-
-sed -i "" '/test "Repo.insert_all escape/ i\ 
-  @tag :insert_cell_wise_defaults
-' deps/ecto/integration_test/sql/sql.exs
-
-sed -i "" '/subqueries with map and select expression/ i\ 
-  @tag :map_boolean_in_subquery
-' deps/ecto/integration_test/sql/subquery.exs
-
-sed -i "" '/subqueries with map update and select expression/ i\ 
-  @tag :map_boolean_in_subquery
-' deps/ecto/integration_test/sql/subquery.exs
-
-else
-
-sed -i '/test "insert all/ i @tag :insert_cell_wise_defaults' deps/ecto/integration_test/cases/repo.exs
-
-sed -i '/failing child foreign key/ i @tag :foreign_key_constraint' deps/ecto/integration_test/cases/repo.exs
-
-sed -i '/test "Repo.insert_all escape/ i @tag :insert_cell_wise_defaults' deps/ecto/integration_test/sql/sql.exs
-
-sed -i '/subqueries with map and select expression/ i @tag :map_boolean_in_subquery' deps/ecto/integration_test/sql/subquery.exs
-
-sed -i '/subqueries with map update and select expression/ i @tag :map_boolean_in_subquery' deps/ecto/integration_test/sql/subquery.exs
-
-fi
diff --git a/integration/sqlite/test_helper.exs b/integration/sqlite/test_helper.exs
index 177a52c4..1728b126 100644
--- a/integration/sqlite/test_helper.exs
+++ b/integration/sqlite/test_helper.exs
@@ -17,7 +17,7 @@ ExUnit.start exclude: [:array_type,
                        :modify_foreign_key_on_delete,
                        :modify_foreign_key_on_update,
                        :alter_primary_key,
-                       :map_boolean_in_subquery,
+                       :map_boolean_in_expression,
                        :upsert_all,
                        :with_conflict_target,
                        :without_conflict_target,
diff --git a/mix.exs b/mix.exs
index 4e0c13dc..89012317 100644
--- a/mix.exs
+++ b/mix.exs
@@ -43,7 +43,7 @@ defmodule Sqlite.Ecto2.Mixfile do
      {:decimal, "~> 1.5"},
      {:excoveralls, "~> 0.9", only: :test},
      {:ex_doc, "~> 0.18", runtime: false, only: :docs},
-     {:ecto, github: "elixir-ecto/ecto", ref: "284eb049b476e2751fbeb5dacf4f15ea31b8b7fd"},
+     {:ecto, github: "elixir-ecto/ecto", ref: "6da19b7033cec7382aa798f282b4e8205f08b09b"},
      {:poison, "~> 2.2 or ~> 3.0", optional: true},
      {:postgrex, "~> 0.13", optional: true},
      {:sbroker, "~> 1.0"},
diff --git a/mix.lock b/mix.lock
index 2a554244..4c5cb493 100644
--- a/mix.lock
+++ b/mix.lock
@@ -7,7 +7,7 @@
   "db_connection": {:hex, :db_connection, "1.1.3", "89b30ca1ef0a3b469b1c779579590688561d586694a3ce8792985d4d7e575a61", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
   "decimal": {:hex, :decimal, "1.5.0", "b0433a36d0e2430e3d50291b1c65f53c37d56f83665b43d79963684865beab68", [:mix], [], "hexpm"},
   "earmark": {:hex, :earmark, "1.2.5", "4d21980d5d2862a2e13ec3c49ad9ad783ffc7ca5769cf6ff891a4553fbaae761", [:mix], [], "hexpm"},
-  "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "284eb049b476e2751fbeb5dacf4f15ea31b8b7fd", [ref: "284eb049b476e2751fbeb5dacf4f15ea31b8b7fd"]},
+  "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "6da19b7033cec7382aa798f282b4e8205f08b09b", [ref: "6da19b7033cec7382aa798f282b4e8205f08b09b"]},
   "esqlite": {:hex, :esqlite, "0.2.4", "3a8a352c190afe2d6b828b252a6fbff65b5cc1124647f38b15bdab3bf6fd4b3e", [:rebar3], [], "hexpm"},
   "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
   "excoveralls": {:hex, :excoveralls, "0.9.1", "14fd20fac51ab98d8e79615814cc9811888d2d7b28e85aa90ff2e30dcf3191d6", [:mix], [{:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
diff --git a/test/test_helper.exs b/test/test_helper.exs
index f0618319..869559e7 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -1,11 +1 @@
-IO.puts """
-IMPORTANT: If you see many tests fail with a warning about cell-wise
-default values not being supported in SQLite, please run the script
-
-  ./integration/hack_out_incompatible_tests.sh
-
-and then run `mix test` again.
-
-"""
-
 ExUnit.start()

From b764eaa621ce9d667d01dc7056b2f794c0d3cfd2 Mon Sep 17 00:00:00 2001
From: Eric Scouten <eric@scouten.com>
Date: Thu, 21 Sep 2017 21:13:27 -0700
Subject: [PATCH 4/7] Advance to "Lock migrations to support multiple
 concurrent migrators" commit from 09 Sep 17.

---
 lib/sqlite_ecto.ex | 10 ++++++++++
 mix.exs            |  2 +-
 mix.lock           |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/sqlite_ecto.ex b/lib/sqlite_ecto.ex
index a5d72cb1..72fdf532 100644
--- a/lib/sqlite_ecto.ex
+++ b/lib/sqlite_ecto.ex
@@ -153,4 +153,14 @@ defmodule Sqlite.Ecto2 do
 
   @doc false
   def supports_ddl_transaction?, do: true
+
+  # Since SQLite doesn't have locks, we use this version of lock_for_migrations
+  # to disable the lock behavior and fall back to single-threaded migration.
+  # See https://github.com/elixir-ecto/ecto/pull/2215#issuecomment-332497229.
+  def lock_for_migrations(repo, query, _opts, fun) do
+    query
+    |> Map.put(:lock, nil)
+    |> repo.all()
+    |> fun.()
+  end
 end
diff --git a/mix.exs b/mix.exs
index 89012317..b555d9bf 100644
--- a/mix.exs
+++ b/mix.exs
@@ -43,7 +43,7 @@ defmodule Sqlite.Ecto2.Mixfile do
      {:decimal, "~> 1.5"},
      {:excoveralls, "~> 0.9", only: :test},
      {:ex_doc, "~> 0.18", runtime: false, only: :docs},
-     {:ecto, github: "elixir-ecto/ecto", ref: "6da19b7033cec7382aa798f282b4e8205f08b09b"},
+     {:ecto, github: "elixir-ecto/ecto", ref: "d28aebac6c3b8203750bd23e965a7ba19d42bda6"},
      {:poison, "~> 2.2 or ~> 3.0", optional: true},
      {:postgrex, "~> 0.13", optional: true},
      {:sbroker, "~> 1.0"},
diff --git a/mix.lock b/mix.lock
index 4c5cb493..81c8d5a1 100644
--- a/mix.lock
+++ b/mix.lock
@@ -7,7 +7,7 @@
   "db_connection": {:hex, :db_connection, "1.1.3", "89b30ca1ef0a3b469b1c779579590688561d586694a3ce8792985d4d7e575a61", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
   "decimal": {:hex, :decimal, "1.5.0", "b0433a36d0e2430e3d50291b1c65f53c37d56f83665b43d79963684865beab68", [:mix], [], "hexpm"},
   "earmark": {:hex, :earmark, "1.2.5", "4d21980d5d2862a2e13ec3c49ad9ad783ffc7ca5769cf6ff891a4553fbaae761", [:mix], [], "hexpm"},
-  "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "6da19b7033cec7382aa798f282b4e8205f08b09b", [ref: "6da19b7033cec7382aa798f282b4e8205f08b09b"]},
+  "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "d28aebac6c3b8203750bd23e965a7ba19d42bda6", [ref: "d28aebac6c3b8203750bd23e965a7ba19d42bda6"]},
   "esqlite": {:hex, :esqlite, "0.2.4", "3a8a352c190afe2d6b828b252a6fbff65b5cc1124647f38b15bdab3bf6fd4b3e", [:rebar3], [], "hexpm"},
   "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
   "excoveralls": {:hex, :excoveralls, "0.9.1", "14fd20fac51ab98d8e79615814cc9811888d2d7b28e85aa90ff2e30dcf3191d6", [:mix], [{:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},

From 56f4e5daf1d8f7a85d480a2c51a42f3a923a2a95 Mon Sep 17 00:00:00 2001
From: Eric Scouten <eric@scouten.com>
Date: Wed, 27 Sep 2017 17:44:08 -0700
Subject: [PATCH 5/7] Advance to "Fix typespecs for multi" commit from 20 Sep
 2017.

(And we're now caught up to current master branch.)
---
 mix.exs  | 2 +-
 mix.lock | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/mix.exs b/mix.exs
index b555d9bf..356b8c8a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -43,7 +43,7 @@ defmodule Sqlite.Ecto2.Mixfile do
      {:decimal, "~> 1.5"},
      {:excoveralls, "~> 0.9", only: :test},
      {:ex_doc, "~> 0.18", runtime: false, only: :docs},
-     {:ecto, github: "elixir-ecto/ecto", ref: "d28aebac6c3b8203750bd23e965a7ba19d42bda6"},
+     {:ecto, github: "elixir-ecto/ecto", ref: "3a0616a356ecbc3b6ba1e391e785a13f66c13da9"},
      {:poison, "~> 2.2 or ~> 3.0", optional: true},
      {:postgrex, "~> 0.13", optional: true},
      {:sbroker, "~> 1.0"},
diff --git a/mix.lock b/mix.lock
index 81c8d5a1..319d00bc 100644
--- a/mix.lock
+++ b/mix.lock
@@ -3,14 +3,7 @@
   "certifi": {:hex, :certifi, "1.0.0", "1c787a85b1855ba354f0b8920392c19aa1d06b0ee1362f9141279620a5be2039", [:rebar3], [], "hexpm"},
   "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
   "coverex": {:hex, :coverex, "1.4.13", "d90833b82bdd6a1ec05a6d971283debc3dd9611957489010e4b1ab0071a9ee6c", [:mix], [{:hackney, "~> 1.5", [hex: :hackney, repo: "hexpm", optional: false]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
-  "credo": {:hex, :credo, "0.10.0", "66234a95effaf9067edb19fc5d0cd5c6b461ad841baac42467afed96c78e5e9e", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
-  "db_connection": {:hex, :db_connection, "1.1.3", "89b30ca1ef0a3b469b1c779579590688561d586694a3ce8792985d4d7e575a61", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
-  "decimal": {:hex, :decimal, "1.5.0", "b0433a36d0e2430e3d50291b1c65f53c37d56f83665b43d79963684865beab68", [:mix], [], "hexpm"},
-  "earmark": {:hex, :earmark, "1.2.5", "4d21980d5d2862a2e13ec3c49ad9ad783ffc7ca5769cf6ff891a4553fbaae761", [:mix], [], "hexpm"},
-  "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "d28aebac6c3b8203750bd23e965a7ba19d42bda6", [ref: "d28aebac6c3b8203750bd23e965a7ba19d42bda6"]},
-  "esqlite": {:hex, :esqlite, "0.2.4", "3a8a352c190afe2d6b828b252a6fbff65b5cc1124647f38b15bdab3bf6fd4b3e", [:rebar3], [], "hexpm"},
-  "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
-  "excoveralls": {:hex, :excoveralls, "0.9.1", "14fd20fac51ab98d8e79615814cc9811888d2d7b28e85aa90ff2e30dcf3191d6", [:mix], [{:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
+
   "hackney": {:hex, :hackney, "1.7.1", "e238c52c5df3c3b16ce613d3a51c7220a784d734879b1e231c9babd433ac1cb4", [:rebar3], [{:certifi, "1.0.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "4.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
   "idna": {:hex, :idna, "4.0.0", "10aaa9f79d0b12cf0def53038547855b91144f1bfcc0ec73494f38bb7b9c4961", [:rebar3], [], "hexpm"},
   "jason": {:hex, :jason, "1.1.1", "d3ccb840dfb06f2f90a6d335b536dd074db748b3e7f5b11ab61d239506585eb2", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},

From 039513494b2f9021e10d349003b6fa8d9472495b Mon Sep 17 00:00:00 2001
From: Eric Scouten <eric@scouten.com>
Date: Sun, 8 Oct 2017 10:51:35 -0700
Subject: [PATCH 6/7] Advance to "Allow casting Date from NaiveDateTime ISO"
 commit from 07 Oct 2017.

---
 mix.exs  | 2 +-
 mix.lock | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mix.exs b/mix.exs
index 356b8c8a..347d4e78 100644
--- a/mix.exs
+++ b/mix.exs
@@ -43,7 +43,7 @@ defmodule Sqlite.Ecto2.Mixfile do
      {:decimal, "~> 1.5"},
      {:excoveralls, "~> 0.9", only: :test},
      {:ex_doc, "~> 0.18", runtime: false, only: :docs},
-     {:ecto, github: "elixir-ecto/ecto", ref: "3a0616a356ecbc3b6ba1e391e785a13f66c13da9"},
+     {:ecto, github: "elixir-ecto/ecto", ref: "ad54edaf195d8cc7f333ac7464017c3cbc752f58"},
      {:poison, "~> 2.2 or ~> 3.0", optional: true},
      {:postgrex, "~> 0.13", optional: true},
      {:sbroker, "~> 1.0"},
diff --git a/mix.lock b/mix.lock
index 319d00bc..bfe3eec5 100644
--- a/mix.lock
+++ b/mix.lock
@@ -3,7 +3,14 @@
   "certifi": {:hex, :certifi, "1.0.0", "1c787a85b1855ba354f0b8920392c19aa1d06b0ee1362f9141279620a5be2039", [:rebar3], [], "hexpm"},
   "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
   "coverex": {:hex, :coverex, "1.4.13", "d90833b82bdd6a1ec05a6d971283debc3dd9611957489010e4b1ab0071a9ee6c", [:mix], [{:hackney, "~> 1.5", [hex: :hackney, repo: "hexpm", optional: false]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
-
+  "credo": {:hex, :credo, "0.10.0", "66234a95effaf9067edb19fc5d0cd5c6b461ad841baac42467afed96c78e5e9e", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
+  "db_connection": {:hex, :db_connection, "1.1.3", "89b30ca1ef0a3b469b1c779579590688561d586694a3ce8792985d4d7e575a61", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
+  "decimal": {:hex, :decimal, "1.5.0", "b0433a36d0e2430e3d50291b1c65f53c37d56f83665b43d79963684865beab68", [:mix], [], "hexpm"},
+  "earmark": {:hex, :earmark, "1.2.5", "4d21980d5d2862a2e13ec3c49ad9ad783ffc7ca5769cf6ff891a4553fbaae761", [:mix], [], "hexpm"},
+  "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "ad54edaf195d8cc7f333ac7464017c3cbc752f58", [ref: "ad54edaf195d8cc7f333ac7464017c3cbc752f58"]},
+  "esqlite": {:hex, :esqlite, "0.2.4", "3a8a352c190afe2d6b828b252a6fbff65b5cc1124647f38b15bdab3bf6fd4b3e", [:rebar3], [], "hexpm"},
+  "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
+  "excoveralls": {:hex, :excoveralls, "0.9.1", "14fd20fac51ab98d8e79615814cc9811888d2d7b28e85aa90ff2e30dcf3191d6", [:mix], [{:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
   "hackney": {:hex, :hackney, "1.7.1", "e238c52c5df3c3b16ce613d3a51c7220a784d734879b1e231c9babd433ac1cb4", [:rebar3], [{:certifi, "1.0.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "4.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
   "idna": {:hex, :idna, "4.0.0", "10aaa9f79d0b12cf0def53038547855b91144f1bfcc0ec73494f38bb7b9c4961", [:rebar3], [], "hexpm"},
   "jason": {:hex, :jason, "1.1.1", "d3ccb840dfb06f2f90a6d335b536dd074db748b3e7f5b11ab61d239506585eb2", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},

From 7ddf467ebaf4692dad56491dc17bf1d367bdb85f Mon Sep 17 00:00:00 2001
From: Connor Rigby <konnorrigby@gmail.com>
Date: Sat, 4 Aug 2018 17:38:55 -0700
Subject: [PATCH 7/7] Remove integration hacks.

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f89fac0c..9177ebce 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,7 +13,6 @@ jobs:
       - run: mix deps.get
       - run: mix deps.compile
       - run: mix compile
-      - run: ./integration/hack_out_incompatible_tests.sh
       - run: mix credo --strict
       - run: mix coveralls.circle
       - save_cache: