Release v0.11.1

elixir-ecto · May 5, 2015 · dba5c80 · dba5c80
1 parent 8af5d11
commit dba5c80
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## v0.11.1 (2015-05-05)
+
+* Enhancements
+  * Add `force_change/3` to force a change into a changeset
+
+* Bug fixes
+  * `put_change/3`, `put_new_change/3` and `change/2` in `Ecto.Changeset` also verify the model value before storing the change
+
 ## v0.11.0 (2015-05-04)
 
 * Enhancements

diff --git a/lib/ecto/changeset.ex b/lib/ecto/changeset.ex
@@ -51,6 +51,7 @@ defmodule Ecto.Changeset do
 
   @doc """
   Wraps the given model in a changeset or adds changes to a changeset.
+
   Changed attributes will only be added if the change does not have the
   same value as the attribute in the model.
 
@@ -64,9 +65,9 @@ defmodule Ecto.Changeset do
   `changes` to be atoms. `changes` can be a map as well as a keyword list.
 
   When a changeset is passed as the first argument, the changes passed as the
-  second argument are merged over the changes already in the changeset (with
-  precedence to the new changes) without checking the model. If `changes` is
-  not present or is an empty map, this function is a no-op.
+  second argument are merged over the changes already in the changeset if they
+  differ from the values in the model. If `changes` is an empty map, this
+  function is a no-op.
 
   See `cast/4` if you'd prefer to cast and validate external parameters.
 
@@ -536,7 +537,6 @@ defmodule Ecto.Changeset do
     update_in changeset.changes, &Map.put(&1, key, value)
   end
 
-
   @doc """
   Puts a change on the given `key` only if a change with that key doesn't
   already exist, also, if the change has the same value as the model, it

diff --git a/lib/ecto/type.ex b/lib/ecto/type.ex
@@ -3,7 +3,7 @@ defmodule Ecto.Type do
   Defines functions and the `Ecto.Type` behaviour for implementing
   custom types.
 
-  A custom type expects 5 functions to be implemented, all documented
+  A custom type expects 4 functions to be implemented, all documented
   and described below. We also provide two examples of how custom
   types can be used in Ecto to augment existing types or providing
   your own types.

diff --git a/mix.exs b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Ecto.Mixfile do
   use Mix.Project
 
-  @version "0.11.0"
+  @version "0.11.1"
   @adapters [:pg, :mysql]
 
   def project do