Merge branch 'master' into send-params-in-multipart-form

Author: hawkyre

mix.lock

@@ -7,7 +7,7 @@
   "earmark_parser": {:hex, :earmark_parser, "1.4.44", "f20830dd6b5c77afe2b063777ddbbff09f9759396500cdbe7523efd58d7a339c", [:mix], [], "hexpm", "4778ac752b4701a5599215f7030989c989ffdc4f6df457c5f36938cc2d2a2750"},
   "ecto": {:hex, :ecto, "3.13.2", "7d0c0863f3fc8d71d17fc3ad3b9424beae13f02712ad84191a826c7169484f01", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "669d9291370513ff56e7b7e7081b7af3283d02e046cf3d403053c557894a0b3e"},
   "erlex": {:hex, :erlex, "0.2.7", "810e8725f96ab74d17aac676e748627a07bc87eb950d2b83acd29dc047a30595", [:mix], [], "hexpm", "3ed95f79d1a844c3f6bf0cea61e0d5612a42ce56da9c03f01df538685365efb0"},
-  "ex_doc": {:hex, :ex_doc, "0.38.3", "ddafe36b8e9fe101c093620879f6604f6254861a95133022101c08e75e6c759a", [:mix], [{:earmark_parser, "~> 1.4.44", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "ecaa785456a67f63b4e7d7f200e8832fa108279e7eb73fd9928e7e66215a01f9"},
+  "ex_doc": {:hex, :ex_doc, "0.38.4", "ab48dff7a8af84226bf23baddcdda329f467255d924380a0cf0cee97bb9a9ede", [:mix], [{:earmark_parser, "~> 1.4.44", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "f7b62346408a83911c2580154e35613eb314e0278aeea72ed7fedef9c1f165b2"},
   "hpax": {:hex, :hpax, "1.0.3", "ed67ef51ad4df91e75cc6a1494f851850c0bd98ebc0be6e81b026e765ee535aa", [:mix], [], "hexpm", "8eab6e1cfa8d5918c2ce4ba43588e894af35dbd8e91e6e55c817bca5847df34a"},
   "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
   "makeup": {:hex, :makeup, "1.2.1", "e90ac1c65589ef354378def3ba19d401e739ee7ee06fb47f94c687016e3713d1", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d36484867b0bae0fea568d10131197a4c2e47056a6fbe84922bf6ba71c8d17ce"},

test/ch/connection_test.exs

@@ -597,7 +597,7 @@ defmodule Ch.ConnectionTest do
     test "json as string", %{conn: conn} do
       # after v25 ClickHouse started rendering numbers in JSON as strings
       [[version]] = Ch.query!(conn, "select version()").rows
-      numbers_as_strings? = version >= "25"
+      numbers_as_strings? = version >= "25" and version <= "25.8"
 
       [expected1, expected2] =
         if numbers_as_strings? do
@@ -608,7 +608,7 @@ defmodule Ch.ConnectionTest do
         else
           [
             [[~s|{"answer":42}|]],
-            [[~s|{"a":"42"}|], [~s|{"b":"10"}|]]
+            [[~s|{"a":42}|], [~s|{"b":10}|]]
           ]
         end
 

test/ch/json_test.exs

@@ -19,8 +19,9 @@ defmodule Ch.JSONTest do
 
     assert select.(~s|{"a":"b","c":"d"}|) == %{"a" => "b", "c" => "d"}
 
-    # note that 42 is a string here, not an integer
-    assert select.(~s|{"a":42}|) == %{"a" => "42"}
+    # note that 42 was a string in pre-25.0 and post-25.8 ClickHouse versions
+
+    assert select.(~s|{"a":42}|) == %{"a" => 42}
 
     assert select.(~s|{}|) == %{}
 
@@ -36,7 +37,7 @@ defmodule Ch.JSONTest do
     assert select.(~s|{"a":{"b":"c"}}|) == %{"a" => %{"b" => "c"}}
 
     # numbers in arrays become strings
-    assert select.(~s|{"a":[1,2,3]}|) == %{"a" => ["1", "2", "3"]}
+    assert select.(~s|{"a":[1,2,3]}|) == %{"a" => [1, 2, 3]}
 
     # this is weird, fields with dots are treated as nested objects
     assert select.(~s|{"a.b":"c"}|) == %{"a" => %{"b" => "c"}}
@@ -46,10 +47,10 @@ defmodule Ch.JSONTest do
     assert select.(~s|{"a":[null]}|) == %{"a" => [nil]}
 
     # everything in an array gets converted to "lcd" type, aka string
-    assert select.(~s|{"a":[1,3.14,"hello",null]}|) == %{"a" => ["1", "3.14", "hello", nil]}
+    assert select.(~s|{"a":[1,3.14,"hello",null]}|) == %{"a" => [1, 3.14, "hello", nil]}
 
     # but not if the array has nested objects, then the array becomes a tuple and can support mixed types
-    assert select.(~s|{"a":[1,2.13,"s",{"a":"b"}]}|) == %{"a" => ["1", 2.13, "s", %{"a" => "b"}]}
+    assert select.(~s|{"a":[1,2.13,"s",{"a":"b"}]}|) == %{"a" => [1, 2.13, "s", %{"a" => "b"}]}
   end
 
   # https://clickhouse.com/docs/sql-reference/data-types/newjson#using-json-in-a-table-column-definition
@@ -67,9 +68,9 @@ defmodule Ch.JSONTest do
              conn,
              "SELECT json FROM json_test ORDER BY id"
            ).rows == [
-             [%{"a" => %{"b" => "42"}, "c" => ["1", "2", "3"]}],
+             [%{"a" => %{"b" => 42}, "c" => [1, 2, 3]}],
              [%{"f" => "Hello, World!"}],
-             [%{"a" => %{"b" => "43", "e" => "10"}, "c" => ["4", "5", "6"]}]
+             [%{"a" => %{"b" => 43, "e" => 10}, "c" => [4, 5, 6]}]
            ]
 
     Ch.query!(
@@ -83,7 +84,7 @@ defmodule Ch.JSONTest do
              conn,
              "SELECT json FROM json_test where json.from = 'rowbinary'"
            ).rows == [
-             [%{"from" => "rowbinary", "some other" => "json value", "a" => %{"b" => "999"}}]
+             [%{"from" => "rowbinary", "some other" => "json value", "a" => %{"b" => 999}}]
            ]
 
     assert Ch.query!(conn, "select json.a.b, json.a.g, json.c, json.d from json_test order by id").rows ==
@@ -110,9 +111,9 @@ defmodule Ch.JSONTest do
              conn,
              "SELECT json FROM json_test"
            ).rows == [
-             [%{"a" => %{"b" => 42}, "c" => ["1", "2", "3"]}],
+             [%{"a" => %{"b" => 42}, "c" => [1, 2, 3]}],
              [%{"a" => %{"b" => 0}, "f" => "Hello, World!"}],
-             [%{"a" => %{"b" => 43}, "c" => ["4", "5", "6"]}]
+             [%{"a" => %{"b" => 43}, "c" => [4, 5, 6]}]
            ]
   end
 
@@ -131,9 +132,9 @@ defmodule Ch.JSONTest do
              conn,
              "SELECT json FROM json_test"
            ).rows == [
-             [%{"a" => %{"b" => 42, "g" => 42.42}, "c" => ["1", "2", "3"], "d" => "2020-01-01"}],
+             [%{"a" => %{"b" => 42, "g" => 42.42}, "c" => [1, 2, 3], "d" => "2020-01-01"}],
              [%{"a" => %{"b" => 0}, "d" => "2020-01-02", "f" => "Hello, World!"}],
-             [%{"a" => %{"b" => 43, "g" => 43.43}, "c" => ["4", "5", "6"]}]
+             [%{"a" => %{"b" => 43, "g" => 43.43}, "c" => [4, 5, 6]}]
            ]
 
     assert Ch.query!(conn, "SELECT json.a.b, json.a.g, json.c, json.d FROM json_test").rows == [
@@ -204,24 +205,24 @@ defmodule Ch.JSONTest do
     assert Ch.query!(conn, "SELECT json FROM json_test;").rows == [
              [
                %{
-                 "a" => %{"b" => %{"c" => "42", "g" => 42.42}},
-                 "c" => ["1", "2", "3"],
-                 "d" => %{"e" => %{"f" => %{"g" => "Hello, World", "h" => ["1", "2", "3"]}}}
+                 "a" => %{"b" => %{"c" => 42, "g" => 42.42}},
+                 "c" => [1, 2, 3],
+                 "d" => %{"e" => %{"f" => %{"g" => "Hello, World", "h" => [1, 2, 3]}}}
                }
              ],
-             [%{"d" => %{"e" => %{"f" => %{"h" => ["4", "5", "6"]}}}, "f" => "Hello, World!"}],
+             [%{"d" => %{"e" => %{"f" => %{"h" => [4, 5, 6]}}}, "f" => "Hello, World!"}],
              [
                %{
-                 "a" => %{"b" => %{"c" => "43", "e" => "10", "g" => 43.43}},
-                 "c" => ["4", "5", "6"]
+                 "a" => %{"b" => %{"c" => 43, "e" => 10, "g" => 43.43}},
+                 "c" => [4, 5, 6]
                }
              ]
            ]
 
     assert Ch.query!(conn, "SELECT json.^a.b, json.^d.e.f FROM json_test;").rows == [
-             [%{"c" => "42", "g" => 42.42}, %{"g" => "Hello, World", "h" => ["1", "2", "3"]}],
-             [%{}, %{"h" => ["4", "5", "6"]}],
-             [%{"c" => "43", "e" => "10", "g" => 43.43}, %{}]
+             [%{"c" => 42, "g" => 42.42}, %{"g" => "Hello, World", "h" => [1, 2, 3]}],
+             [%{}, %{"h" => [4, 5, 6]}],
+             [%{"c" => 43, "e" => 10, "g" => 43.43}, %{}]
            ]
   end
 
@@ -243,33 +244,33 @@ defmodule Ch.JSONTest do
                  "a" => %{
                    "b" => [
                      %{
-                       "c" => "42",
+                       "c" => 42,
                        "d" => "Hello",
                        "f" => [[%{"g" => 42.42}]],
-                       "k" => %{"j" => "1000"}
+                       "k" => %{"j" => 1000}
                      },
-                     %{"c" => "43"},
+                     %{"c" => 43},
                      %{
                        "d" => "My",
-                       "e" => ["1", "2", "3"],
+                       "e" => [1, 2, 3],
                        "f" => [[%{"g" => 43.43, "h" => "2020-01-01"}]],
-                       "k" => %{"j" => "2000"}
+                       "k" => %{"j" => 2000}
                      }
                    ]
                  }
                }
              ],
-             [%{"a" => %{"b" => ["1", "2", "3"]}}],
+             [%{"a" => %{"b" => [1, 2, 3]}}],
              [
                %{
                  "a" => %{
                    "b" => [
-                     %{"c" => "44", "f" => [[%{"h" => "2020-01-02"}]]},
+                     %{"c" => 44, "f" => [[%{"h" => "2020-01-02"}]]},
                      %{
                        "d" => "World",
-                       "e" => ["4", "5", "6"],
+                       "e" => [4, 5, 6],
                        "f" => [[%{"g" => 44.44}]],
-                       "k" => %{"j" => "3000"}
+                       "k" => %{"j" => 3000}
                      }
                    ]
                  }