Release v0.15.13

Author: josevalim

Diff for: CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.15.13 (2021-10-25)
+
+* Bug fix
+  * Fix regression on Elixir earlier than v1.9
+
 ## v0.15.12 (2021-10-17)
 
 * Enhancements

Diff for: lib/postgrex/protocol.ex

@@ -153,7 +153,7 @@ defmodule Postgrex.Protocol do
          previous_errors
        ) do
     types_key = if types_mod, do: {host, port, Keyword.fetch!(opts, :database)}
-    opts = Config.Reader.merge(opts, extra_opts)
+    opts = __merge__(opts, extra_opts)
 
     status = %{status | types_key: types_key, opts: opts}
 
@@ -197,6 +197,21 @@ defmodule Postgrex.Protocol do
     end
   end
 
+  # Ported from Config.Reader.merge/2
+  defp __merge__(config1, config2) when is_list(config1) and is_list(config2) do
+    Keyword.merge(config1, config2, fn _, app1, app2 ->
+      Keyword.merge(app1, app2, &deep_merge/3)
+    end)
+  end
+
+  defp deep_merge(_key, value1, value2) do
+    if Keyword.keyword?(value1) and Keyword.keyword?(value2) do
+      Keyword.merge(value1, value2, &deep_merge/3)
+    else
+      value2
+    end
+  end
+
   @spec disconnect(Exception.t(), state) :: :ok
   def disconnect(_, s) do
     sock_close(s)

Diff for: mix.exs

@@ -2,7 +2,7 @@ defmodule Postgrex.Mixfile do
   use Mix.Project
 
   @source_url "https://github.com/elixir-ecto/postgrex"
-  @version "0.15.12"
+  @version "0.15.13"
 
   def project do
     [