From bb8117baf4bc1160643f1d0a403ca9f0d6b833bd Mon Sep 17 00:00:00 2001 From: Jason Axelson Date: Wed, 6 Feb 2019 14:20:09 -1000 Subject: [PATCH] Switch back to depending on ecto instead of ecto_sql ecto_sql is still used for tests Fixes #67 --- CHANGELOG.md | 7 +++++++ mix.exs | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d02487..674b615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,16 @@ # Changelog +## v1.0.6 - Unreleased + +- Bug Fix: Depend on `ecto` instead of `ecto_sql`. Fixes Ecto 2.x support (#67) + ## v1.0.5 - 2019-02-03 - Bug Fix: Fix dialyzer spec for run_batch function +**Breaking change:** Dependency changed from `ecto` to `ecto_sql` which +unintentionally breaks `Dataloader.Ecto` on Ecto 2.x projects (#67). + ## v1.0.4 - 2018-09-14 - Bug Fix: Poor supervisor structure has been improved, which fixes large memory diff --git a/mix.exs b/mix.exs index 7acd44f..807a763 100644 --- a/mix.exs +++ b/mix.exs @@ -61,7 +61,8 @@ defmodule Dataloader.Mixfile do # Run "mix help deps" to learn about dependencies. defp deps do [ - {:ecto_sql, "~> 3.0", optional: true}, + {:ecto, ">= 0.0.0", optional: true}, + {:ecto_sql, "~> 3.0", optional: true, only: :test}, {:postgrex, "~> 0.14", only: :test}, {:dialyxir, "~> 0.5", only: :dev}, {:ex_doc, ">= 0.0.0", only: [:dev]}