Merge pull request plausible#3 from plausible/use-opts

use opts
ally9335 · Oct 5, 2022 · e6b7cc5 · e6b7cc5
2 parents 490e9b2 + d0ab8f2
commit e6b7cc5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/clickhousex/protocol.ex b/lib/clickhousex/protocol.ex
@@ -165,12 +165,12 @@ defmodule Clickhousex.Protocol do
 
   ## Private functions
 
-  defp do_query(query, params, _opts, state) do
-    base_address = state.base_address
-    username = state.conn_opts[:username]
-    password = state.conn_opts[:password]
-    timeout = state.conn_opts[:timeout]
-    database = state.conn_opts[:database]
+  defp do_query(query, params, opts, state) do
+    %{base_address: base_address, conn_opts: conn_opts} = state
+    username = opts[:username] || conn_opts[:username]
+    password = opts[:password] || conn_opts[:password]
+    timeout = opts[:timeout] || conn_opts[:timeout]
+    database = opts[:database] || conn_opts[:database]
 
     query
     |> Client.send(params, base_address, timeout, username, password, database)