manual opts

Author: ruslandoga

test/ch/json_test.exs

@@ -2,16 +2,7 @@ defmodule Ch.JSONTest do
   use ExUnit.Case
 
   setup do
-    conn =
-      start_supervised!(
-        {Ch,
-         database: Ch.Test.database(),
-         settings: [
-           enable_json_type: 1,
-           input_format_binary_read_json_as_string: 1,
-           output_format_binary_write_json_as_string: 1
-         ]}
-      )
+    conn = start_supervised!({Ch, database: Ch.Test.database(), settings: [enable_json_type: 1]})
 
     on_exit(fn ->
       Ch.Test.sql_exec("DROP TABLE test", [], database: Ch.Test.database())
@@ -31,7 +22,14 @@ defmodule Ch.JSONTest do
     ('{"a" : {"b" : 43, "e" : 10}, "c" : [4, 5, 6]}')
     """)
 
-    assert Ch.query!(conn, "SELECT json FROM test").rows == [
+    assert Ch.query!(
+             conn,
+             "SELECT json FROM test",
+             _no_params = [],
+             settings: [
+               output_format_binary_write_json_as_string: 1
+             ]
+           ).rows == [
              [%{"a" => %{"b" => "42"}, "c" => ["1", "2", "3"]}],
              [%{"f" => "Hello, World!"}],
              [%{"a" => %{"b" => "43", "e" => "10"}, "c" => ["4", "5", "6"]}]
@@ -48,17 +46,31 @@ defmodule Ch.JSONTest do
     ('{"a" : {"b" : 43, "e" : 10}, "c" : [4, 5, 6]}')
     """)
 
-    assert Ch.query!(conn, "SELECT json FROM test").rows == [
+    assert Ch.query!(
+             conn,
+             "SELECT json FROM test",
+             _no_params = [],
+             settings: [
+               output_format_binary_write_json_as_string: 1
+             ]
+           ).rows == [
              [%{"a" => %{"b" => 42}, "c" => ["1", "2", "3"]}],
              [%{"a" => %{"b" => 0}, "f" => "Hello, World!"}],
              [%{"a" => %{"b" => 43}, "c" => ["4", "5", "6"]}]
            ]
   end
 
   test "Creating JSON using CAST from String", %{conn: conn} do
-    assert Ch.query!(conn, """
-           SELECT '{"a" : {"b" : 42},"c" : [1, 2, 3], "d" : "Hello, World!"}'::JSON AS json
-           """).rows == [
+    assert Ch.query!(
+             conn,
+             """
+             SELECT '{"a" : {"b" : 42},"c" : [1, 2, 3], "d" : "Hello, World!"}'::JSON AS json
+             """,
+             _no_params = [],
+             settings: [
+               output_format_binary_write_json_as_string: 1
+             ]
+           ).rows == [
              [%{"a" => %{"b" => "42"}, "c" => ["1", "2", "3"], "d" => "Hello, World!"}]
            ]
   end
@@ -69,8 +81,11 @@ defmodule Ch.JSONTest do
              """
              SELECT (tuple(42 AS b) AS a, [1, 2, 3] AS c, 'Hello, World!' AS d)::JSON AS json
              """,
-             [],
-             settings: [enable_named_columns_in_function_tuple: 1]
+             _no_params = [],
+             settings: [
+               enable_named_columns_in_function_tuple: 1,
+               output_format_binary_write_json_as_string: 1
+             ]
            ).rows == [[%{"a" => %{"b" => "42"}, "c" => ["1", "2", "3"], "d" => "Hello, World!"}]]
   end
 
@@ -80,8 +95,12 @@ defmodule Ch.JSONTest do
              """
              SELECT map('a', map('b', 42), 'c', [1,2,3], 'd', 'Hello, World!')::JSON AS json;
              """,
-             [],
-             settings: [enable_variant_type: 1, use_variant_as_common_type: 1]
+             _no_params = [],
+             settings: [
+               enable_variant_type: 1,
+               use_variant_as_common_type: 1,
+               output_format_binary_write_json_as_string: 1
+             ]
            ).rows == [[%{"a" => %{"b" => "42"}, "c" => ["1", "2", "3"], "d" => "Hello, World!"}]]
   end
 
@@ -96,7 +115,14 @@ defmodule Ch.JSONTest do
     ('{"a" : {"b" : 43, "e" : 10, "g" : 43.43}, "c" : [4, 5, 6]}')
     """)
 
-    assert Ch.query!(conn, "SELECT json FROM test").rows == [
+    assert Ch.query!(
+             conn,
+             "SELECT json FROM test",
+             _no_params = [],
+             settings: [
+               output_format_binary_write_json_as_string: 1
+             ]
+           ).rows == [
              [%{"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"]}]

test/ch/row_binary_test.exs

@@ -212,7 +212,6 @@ defmodule Ch.RowBinaryTest do
         {"Decimal(23, 11)", {:decimal, _size = 128, _scale = 11}},
         {"Bool", :boolean},
         {"String", :string},
-        {"JSON", :json},
         {"FixedString(2)", {:fixed_string, _size = 2}},
         {"FixedString(22)", {:fixed_string, _size = 22}},
         {"FixedString(222)", {:fixed_string, _size = 222}},
@@ -252,6 +251,17 @@ defmodule Ch.RowBinaryTest do
     test "preserves order" do
       assert decode_types(["UInt8", "UInt16"], _opts = []) == [:u8, :u16]
     end
+
+    test "JSON raises without options" do
+      assert_raise ArgumentError,
+                   ~r/Native JSON decoding is not yet supported/,
+                   fn -> decode_types(["JSON"], _opts = []) end
+    end
+
+    test "JSON becomes string_json with options" do
+      opts = [settings: [output_format_binary_write_json_as_string: 1]]
+      assert decode_types(["JSON"], opts) == [:string_json]
+    end
   end
 
   describe "decode_rows/1" do