fix tests

Author: ruslandoga

lib/req_ch.ex

@@ -177,7 +177,67 @@ defmodule ReqCH do
   end
 
   defp prepare_params(params) do
-    Enum.map(params, fn {key, value} -> {"param_#{key}", value} end)
+    Enum.map(params, fn {key, value} -> {"param_#{key}", prepare_param_value(value)} end)
+  end
+
+  defp prepare_param_value(text) when is_binary(text) do
+    escapes = [{"\\", "\\\\"}, {"\t", "\\\t"}, {"\n", "\\\n"}]
+
+    Enum.reduce(escapes, text, fn {pattern, replacement}, text ->
+      String.replace(text, pattern, replacement)
+    end)
+  end
+
+  defp prepare_param_value(%DateTime{} = datetime) do
+    unix_microseconds =
+      datetime
+      |> DateTime.shift_zone!("Etc/UTC")
+      |> DateTime.to_unix(:microsecond)
+
+    unix_seconds = unix_microseconds / 1_000_000
+    unix_seconds_trunc = trunc(unix_seconds)
+
+    if unix_seconds_trunc == unix_seconds do
+      unix_seconds_trunc
+    else
+      :erlang.float_to_binary(unix_seconds, decimals: 6)
+    end
+  end
+
+  defp prepare_param_value(array) when is_list(array) do
+    elements = Enum.map(array, &prepare_array_param_value/1)
+    IO.iodata_to_binary([?[, Enum.intersperse(elements, ?,), ?]])
+  end
+
+  defp prepare_param_value(tuple) when is_tuple(tuple) do
+    elements = Enum.map(Tuple.to_list(tuple), &prepare_array_param_value/1)
+    IO.iodata_to_binary([?(, Enum.intersperse(elements, ?,), ?)])
+  end
+
+  defp prepare_param_value(struct) when is_struct(struct), do: to_string(struct)
+
+  defp prepare_param_value(map) when is_map(map) do
+    elements = Enum.map(Map.to_list(map), &prepare_map_param_value/1)
+    IO.iodata_to_binary([?{, Enum.intersperse(elements, ?,), ?}])
+  end
+
+  defp prepare_param_value(other), do: to_string(other)
+
+  defp prepare_array_param_value(text) when is_binary(text) do
+    text = prepare_param_value(text)
+    [?', String.replace(text, "'", "''"), ?']
+  end
+
+  defp prepare_array_param_value(%s{} = param) when s in [Date, NaiveDateTime] do
+    [?', to_string(param), ?']
+  end
+
+  defp prepare_array_param_value(other), do: prepare_param_value(other)
+
+  defp prepare_map_param_value({key, value}) do
+    key = prepare_array_param_value(key)
+    value = prepare_array_param_value(value)
+    [key, ?:, value]
   end
 
   @valid_formats [:tsv, :csv, :json, :explorer]

test/req_ch_test.exs

@@ -215,12 +215,12 @@ defmodule ReqCHTest do
 
     test "a query with Date(Time) params" do
       utc_now = ~U[2024-12-20 05:44:53.855679Z]
-      naive_now = DateTime.to_naive(utc_now)
+      utc_now_seconds = DateTime.truncate(utc_now, :second)
       utc_today = DateTime.to_date(utc_now)
 
       params = [
         utc_now: utc_now,
-        naive_now: naive_now,
+        utc_now_seconds: utc_now_seconds,
         utc_today: utc_today
       ]
 
@@ -229,17 +229,24 @@ defmodule ReqCHTest do
           ReqCH.new(),
           """
           SELECT
-            {utc_now:DateTime},
             {utc_now:DateTime64(6)},
-            {naive_now:DateTime},
-            {naive_now:DateTime64(6)},
-            {date:Date}
+            {utc_now_seconds:DateTime},
+            {utc_today:Date}
+          FORMAT
+            JSONCompact
           """,
           params
         )
 
       assert response.status == 200
-      assert response.body == ""
+
+      assert response.body["data"] == [
+               [
+                 "2024-12-20 05:44:53.855679",
+                 "2024-12-20 05:44:53",
+                 "2024-12-20"
+               ]
+             ]
     end
 
     # https://clickhouse.com/docs/en/interfaces/http#tabs-in-url-parameters
@@ -252,17 +259,21 @@ defmodule ReqCHTest do
       ]
 
       response =
-        ReqCH.query(ReqCH.new(), "SELECT {tab:String}, {newline:String}, {both:String}", params)
+        ReqCH.query!(
+          ReqCH.new(),
+          "SELECT {tab:String}, {newline:String}, {both:String} FORMAT JSONCompact",
+          params
+        )
 
       assert response.status == 200
-      assert response.body == "a\tb\nc\n"
+      assert response.body["data"] == [["a\tb", "c\nd", "a\tb\nc\t\nd"]]
     end
 
     test "a query with arrays" do
       params = [
-        array: ["a", "b", "c"],
+        array: ["a", "b", "c", "a\tb\nc\t\nd"],
         empty_array: [],
-        nested_array: [["a", "b"], ["c", "d"]],
+        nested_array: [["a", "b"], ["c", "d"], ["a\tb\nc\t\nd"]],
         date_array: [~D[2024-12-20], ~D[2024-12-21]]
       ]
 
@@ -275,12 +286,22 @@ defmodule ReqCHTest do
             {empty_array:Array(String)},
             {nested_array:Array(Array(String))},
             {date_array:Array(Date)}
+          FORMAT
+            JSONCompact
           """,
           params
         )
 
       assert response.status == 200
-      assert response.body == ""
+
+      assert response.body["data"] == [
+               [
+                 ["a", "b", "c", "a\tb\nc\t\nd"],
+                 [],
+                 [["a", "b"], ["c", "d"], ["a\tb\nc\t\nd"]],
+                 ["2024-12-20", "2024-12-21"]
+               ]
+             ]
     end
 
     test "a query with tuples" do
@@ -305,7 +326,14 @@ defmodule ReqCHTest do
         )
 
       assert response.status == 200
-      assert response.body == ""
+
+      assert response.body ==
+               """
+               (1,'a','2024-12-20')\t\
+               ()\t\
+               ((1,'a'),(2,'b'))\t\
+               ('2024-12-20','2024-12-21')
+               """
     end
 
     test "a query with maps" do
@@ -325,12 +353,22 @@ defmodule ReqCHTest do
             {empty_map:Map(String, UInt8)},
             {nested_map:Map(String, Map(String, UInt8))},
             {date_map:Map(String, Date)}
+          FORMAT
+            JSONCompact
           """,
           params
         )
 
       assert response.status == 200
-      assert response.body == ""
+
+      assert response.body["data"] == [
+               [
+                 %{"a" => 1, "b" => 2},
+                 %{},
+                 %{"a" => %{"b" => 1}, "c" => %{"d" => 2}},
+                 %{"a" => "2024-12-20", "b" => "2024-12-21"}
+               ]
+             ]
     end
 
     test "a query with unknown database" do