new proc function

Adds support for using a provided stored proc as procedure name
instead of default :sp_execute

Author: Simon Thörnqvist

lib/tds.ex

@@ -17,6 +17,12 @@ defmodule Tds do
       {:error, err} -> {:error, err}
     end
   end
+
+  def proc(pid, statement, params, opts \\ []) do
+    opts = Keyword.put_new(opts, :proc, statement)
+    query(pid, statement, params, opts)
+  end
+
   def query!(pid, statement, params, opts \\ []) do
     query = %Query{statement: statement}
     opts = Keyword.put_new(opts, :parameters, params)

lib/tds/messages.ex

@@ -362,6 +362,11 @@ defmodule Tds.Messages do
   defp encode_rpc(:sp_unprepare, params) do
     <<0xFF, 0xFF, @tds_sp_unprepare::little-size(2)-unit(8), 0x00, 0x00>> <> encode_rpc_params(params, "")
   end
+  defp encode_rpc(proc, params) when is_binary(proc) do
+    rpc_size = byte_size(proc)
+    rpc_name = to_little_ucs2(proc)
+    <<rpc_size::little-size(16)>> <> rpc_name <> <<0x00, 0x00>> <> encode_rpc_params(params, "")
+  end
 
   # Finished processing params
   defp encode_rpc_params([], ret), do: ret

lib/tds/protocol.ex

@@ -79,6 +79,7 @@ defmodule Tds.Protocol do
 
   def handle_execute(%Query{statement: statement} = query, params, opts, %{sock: _sock} = s) do
     params = opts[:parameters] || params
+    s = if opts[:proc], do: Map.put_new(s, :proc, opts[:proc]), else: s
 
     if params != [] do
       send_param_query(query, params, s)
@@ -380,6 +381,21 @@ defmodule Tds.Protocol do
   #  {:ok, %{s | statement: nil, state: :ready}}
   #end
 
+  def send_param_query(%Query{handle: handle} = _query, params, %{proc: proc} = s) do
+    params = Tds.Parameter.prepare_params(params)
+    # msg = msg_rpc(proc: :sp_executesql, params: params)
+    msg = msg_rpc(proc: proc, params: params)
+
+    case msg_send(msg, s) do
+      {:ok, %{result: result} = s} ->
+        {:ok, result, %{s | state: :ready}}
+      {:error, err, %{transaction: :started} = s} ->
+        {:error, err, %{s | transaction: :failed}}
+      err ->
+        err
+    end
+  end
+
   def send_param_query(%Query{handle: handle} = _query, params, %{transaction: :started} = s) do
     params = [
       %Tds.Parameter{name: "@handle", type: :integer, direction: :input, value: handle}

test/test_helper.exs

@@ -16,7 +16,7 @@ defmodule Tds.TestHelper do
 
   defmacro proc(proc, params, opts \\ []) do
     quote do
-      case Tds.Connection.proc(var!(context)[:pid], unquote(proc),
+      case Tds.proc(var!(context)[:pid], unquote(proc),
                                      unquote(params), unquote(opts)) do
         {:ok, %Tds.Result{rows: nil}} -> :ok
         {:ok, %Tds.Result{rows: []}} -> :ok

test/tvp_test.exs

@@ -31,6 +31,6 @@ defmodule TvpTest do
       %Parameter{name: "@tvp", value: %{name: "TvpTestType", columns: [%Parameter{name: "d", type: :integer, value: nil}], rows: [[1]]}, type: :tvp}
     ]
 
-    assert {:ok, res} = query("__tvpTest @tvp", params)
+    assert [[1]] = proc("__tvpTest", params)
   end
 end