diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e091ca92..c75bb476 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,8 +44,8 @@ jobs: - version: 14 pair: - - elixir: 1.12 - otp: 24.3 + - elixir: 1.13 + otp: 25.3 include: - pg: version: 14 diff --git a/lib/postgrex/protocol.ex b/lib/postgrex/protocol.ex index 19ae5b56..b6db636e 100644 --- a/lib/postgrex/protocol.ex +++ b/lib/postgrex/protocol.ex @@ -93,13 +93,14 @@ defmodule Postgrex.Protocol do {nil, opts} {true, opts} -> - Logger.warning( - "setting ssl: true on your database connection offers only limited protection, " <> - "as the server's certificate is not verified. Set \"ssl: [cacertfile: path/to/file]\" instead" - ) + case Keyword.pop(opts, :ssl_opts) do + {nil, _opts} -> + [cacerts: :public_key.cacerts_get()] ++ default_ssl_opts() - # Read ssl_opts for backwards compatibility - Keyword.pop(opts, :ssl_opts, []) + {ssl_opts, opts} -> + Logger.warning(":ssl_opts is deprecated, pass opts to :ssl instead") + {ssl_opts, opts} + end {ssl_opts, opts} when is_list(ssl_opts) -> {Keyword.merge(default_ssl_opts(), ssl_opts), opts} diff --git a/mix.exs b/mix.exs index 0116d97d..d2ab887d 100644 --- a/mix.exs +++ b/mix.exs @@ -2,13 +2,13 @@ defmodule Postgrex.Mixfile do use Mix.Project @source_url "https://github.com/elixir-ecto/postgrex" - @version "0.20.0" + @version "0.21.0-dev" def project do [ app: :postgrex, version: @version, - elixir: "~> 1.11", + elixir: "~> 1.13", deps: deps(), name: "Postgrex", description: "PostgreSQL driver for Elixir",