Moved utils to separate module

Author: ankane

lib/pgvector.ex

@@ -129,26 +129,6 @@ defmodule Pgvector do
       Pgvector.Extensions.Sparsevec
     ]
   end
-
-  # TODO move / improve pattern
-  @doc false
-  def to_sql(vector) when is_struct(vector, Pgvector.HalfVector) do
-    vector
-  end
-
-  def to_sql(vector) when is_struct(vector, Pgvector.SparseVector) do
-    vector
-  end
-
-  def to_sql(vector) do
-    vector |> Pgvector.new()
-  end
-
-  # TODO move / improve pattern
-  @doc false
-  def to_bit_sql(vector) when is_bitstring(vector) do
-    vector
-  end
 end
 
 defimpl Inspect, for: Pgvector do

lib/pgvector/ecto/query.ex

@@ -9,7 +9,7 @@ if Code.ensure_loaded?(Ecto) do
     """
     defmacro l2_distance(column, value) do
       quote do
-        fragment("(? <-> ?)", unquote(column), ^Pgvector.to_sql(unquote(value)))
+        fragment("(? <-> ?)", unquote(column), ^Pgvector.Ecto.Utils.to_sql(unquote(value)))
       end
     end
 
@@ -18,7 +18,7 @@ if Code.ensure_loaded?(Ecto) do
     """
     defmacro max_inner_product(column, value) do
       quote do
-        fragment("(? <#> ?)", unquote(column), ^Pgvector.to_sql(unquote(value)))
+        fragment("(? <#> ?)", unquote(column), ^Pgvector.Ecto.Utils.to_sql(unquote(value)))
       end
     end
 
@@ -27,7 +27,7 @@ if Code.ensure_loaded?(Ecto) do
     """
     defmacro cosine_distance(column, value) do
       quote do
-        fragment("(? <=> ?)", unquote(column), ^Pgvector.to_sql(unquote(value)))
+        fragment("(? <=> ?)", unquote(column), ^Pgvector.Ecto.Utils.to_sql(unquote(value)))
       end
     end
 
@@ -36,7 +36,7 @@ if Code.ensure_loaded?(Ecto) do
     """
     defmacro l1_distance(column, value) do
       quote do
-        fragment("(? <+> ?)", unquote(column), ^Pgvector.to_sql(unquote(value)))
+        fragment("(? <+> ?)", unquote(column), ^Pgvector.Ecto.Utils.to_sql(unquote(value)))
       end
     end
 
@@ -45,7 +45,7 @@ if Code.ensure_loaded?(Ecto) do
     """
     defmacro hamming_distance(column, value) do
       quote do
-        fragment("(? <~> ?)", unquote(column), ^Pgvector.to_bit_sql(unquote(value)))
+        fragment("(? <~> ?)", unquote(column), ^Pgvector.Ecto.Utils.to_bit_sql(unquote(value)))
       end
     end
 
@@ -54,7 +54,7 @@ if Code.ensure_loaded?(Ecto) do
     """
     defmacro jaccard_distance(column, value) do
       quote do
-        fragment("(? <%> ?)", unquote(column), ^Pgvector.to_bit_sql(unquote(value)))
+        fragment("(? <%> ?)", unquote(column), ^Pgvector.Ecto.Utils.to_bit_sql(unquote(value)))
       end
     end
   end

lib/pgvector/ecto/utils.ex

@@ -0,0 +1,20 @@
+# TODO improve pattern
+defmodule Pgvector.Ecto.Utils do
+  @moduledoc false
+
+  def to_sql(vector) when is_struct(vector, Pgvector.HalfVector) do
+    vector
+  end
+
+  def to_sql(vector) when is_struct(vector, Pgvector.SparseVector) do
+    vector
+  end
+
+  def to_sql(vector) do
+    vector |> Pgvector.new()
+  end
+
+  def to_bit_sql(vector) when is_bitstring(vector) do
+    vector
+  end
+end