Revert "Add support for JSON type options (#309)" (#327)

This reverts commit a1f1ead.

Author: ruslandoga

lib/ch.ex

@@ -156,7 +156,6 @@ defmodule Ch do
     def cast(value, {:datetime64, _p, "UTC"}), do: Ecto.Type.cast(:utc_datetime_usec, value)
     def cast(value, {:fixed_string, _s}), do: Ecto.Type.cast(:string, value)
     def cast(value, :json), do: Ecto.Type.cast(:map, value)
-    def cast(value, {:json, _opts}), do: Ecto.Type.cast(:map, value)
     def cast(value, :dynamic), do: {:ok, value}
 
     for size <- [8, 16, 32, 64, 128, 256] do

lib/ch/row_binary.ex

@@ -173,7 +173,6 @@ defmodule Ch.RowBinary do
   defp encoding_type(:ring), do: {:array, :point}
   defp encoding_type(:polygon), do: {:array, {:array, :point}}
   defp encoding_type(:multipolygon), do: {:array, {:array, {:array, :point}}}
-  defp encoding_type({:json, opts}), do: {:json, opts}
 
   defp encoding_type(type) do
     raise ArgumentError, "unsupported type for encoding: #{inspect(type)}"
@@ -200,13 +199,6 @@ defmodule Ch.RowBinary do
     encode(:string, Jason.encode_to_iodata!(json))
   end
 
-  def encode({:json, _opts}, json) do
-    # assuming it can be sent as text and not "native" binary JSON
-    # i.e. assumes `settings: [input_format_binary_read_json_as_string: 1]`
-    # TODO
-    encode(:string, Jason.encode_to_iodata!(json))
-  end
-
   def encode({:fixed_string, size}, str) when byte_size(str) == size do
     str
   end
@@ -777,7 +769,6 @@ defmodule Ch.RowBinary do
   defp decoding_type(:ring), do: {:array, :point}
   defp decoding_type(:polygon), do: {:array, {:array, :point}}
   defp decoding_type(:multipolygon), do: {:array, {:array, {:array, :point}}}
-  defp decoding_type({:json, _opts}), do: :json
 
   defp decoding_type(type) do
     raise ArgumentError, "unsupported type for decoding: #{inspect(type)}"

lib/ch/types.ex

@@ -68,8 +68,6 @@ defmodule Ch.Types do
     def unquote(name)(), do: unquote(name)
   end
 
-  def json(opts), do: {:json, opts}
-
   @doc """
   Helper for `DateTime` ClickHouse type:
 
@@ -361,21 +359,7 @@ defmodule Ch.Types do
 
   def decode("DateTime"), do: :datetime
   def decode("Dynamic"), do: :dynamic
-
-  def decode("JSON" <> options) do
-    opts =
-      options
-      |> String.trim()
-      |> String.trim_leading("(")
-      |> String.trim_trailing(")")
-      |> String.split(",")
-      |> Enum.map(&String.trim/1)
-
-    {settings, rest} = Enum.split_with(opts, &String.contains?(&1, "="))
-    {skips, type_hints} = Enum.split_with(rest, &String.match?(&1, ~r/^SKIP\s+/i))
-
-    {:json, [settings: settings, type_hints: Enum.sort(type_hints), skips: skips]}
-  end
+  def decode("JSON" <> _options), do: :json
 
   def decode(type) do
     try do
@@ -594,19 +578,6 @@ defmodule Ch.Types do
     def encode(unquote(decoded)), do: unquote(encoded)
   end
 
-  def encode({:json, opts}) do
-    opts =
-      [
-        opts[:settings],
-        Enum.sort(opts[:type_hints] || []),
-        opts[:skips] || []
-      ]
-      |> List.flatten()
-      |> Enum.intersperse(", ")
-
-    ["JSON(", opts, ?)]
-  end
-
   def encode(:datetime), do: "DateTime"
   def encode({:time64, p}), do: ["Time64(", String.Chars.Integer.to_string(p), ?)]
   def encode({:nullable, type}), do: ["Nullable(", encode(type), ?)]

test/ch/json_test.exs

@@ -1,11 +1,6 @@
 defmodule Ch.JSONTest do
   use ExUnit.Case, parameterize: [%{query_options: []}, %{query_options: [multipart: true]}]
 
-  import Ch.Test,
-    only: [
-      parameterize_query: 4
-    ]
-
   @moduletag :json
 
   setup ctx do
@@ -427,50 +422,4 @@ defmodule Ch.JSONTest do
              [%{"json_obj" => 42}]
            ]
   end
-
-  test "insert with settings, type hints and skip directives", %{
-    conn: conn,
-    query_options: query_options
-  } do
-    Ch.query!(
-      conn,
-      "CREATE TABLE json_test
-      (
-        `json` JSON(
-                max_dynamic_types=254,
-                max_dynamic_paths=10000,
-                name String,
-                age UInt8,
-                SKIP pass.body_part,
-                SKIP REGEXP 't.*'
-              )
-      ) ENGINE = Memory",
-      [],
-      query_options
-    )
-
-    stmt = "INSERT INTO json_test FORMAT RowBinaryWithNamesAndTypes"
-    rows = [[%{name: "John", age: 30, pass: %{body_part: "none"}, t: %{foo: "bar"}}]]
-    names = ["json"]
-
-    opts = [
-      names: names,
-      types: [
-        Ch.Types.decode("""
-        JSON(
-          max_dynamic_types=254,
-          max_dynamic_paths=10000,
-          age UInt8, name String,
-          SKIP `pass.body_part`,
-          SKIP REGEXP 't.*'
-        )
-        """)
-      ]
-    ]
-
-    assert {:ok, %Ch.Result{}} = parameterize_query(%{conn: conn}, stmt, rows, opts)
-
-    [[value]] = Ch.query!(conn, "select * from json_test", [], query_options).rows
-    assert value == %{"age" => 30, "name" => "John"}
-  end
 end

test/ch/types_test.exs

@@ -1,6 +1,6 @@
 defmodule Ch.TypesTest do
   use ExUnit.Case, async: true
-  import Ch.Types, only: [decode: 1, encode: 1, json: 1]
+  import Ch.Types, only: [decode: 1]
   doctest Ch.Types, import: true
 
   describe "decode/1" do
@@ -108,30 +108,7 @@ defmodule Ch.TypesTest do
       assert decode("JSON") == :json
       assert decode(" JSON ") == :json
 
-      assert decode("JSON(max_dynamic_types=10)") ==
-               {:json, [settings: ["max_dynamic_types=10"], type_hints: [], skips: []]}
-
-      assert decode("JSON(age UInt8, name String)") ==
-               {:json, [settings: [], type_hints: ["age UInt8", "name String"], skips: []]}
-
-      assert decode("JSON(name String, age UInt8)") ==
-               {:json, [settings: [], type_hints: ["age UInt8", "name String"], skips: []]}
-
-      assert decode("JSON(SKIP a.e)") ==
-               {:json, [settings: [], type_hints: [], skips: ["SKIP a.e"]]}
-
-      assert decode("JSON(max_dynamic_types=10, name String, age UInt8, SKIP a.e)") ==
-               {:json,
-                [
-                  settings: ["max_dynamic_types=10"],
-                  type_hints: ["age UInt8", "name String"],
-                  skips: ["SKIP a.e"]
-                ]}
-
-      opts = [settings: ["max_dynamic_types=10"], type_hints: ["age UInt8"], skips: []]
-      assert json(opts) == {:json, opts}
-
-      assert to_string(encode(json(opts))) == "JSON(max_dynamic_types=10, age UInt8)"
+      # TODO JSON(...)
     end
 
     test "datetime" do