cleanup

livehelpnow · Feb 27, 2018 · 4f861b3 · 4f861b3
1 parent 1908a31
commit 4f861b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/lib/tds_ecto/connection.ex b/lib/tds_ecto/connection.ex
@@ -4,7 +4,6 @@ if Code.ensure_loaded?(Tds) do
     require Logger
     require Tds.Ecto.Utils
     alias   Tds.Ecto.Utils
-    alias   Tds.Ecto.VarChar
     alias   Tds.Query
     alias   Ecto.Query.Tagged
     require Ecto.Schema

diff --git a/test/integration_test.exs b/test/integration_test.exs
@@ -38,9 +38,9 @@ defmodule Tds.EctoTest.IntegrationTest do
       price: price
     }
 
-    assert {:ok, result} = Repo.insert(model, timeout: 30_000)
-    assert [model] = Repo.all(Models.Item)
-    assert [model] = Models.Item
+    assert {:ok, _} = Repo.insert(model, timeout: 30_000)
+    assert [%{id: 1}=_] = Repo.all(Models.Item)
+    assert [%{id: 1}=_] = Models.Item
                     |> where([i], i.title_bin == ^title_bin)
                     |> Repo.all()
 

diff --git a/test/tds_test.exs b/test/tds_test.exs
@@ -359,7 +359,7 @@ defmodule Tds.Ecto.TdsTest do
       "GROUP BY @6, @7 HAVING (@8) AND (@9) " <>
       "ORDER BY @10, m0.[x] OFFSET @12 ROW FETCH NEXT @11 ROWS ONLY"
 
-    assert SQL.all(query) == String.rstrip(result)
+    assert SQL.all(query) == String.trim_trailing(result)
   end
 
   # ## *_all